X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_wgl.c;h=7c415bba527f96d23011ae8bea2eeb48032902ca;hb=df8727697622029dd7a03047999ffc19b49e44ea;hp=99235ff2a63aa44fe5ff60e50d9e68f942778113;hpb=a9786962ae7078339dabc99b92befe9c8c4caf0b;p=xonotic%2Fdarkplaces.git diff --git a/vid_wgl.c b/vid_wgl.c index 99235ff2..7c415bba 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -37,19 +37,19 @@ extern HINSTANCE global_hInstance; // Tell startup code that we have a client int cl_available = true; -int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *); -int (WINAPI *qwglDescribePixelFormat)(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); -//int (WINAPI *qwglGetPixelFormat)(HDC); -BOOL (WINAPI *qwglSetPixelFormat)(HDC, int, CONST PIXELFORMATDESCRIPTOR *); -BOOL (WINAPI *qwglSwapBuffers)(HDC); -HGLRC (WINAPI *qwglCreateContext)(HDC); -BOOL (WINAPI *qwglDeleteContext)(HGLRC); -HGLRC (WINAPI *qwglGetCurrentContext)(VOID); -HDC (WINAPI *qwglGetCurrentDC)(VOID); -PROC (WINAPI *qwglGetProcAddress)(LPCSTR); -BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC); -BOOL (WINAPI *qwglSwapIntervalEXT)(int interval); -const char *(WINAPI *qwglGetExtensionsStringARB)(HDC hdc); +static int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *); +static int (WINAPI *qwglDescribePixelFormat)(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); +//static int (WINAPI *qwglGetPixelFormat)(HDC); +static BOOL (WINAPI *qwglSetPixelFormat)(HDC, int, CONST PIXELFORMATDESCRIPTOR *); +static BOOL (WINAPI *qwglSwapBuffers)(HDC); +static HGLRC (WINAPI *qwglCreateContext)(HDC); +static BOOL (WINAPI *qwglDeleteContext)(HGLRC); +static HGLRC (WINAPI *qwglGetCurrentContext)(VOID); +static HDC (WINAPI *qwglGetCurrentDC)(VOID); +static PROC (WINAPI *qwglGetProcAddress)(LPCSTR); +static BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC); +static BOOL (WINAPI *qwglSwapIntervalEXT)(int interval); +static const char *(WINAPI *qwglGetExtensionsStringARB)(HDC hdc); static dllfunction_t wglfuncs[] = { @@ -73,20 +73,24 @@ static dllfunction_t wglswapintervalfuncs[] = {NULL, NULL} }; -qboolean scr_skipupdate; - static DEVMODE gdevmode; static qboolean vid_initialized = false; static qboolean vid_wassuspended = false; -static int vid_usingmouse; -extern qboolean mouseactive; // from in_win.c +static qboolean vid_usingmouse = false; +static qboolean vid_usingvsync = false; +static qboolean vid_usemouse = false; +static qboolean vid_usevsync = false; static HICON hIcon; +// used by cd_win.c and snd_win.c HWND mainwindow; +static HDC baseDC; +static HGLRC baseRC; + //HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow); -static int vid_isfullscreen; +static qboolean vid_isfullscreen; //void VID_MenuDraw (void); //void VID_MenuKey (int key); @@ -98,17 +102,12 @@ static int vid_isfullscreen; //==================================== -int window_x, window_y, window_width, window_height; -int window_center_x, window_center_y; +static int window_x, window_y, window_width, window_height; +static int window_center_x, window_center_y; -void IN_ShowMouse (void); -void IN_DeactivateMouse (void); -void IN_HideMouse (void); -void IN_ActivateMouse (void); -void IN_MouseEvent (int mstate); -void IN_UpdateClipCursor (void); +static void IN_Activate (qboolean grab); -qboolean mouseinitialized; +static qboolean mouseinitialized; static qboolean dinput; // input code @@ -118,8 +117,7 @@ static qboolean dinput; #define DINPUT_BUFFERSIZE 16 #define iDirectInputCreate(a,b,c,d) pDirectInputCreate(a,b,c,d) -HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion, - LPDIRECTINPUT * lplpDirectInput, LPUNKNOWN punkOuter); +static HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUT * lplpDirectInput, LPUNKNOWN punkOuter); // LordHavoc: thanks to backslash for this support for mouse buttons 4 and 5 /* backslash :: imouse explorer buttons */ @@ -142,19 +140,14 @@ HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion, /* :: backslash */ // mouse variables -int mouse_buttons; -int mouse_oldbuttonstate; -POINT current_pos; -int mouse_x, mouse_y, old_mouse_x, old_mouse_y, mx_accum, my_accum; +static int mouse_buttons; +static int mouse_oldbuttonstate; static qboolean restore_spi; static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1}; -unsigned int uiWheelMessage; -qboolean mouseactive; -//qboolean mouseinitialized; +static unsigned int uiWheelMessage; static qboolean mouseparmsvalid, mouseactivatetoggle; -static qboolean mouseshowtoggle = 1; static qboolean dinput_acquired; static unsigned int mstate_di; @@ -176,46 +169,46 @@ enum _ControlList AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn }; -DWORD dwAxisFlags[JOY_MAX_AXES] = +static DWORD dwAxisFlags[JOY_MAX_AXES] = { JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ, JOY_RETURNR, JOY_RETURNU, JOY_RETURNV }; -DWORD dwAxisMap[JOY_MAX_AXES]; -DWORD dwControlMap[JOY_MAX_AXES]; -PDWORD pdwRawValue[JOY_MAX_AXES]; +static DWORD dwAxisMap[JOY_MAX_AXES]; +static DWORD dwControlMap[JOY_MAX_AXES]; +static PDWORD pdwRawValue[JOY_MAX_AXES]; // none of these cvars are saved over a session // this means that advanced controller configuration needs to be executed // each time. this avoids any problems with getting back to a default usage // or when changing from one controller to another. this way at least something // works. -cvar_t in_joystick = {CVAR_SAVE, "joystick","0"}; -cvar_t joy_name = {0, "joyname", "joystick"}; -cvar_t joy_advanced = {0, "joyadvanced", "0"}; -cvar_t joy_advaxisx = {0, "joyadvaxisx", "0"}; -cvar_t joy_advaxisy = {0, "joyadvaxisy", "0"}; -cvar_t joy_advaxisz = {0, "joyadvaxisz", "0"}; -cvar_t joy_advaxisr = {0, "joyadvaxisr", "0"}; -cvar_t joy_advaxisu = {0, "joyadvaxisu", "0"}; -cvar_t joy_advaxisv = {0, "joyadvaxisv", "0"}; -cvar_t joy_forwardthreshold = {0, "joyforwardthreshold", "0.15"}; -cvar_t joy_sidethreshold = {0, "joysidethreshold", "0.15"}; -cvar_t joy_pitchthreshold = {0, "joypitchthreshold", "0.15"}; -cvar_t joy_yawthreshold = {0, "joyyawthreshold", "0.15"}; -cvar_t joy_forwardsensitivity = {0, "joyforwardsensitivity", "-1.0"}; -cvar_t joy_sidesensitivity = {0, "joysidesensitivity", "-1.0"}; -cvar_t joy_pitchsensitivity = {0, "joypitchsensitivity", "1.0"}; -cvar_t joy_yawsensitivity = {0, "joyyawsensitivity", "-1.0"}; -cvar_t joy_wwhack1 = {0, "joywwhack1", "0.0"}; -cvar_t joy_wwhack2 = {0, "joywwhack2", "0.0"}; - -qboolean joy_avail, joy_advancedinit, joy_haspov; -DWORD joy_oldbuttonstate, joy_oldpovstate; - -int joy_id; -DWORD joy_flags; -DWORD joy_numbuttons; +static cvar_t in_joystick = {CVAR_SAVE, "joystick","0"}; +static cvar_t joy_name = {0, "joyname", "joystick"}; +static cvar_t joy_advanced = {0, "joyadvanced", "0"}; +static cvar_t joy_advaxisx = {0, "joyadvaxisx", "0"}; +static cvar_t joy_advaxisy = {0, "joyadvaxisy", "0"}; +static cvar_t joy_advaxisz = {0, "joyadvaxisz", "0"}; +static cvar_t joy_advaxisr = {0, "joyadvaxisr", "0"}; +static cvar_t joy_advaxisu = {0, "joyadvaxisu", "0"}; +static cvar_t joy_advaxisv = {0, "joyadvaxisv", "0"}; +static cvar_t joy_forwardthreshold = {0, "joyforwardthreshold", "0.15"}; +static cvar_t joy_sidethreshold = {0, "joysidethreshold", "0.15"}; +static cvar_t joy_pitchthreshold = {0, "joypitchthreshold", "0.15"}; +static cvar_t joy_yawthreshold = {0, "joyyawthreshold", "0.15"}; +static cvar_t joy_forwardsensitivity = {0, "joyforwardsensitivity", "-1.0"}; +static cvar_t joy_sidesensitivity = {0, "joysidesensitivity", "-1.0"}; +static cvar_t joy_pitchsensitivity = {0, "joypitchsensitivity", "1.0"}; +static cvar_t joy_yawsensitivity = {0, "joyyawsensitivity", "-1.0"}; +static cvar_t joy_wwhack1 = {0, "joywwhack1", "0.0"}; +static cvar_t joy_wwhack2 = {0, "joywwhack2", "0.0"}; + +static qboolean joy_avail, joy_advancedinit, joy_haspov; +static DWORD joy_oldbuttonstate, joy_oldpovstate; + +static int joy_id; +static DWORD joy_flags; +static DWORD joy_numbuttons; static LPDIRECTINPUT g_pdi; static LPDIRECTINPUTDEVICE g_pMouse; @@ -258,22 +251,22 @@ static DIDATAFORMAT df = { }; // forward-referenced functions -void IN_StartupJoystick (void); -void Joy_AdvancedUpdate_f (void); -void IN_JoyMove (usercmd_t *cmd); -void IN_StartupMouse (void); +static void IN_StartupJoystick (void); +static void Joy_AdvancedUpdate_f (void); +static void IN_JoyMove (void); +static void IN_StartupMouse (void); /* ================ VID_UpdateWindowStatus ================ */ -void VID_UpdateWindowStatus (void) +static void VID_UpdateWindowStatus (void) { window_center_x = window_x + window_width / 2; window_center_y = window_y + window_height / 2; - if (mouseinitialized && mouseactive && !dinput) + if (mouseinitialized && vid_usingmouse && !dinput_acquired) { RECT window_rect; window_rect.left = window_x; @@ -303,29 +296,16 @@ void VID_GetWindowSize (int *x, int *y, int *width, int *height) void VID_Finish (void) { - HDC hdc; - int vid_usemouse; - static int old_vsync = -1; - - if (old_vsync != vid_vsync.integer) + vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable; + if (vid_usingvsync != vid_usevsync && gl_videosyncavailable) { - old_vsync = bound(0, vid_vsync.integer, 1); - Cvar_SetValueQuick(&vid_vsync, old_vsync); - qwglSwapIntervalEXT (old_vsync); - } - - if (r_render.integer && !scr_skipupdate) - { - if (r_speeds.integer || gl_finish.integer) - qglFinish(); - hdc = GetDC(mainwindow); - SwapBuffers(hdc); - ReleaseDC(mainwindow, hdc); + vid_usingvsync = vid_usevsync; + qwglSwapIntervalEXT (vid_usevsync); } // handle the mouse state when windowed if that's changed vid_usemouse = false; - if (vid_mouse.integer && !key_consoleactive) + if (vid_mouse.integer && !key_consoleactive && !cls.demoplayback) vid_usemouse = true; if (vid_isfullscreen) vid_usemouse = true; @@ -336,8 +316,7 @@ void VID_Finish (void) if (!vid_usingmouse) { vid_usingmouse = true; - IN_ActivateMouse (); - IN_HideMouse(); + IN_Activate (true); } } else @@ -345,10 +324,16 @@ void VID_Finish (void) if (vid_usingmouse) { vid_usingmouse = false; - IN_DeactivateMouse (); - IN_ShowMouse(); + IN_Activate (false); } } + + if (r_render.integer && !vid_hidden) + { + if (r_speeds.integer || gl_finish.integer) + qglFinish(); + SwapBuffers(baseDC); + } } //========================================================================== @@ -356,7 +341,7 @@ void VID_Finish (void) -qbyte scantokey[128] = +static qbyte scantokey[128] = { // 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 ,27 ,'1' ,'2' ,'3' ,'4' ,'5' ,'6' ,'7' ,'8' ,'9' ,'0' ,'-' ,'=' ,K_BACKSPACE,9 ,//0 @@ -377,7 +362,7 @@ MapKey Map from windows to quake keynums ======= */ -int MapKey (int key, int virtualkey) +static int MapKey (int key, int virtualkey) { int result; int modified = (key >> 16) & 255; @@ -450,14 +435,13 @@ MAIN WINDOW ClearAllStates ================ */ -void ClearAllStates (void) +static void ClearAllStates (void) { Key_ClearStates (); - IN_ClearStates (); + if (vid_usingmouse) + mouse_oldbuttonstate = 0; } -extern qboolean host_loopactive; - void AppActivate(BOOL fActive, BOOL minimize) /**************************************************************************** * @@ -506,8 +490,7 @@ void AppActivate(BOOL fActive, BOOL minimize) if (!fActive) { vid_usingmouse = false; - IN_DeactivateMouse (); - IN_ShowMouse (); + IN_Activate (false); if (vid_isfullscreen) { ChangeDisplaySettings (NULL, 0); @@ -524,9 +507,6 @@ void Sys_SendKeyEvents (void) while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) { - // we always update if there are any event, even if we're paused - scr_skipupdate = 0; - if (!GetMessage (&msg, NULL, 0, 0)) Sys_Quit (); @@ -547,8 +527,6 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) int vkey; qboolean down = false; - extern unsigned int uiWheelMessage; - if ( uMsg == uiWheelMessage ) uMsg = WM_MOUSEWHEEL; @@ -567,7 +545,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) window_y = (int) HIWORD(lParam); VID_UpdateWindowStatus (); break; - + case WM_KEYDOWN: case WM_SYSKEYDOWN: down = true; @@ -628,7 +606,15 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (wParam & MK_XBUTTON7) temp |= 512; - IN_MouseEvent (temp); + if (vid_usingmouse && !dinput_acquired) + { + // perform button actions + int i; + for (i=0 ; i selects a GL driver library, default is opengl32.dll, useful only for 3dfxogl.dll or 3dfxvgl.dll, if you don't know what this is for, you don't need it i = COM_CheckParm("-gl_driver"); if (i && i < com_argc - 1) gldrivername = com_argv[i + 1]; @@ -933,19 +919,19 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp) // fix the leftover Alt from any Alt-Tab or the like that switched us away ClearAllStates (); - hdc = GetDC(mainwindow); + baseDC = GetDC(mainwindow); - if ((pixelformat = ChoosePixelFormat(hdc, &pfd)) == 0) + if ((pixelformat = ChoosePixelFormat(baseDC, &pfd)) == 0) { VID_Shutdown(); - Con_Printf("ChoosePixelFormat(%d, %p) failed\n", hdc, &pfd); + Con_Printf("ChoosePixelFormat(%d, %p) failed\n", baseDC, &pfd); return false; } - if (SetPixelFormat(hdc, pixelformat, &pfd) == false) + if (SetPixelFormat(baseDC, pixelformat, &pfd) == false) { VID_Shutdown(); - Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", hdc, pixelformat, &pfd); + Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", baseDC, pixelformat, &pfd); return false; } @@ -956,17 +942,17 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp) return false; } - baseRC = qwglCreateContext(hdc); + baseRC = qwglCreateContext(baseDC); if (!baseRC) { VID_Shutdown(); Con_Print("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n"); return false; } - if (!qwglMakeCurrent(hdc, baseRC)) + if (!qwglMakeCurrent(baseDC, baseRC)) { VID_Shutdown(); - Con_Printf("wglMakeCurrent(%d, %d) failed\n", hdc, baseRC); + Con_Printf("wglMakeCurrent(%d, %d) failed\n", baseDC, baseRC); return false; } @@ -985,11 +971,14 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp) gl_platform = "WGL"; gl_platformextensions = ""; + gl_videosyncavailable = false; + if (qwglGetExtensionsStringARB) - gl_platformextensions = qwglGetExtensionsStringARB(hdc); + gl_platformextensions = qwglGetExtensionsStringARB(baseDC); - gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, NULL, false); - ReleaseDC(mainwindow, hdc); +// COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control + gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false); + //ReleaseDC(mainwindow, hdc); GL_Init (); @@ -1004,6 +993,8 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp) //vid_menudrawfn = VID_MenuDraw; //vid_menukeyfn = VID_MenuKey; + vid_usingmouse = false; + vid_usingvsync = false; vid_hidden = false; vid_initialized = true; @@ -1016,9 +1007,6 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp) static void IN_Shutdown(void); void VID_Shutdown (void) { - HGLRC hRC = 0; - HDC hDC = 0; - if(vid_initialized == false) return; @@ -1026,18 +1014,14 @@ void VID_Shutdown (void) vid_initialized = false; IN_Shutdown(); - if (qwglGetCurrentContext) - hRC = qwglGetCurrentContext(); - if (qwglGetCurrentDC) - hDC = qwglGetCurrentDC(); if (qwglMakeCurrent) qwglMakeCurrent(NULL, NULL); - if (hRC && qwglDeleteContext) - qwglDeleteContext(hRC); + if (baseRC && qwglDeleteContext) + qwglDeleteContext(baseRC); // close the library before we get rid of the window GL_CloseLibrary(); - if (hDC && mainwindow) - ReleaseDC(mainwindow, hDC); + if (baseDC && mainwindow) + ReleaseDC(mainwindow, baseDC); AppActivate(false, false); if (mainwindow) DestroyWindow(mainwindow); @@ -1050,60 +1034,21 @@ void VID_Shutdown (void) /* =========== -IN_ShowMouse +IN_Activate =========== */ -void IN_ShowMouse (void) +static void IN_Activate (qboolean grab) { - if (!mouseshowtoggle) - { - ShowCursor (true); - mouseshowtoggle = 1; - } -} - - -/* -=========== -IN_HideMouse -=========== -*/ -void IN_HideMouse (void) -{ - if (mouseshowtoggle) - { - ShowCursor (false); - mouseshowtoggle = 0; - } -} - - -/* -=========== -IN_ActivateMouse -=========== -*/ -void IN_ActivateMouse (void) -{ - - mouseactivatetoggle = true; + if (!mouseinitialized) + return; - if (mouseinitialized) + if (grab) { - if (dinput) + mouseactivatetoggle = true; + if (dinput && g_pMouse) { - if (g_pMouse) - { - if (!dinput_acquired) - { - IDirectInputDevice_Acquire(g_pMouse); - dinput_acquired = true; - } - } - else - { - return; - } + IDirectInputDevice_Acquire(g_pMouse); + dinput_acquired = true; } else { @@ -1112,53 +1057,32 @@ void IN_ActivateMouse (void) window_rect.top = window_y; window_rect.right = window_x + window_width; window_rect.bottom = window_y + window_height; - if (mouseparmsvalid) restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0); - SetCursorPos (window_center_x, window_center_y); SetCapture (mainwindow); ClipCursor (&window_rect); } - - mouseactive = true; + vid_usingmouse = true; + ShowCursor (false); } -} - - -/* -=========== -IN_DeactivateMouse -=========== -*/ -void IN_DeactivateMouse (void) -{ - - mouseactivatetoggle = false; - - if (mouseinitialized) + else { - if (dinput) + mouseactivatetoggle = false; + if (dinput_acquired) { - if (g_pMouse) - { - if (dinput_acquired) - { - IDirectInputDevice_Unacquire(g_pMouse); - dinput_acquired = false; - } - } + IDirectInputDevice_Unacquire(g_pMouse); + dinput_acquired = false; } else { if (restore_spi) SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0); - ClipCursor (NULL); ReleaseCapture (); } - - mouseactive = false; + vid_usingmouse = false; + ShowCursor (true); } } @@ -1168,7 +1092,7 @@ void IN_DeactivateMouse (void) IN_InitDInput =========== */ -qboolean IN_InitDInput (void) +static qboolean IN_InitDInput (void) { HRESULT hr; DIPROPDWORD dipdw = { @@ -1187,7 +1111,7 @@ qboolean IN_InitDInput (void) if (hInstDI == NULL) { - Con_SafePrint("Couldn't load dinput.dll\n"); + Con_Print("Couldn't load dinput.dll\n"); return false; } } @@ -1198,7 +1122,7 @@ qboolean IN_InitDInput (void) if (!pDirectInputCreate) { - Con_SafePrint("Couldn't get DI proc addr\n"); + Con_Print("Couldn't get DI proc addr\n"); return false; } } @@ -1216,7 +1140,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't open DI mouse device\n"); + Con_Print("Couldn't open DI mouse device\n"); return false; } @@ -1225,7 +1149,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't set DI mouse format\n"); + Con_Print("Couldn't set DI mouse format\n"); return false; } @@ -1235,7 +1159,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't set DI coop level\n"); + Con_Print("Couldn't set DI coop level\n"); return false; } @@ -1246,7 +1170,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't set DI buffersize\n"); + Con_Print("Couldn't set DI buffersize\n"); return false; } @@ -1259,48 +1183,43 @@ qboolean IN_InitDInput (void) IN_StartupMouse =========== */ -void IN_StartupMouse (void) +static void IN_StartupMouse (void) { if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) return; mouseinitialized = true; +// COMMANDLINEOPTION: Windows Input: -dinput enables DirectInput for mouse/joystick input if (COM_CheckParm ("-dinput")) - { dinput = IN_InitDInput (); - if (dinput) - { - Con_SafePrint("DirectInput initialized\n"); - } - else - { - Con_SafePrint("DirectInput not initialized\n"); - } - } + if (dinput) + Con_Print("DirectInput initialized\n"); + else + Con_Print("DirectInput not initialized\n"); + + mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0); - if (!dinput) + if (mouseparmsvalid) { - mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0); +// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (not used with -dinput, windows only) + if ( COM_CheckParm ("-noforcemspd") ) + newmouseparms[2] = originalmouseparms[2]; - if (mouseparmsvalid) +// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (not used with -dinput, windows only) + if ( COM_CheckParm ("-noforcemaccel") ) { - if ( COM_CheckParm ("-noforcemspd") ) - newmouseparms[2] = originalmouseparms[2]; - - if ( COM_CheckParm ("-noforcemaccel") ) - { - newmouseparms[0] = originalmouseparms[0]; - newmouseparms[1] = originalmouseparms[1]; - } + newmouseparms[0] = originalmouseparms[0]; + newmouseparms[1] = originalmouseparms[1]; + } - if ( COM_CheckParm ("-noforcemparms") ) - { - newmouseparms[0] = originalmouseparms[0]; - newmouseparms[1] = originalmouseparms[1]; - newmouseparms[2] = originalmouseparms[2]; - } +// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (not used with -dinput, windows only) + if ( COM_CheckParm ("-noforcemparms") ) + { + newmouseparms[0] = originalmouseparms[0]; + newmouseparms[1] = originalmouseparms[1]; + newmouseparms[2] = originalmouseparms[2]; } } @@ -1309,39 +1228,7 @@ void IN_StartupMouse (void) // if a fullscreen video mode was set before the mouse was initialized, // set the mouse state appropriately if (mouseactivatetoggle) - IN_ActivateMouse (); -} - - -/* -=========== -IN_MouseEvent -=========== -*/ -void IN_MouseEvent (int mstate) -{ - int i; - - if (mouseactive && !dinput) - { - // perform button actions - for (i=0 ; i joy_forwardthreshold.value) { - cmd->forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value; + cl.cmd.forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value; } } break; @@ -1890,7 +1716,7 @@ void IN_JoyMove (usercmd_t *cmd) case AxisSide: if (fabs(fAxisValue) > joy_sidethreshold.value) { - cmd->sidemove += (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; + cl.cmd.sidemove += (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; } break; @@ -1900,7 +1726,7 @@ void IN_JoyMove (usercmd_t *cmd) // user wants turn control to become side control if (fabs(fAxisValue) > joy_sidethreshold.value) { - cmd->sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; + cl.cmd.sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; } } else @@ -1984,8 +1810,7 @@ static void IN_Init(void) static void IN_Shutdown(void) { - IN_DeactivateMouse (); - IN_ShowMouse (); + IN_Activate (false); if (g_pMouse) IDirectInputDevice_Release(g_pMouse);