X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=vid_wgl.c;h=cdb2107bd843ec4a567d43716261ba0f5365ea23;hb=c2dcaef8855fc6ce97ce10c544e30d95436b14cd;hp=3733ca1d3e8c30317db5293024530b716176bf48;hpb=56ceba32bfef716a714e3dfbada6dc2566983997;p=xonotic%2Fdarkplaces.git

diff --git a/vid_wgl.c b/vid_wgl.c
index 3733ca1d..cdb2107b 100644
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -19,13 +19,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_vidnt.c -- NT GL vid component
 
+// we don't need a very new dinput
+#define DIRECTINPUT_VERSION 0x0300
+
 #include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include "resource.h"
 #include <commctrl.h>
+#include <dinput.h>
 
-extern void S_BlockSound (void);
 extern HINSTANCE global_hInstance;
 
 
@@ -36,19 +40,21 @@ 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);
+qboolean vid_supportrefreshrate = true;
+
+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[] =
 {
@@ -72,20 +78,23 @@ static dllfunction_t wglswapintervalfuncs[] =
 	{NULL, NULL}
 };
 
-qboolean scr_skipupdate;
-
-static DEVMODE gdevmode;
+static DEVMODE gdevmode, initialdevmode;
 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_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);
@@ -97,28 +106,19 @@ 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;
 
-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
 
-#include <dinput.h>
-
 #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 */
@@ -131,6 +131,8 @@ HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion,
 #ifndef MK_XBUTTON1
    #define MK_XBUTTON1         0x0020
    #define MK_XBUTTON2         0x0040
+#endif
+#ifndef MK_XBUTTON3
 // LordHavoc: lets hope this allows more buttons in the future...
    #define MK_XBUTTON3         0x0080
    #define MK_XBUTTON4         0x0100
@@ -141,19 +143,10 @@ 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 qboolean	restore_spi;
-static int		originalmouseparms[3], newmouseparms[3] = {0, 0, 1};
-
-unsigned int uiWheelMessage;
-qboolean	mouseactive;
-//qboolean		mouseinitialized;
-static qboolean	mouseparmsvalid, mouseactivatetoggle;
-static qboolean	mouseshowtoggle = 1;
+static int			mouse_buttons;
+static int			mouse_oldbuttonstate;
+
+static unsigned int uiWheelMessage;
 static qboolean	dinput_acquired;
 
 static unsigned int		mstate_di;
@@ -175,46 +168,48 @@ 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", "enables joysticks"};
+static cvar_t joy_name = {0, "joyname", "joystick", "name of joystick to use (informational only, used only by joyadvanced 1 mode)"};
+static cvar_t joy_advanced = {0, "joyadvanced", "0", "use more than 2 axis joysticks (configuring this is very technical)"};
+static cvar_t joy_advaxisx = {0, "joyadvaxisx", "0", "axis mapping for joyadvanced 1 mode"};
+static cvar_t joy_advaxisy = {0, "joyadvaxisy", "0", "axis mapping for joyadvanced 1 mode"};
+static cvar_t joy_advaxisz = {0, "joyadvaxisz", "0", "axis mapping for joyadvanced 1 mode"};
+static cvar_t joy_advaxisr = {0, "joyadvaxisr", "0", "axis mapping for joyadvanced 1 mode"};
+static cvar_t joy_advaxisu = {0, "joyadvaxisu", "0", "axis mapping for joyadvanced 1 mode"};
+static cvar_t joy_advaxisv = {0, "joyadvaxisv", "0", "axis mapping for joyadvanced 1 mode"};
+static cvar_t joy_forwardthreshold = {0, "joyforwardthreshold", "0.15", "minimum joystick movement necessary to move forward"};
+static cvar_t joy_sidethreshold = {0, "joysidethreshold", "0.15", "minimum joystick movement necessary to move sideways (strafing)"};
+static cvar_t joy_pitchthreshold = {0, "joypitchthreshold", "0.15", "minimum joystick movement necessary to look up/down"};
+static cvar_t joy_yawthreshold = {0, "joyyawthreshold", "0.15", "minimum joystick movement necessary to turn left/right"};
+static cvar_t joy_forwardsensitivity = {0, "joyforwardsensitivity", "-1.0", "how fast the joystick moves forward"};
+static cvar_t joy_sidesensitivity = {0, "joysidesensitivity", "-1.0", "how fast the joystick moves sideways (strafing)"};
+static cvar_t joy_pitchsensitivity = {0, "joypitchsensitivity", "1.0", "how fast the joystick looks up/down"};
+static cvar_t joy_yawsensitivity = {0, "joyyawsensitivity", "-1.0", "how fast the joystick turns left/right"};
+static cvar_t joy_wwhack1 = {0, "joywwhack1", "0.0", "special hack for wingman warrior"};
+static cvar_t joy_wwhack2 = {0, "joywwhack2", "0.0", "special hack for wingman warrior"};
+
+static cvar_t vid_forcerefreshrate = {0, "vid_forcerefreshrate", "0", "try to set the given vid_refreshrate even if Windows doesn't list it as valid video mode"};
+
+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;
@@ -223,121 +218,47 @@ static JOYINFOEX	ji;
 
 static HINSTANCE hInstDI;
 
-//static qboolean	dinput;
-
-typedef struct MYDATA {
-	LONG  lX;                   // X axis goes here
-	LONG  lY;                   // Y axis goes here
-	LONG  lZ;                   // Z axis goes here
-	BYTE  bButtonA;             // One button goes here
-	BYTE  bButtonB;             // Another button goes here
-	BYTE  bButtonC;             // Another button goes here
-	BYTE  bButtonD;             // Another button goes here
-} MYDATA;
-
-static DIOBJECTDATAFORMAT rgodf[] = {
-  { &GUID_XAxis,    FIELD_OFFSET(MYDATA, lX),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_YAxis,    FIELD_OFFSET(MYDATA, lY),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_ZAxis,    FIELD_OFFSET(MYDATA, lZ),       0x80000000 | DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonA), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonB), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonC), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonD), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-};
-
-#define NUM_OBJECTS (sizeof(rgodf) / sizeof(rgodf[0]))
-
-static DIDATAFORMAT	df = {
-	sizeof(DIDATAFORMAT),       // this structure
-	sizeof(DIOBJECTDATAFORMAT), // size of object data format
-	DIDF_RELAXIS,               // absolute axis coordinates
-	sizeof(MYDATA),             // device data size
-	NUM_OBJECTS,                // number of objects
-	rgodf,                      // and here they are
-};
-
 // forward-referenced functions
-void IN_StartupJoystick (void);
-void Joy_AdvancedUpdate_f (void);
-void IN_JoyMove (usercmd_t *cmd);
-void IN_StartupMouse (void);
-
-/*
-================
-VID_UpdateWindowStatus
-================
-*/
-void VID_UpdateWindowStatus (void)
-{
-	window_center_x = window_x + window_width / 2;
-	window_center_y = window_y + window_height / 2;
-
-	if (mouseinitialized && mouseactive && !dinput)
-	{
-		RECT window_rect;
-		window_rect.left = window_x;
-		window_rect.top = window_y;
-		window_rect.right = window_x + window_width;
-		window_rect.bottom = window_y + window_height;
-		ClipCursor (&window_rect);
-	}
-}
+static void IN_StartupJoystick (void);
+static void Joy_AdvancedUpdate_f (void);
+static void IN_JoyMove (void);
+static void IN_StartupMouse (void);
 
 
 //====================================
 
-/*
-=================
-VID_GetWindowSize
-=================
-*/
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
+void VID_Finish (qboolean allowmousegrab)
 {
-	*x = 0;
-	*y = 0;
-	*width = window_width;
-	*height = window_height;
-}
-
+	qboolean vid_usemouse;
 
-void VID_Finish (void)
-{
-	HDC hdc;
-	int vid_usemouse;
-	if (r_render.integer && !scr_skipupdate)
+	vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
+	if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
 	{
-		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 (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback))
 		vid_usemouse = true;
 	if (vid_isfullscreen)
 		vid_usemouse = true;
 	if (!vid_activewindow)
 		vid_usemouse = false;
-	if (vid_usemouse)
-	{
-		if (!vid_usingmouse)
-		{
-			vid_usingmouse = true;
-			IN_ActivateMouse ();
-			IN_HideMouse();
-		}
-	}
-	else
+	IN_Activate(vid_usemouse);
+
+	if (r_render.integer && !vid_hidden)
 	{
-		if (vid_usingmouse)
+		CHECKGLERROR
+		if (r_speeds.integer || gl_finish.integer)
 		{
-			vid_usingmouse = false;
-			IN_DeactivateMouse ();
-			IN_ShowMouse();
+			qglFinish();CHECKGLERROR
 		}
+		SwapBuffers(baseDC);
 	}
+
+	VID_UpdateGamma(false, 256);
 }
 
 //==========================================================================
@@ -345,7 +266,7 @@ void VID_Finish (void)
 
 
 
-qbyte scantokey[128] =
+static unsigned char 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
@@ -366,7 +287,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;
@@ -439,14 +360,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)
 /****************************************************************************
 *
@@ -459,21 +379,27 @@ void AppActivate(BOOL fActive, BOOL minimize)
 *
 ****************************************************************************/
 {
-	static BOOL	sound_active;
+	static qboolean sound_active = false;  // initially blocked by Sys_InitConsole()
 
 	vid_activewindow = fActive;
 	vid_hidden = minimize;
 
-// enable/disable sound on focus gain/loss
-	if (!vid_activewindow && sound_active)
+	// enable/disable sound on focus gain/loss
+	if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer))
 	{
-		S_BlockSound ();
-		sound_active = false;
+		if (!sound_active)
+		{
+			S_UnblockSound ();
+			sound_active = true;
+		}
 	}
-	else if (vid_activewindow && !sound_active)
+	else
 	{
-		S_UnblockSound ();
-		sound_active = true;
+		if (sound_active)
+		{
+			S_BlockSound ();
+			sound_active = false;
+		}
 	}
 
 	if (fActive)
@@ -494,9 +420,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);
@@ -506,8 +430,43 @@ void AppActivate(BOOL fActive, BOOL minimize)
 	}
 }
 
+//TODO: move it around in vid_wgl.c since I dont think this is the right position
+void Sys_SendKeyEvents (void)
+{
+	MSG msg;
+
+	while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+	{
+		if (!GetMessage (&msg, NULL, 0, 0))
+			Sys_Quit (1);
+
+		TranslateMessage (&msg);
+		DispatchMessage (&msg);
+	}
+}
+
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
+static keynum_t buttonremap[16] =
+{
+	K_MOUSE1,
+	K_MOUSE2,
+	K_MOUSE3,
+	K_MOUSE4,
+	K_MOUSE5,
+	K_MOUSE6,
+	K_MOUSE7,
+	K_MOUSE8,
+	K_MOUSE9,
+	K_MOUSE10,
+	K_MOUSE11,
+	K_MOUSE12,
+	K_MOUSE13,
+	K_MOUSE14,
+	K_MOUSE15,
+	K_MOUSE16,
+};
+
 /* main window procedure */
 LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
@@ -516,10 +475,9 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 	char	state[256];
 	char	asciichar[4];
 	int		vkey;
+	int		charlength;
 	qboolean down = false;
 
-	extern unsigned int uiWheelMessage;
-
 	if ( uMsg == uiWheelMessage )
 		uMsg = WM_MOUSEWHEEL;
 
@@ -536,9 +494,9 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 		case WM_MOVE:
 			window_x = (int) LOWORD(lParam);
 			window_y = (int) HIWORD(lParam);
-			VID_UpdateWindowStatus ();
+			IN_Activate(false);
 			break;
-	
+
 		case WM_KEYDOWN:
 		case WM_SYSKEYDOWN:
 			down = true;
@@ -548,8 +506,12 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 			GetKeyboardState (state);
 			// alt/ctrl/shift tend to produce funky ToAscii values,
 			// and if it's not a single character we don't know care about it
-			if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || ToAscii (wParam, lParam >> 16, state, (unsigned short *)asciichar, 0) != 1)
+			charlength = ToAscii (wParam, lParam >> 16, state, (unsigned short *)asciichar, 0);
+			if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || charlength == 0)
 				asciichar[0] = 0;
+			else if( charlength == 2 ) {
+				asciichar[0] = asciichar[1];
+			}
 			Key_Event (vkey, asciichar[0], down);
 			break;
 
@@ -599,7 +561,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<mouse_buttons && i < 16 ; i++)
+					if ((temp ^ mouse_oldbuttonstate) & (1<<i))
+						Key_Event (buttonremap[i], 0, (temp & (1<<i)) != 0);
+				mouse_oldbuttonstate = temp;
+			}
 
 			break;
 
@@ -621,7 +591,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 
 		case WM_CLOSE:
 			if (MessageBox (mainwindow, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION) == IDYES)
-				Sys_Quit ();
+				Sys_Quit (0);
 
 			break;
 
@@ -653,7 +623,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 	return lRet;
 }
 
-int VID_SetGamma(unsigned short *ramps)
+int VID_SetGamma(unsigned short *ramps, int rampsize)
 {
 	HDC hdc = GetDC (NULL);
 	int i = SetDeviceGammaRamp(hdc, ramps);
@@ -661,7 +631,7 @@ int VID_SetGamma(unsigned short *ramps)
 	return i; // return success or failure
 }
 
-int VID_GetGamma(unsigned short *ramps)
+int VID_GetGamma(unsigned short *ramps, int rampsize)
 {
 	HDC hdc = GetDC (NULL);
 	int i = GetDeviceGammaRamp(hdc, ramps);
@@ -671,7 +641,18 @@ int VID_GetGamma(unsigned short *ramps)
 
 static HINSTANCE gldll;
 
-int GL_OpenLibrary(const char *name)
+static void GL_CloseLibrary(void)
+{
+	FreeLibrary(gldll);
+	gldll = 0;
+	gl_driver[0] = 0;
+	qwglGetProcAddress = NULL;
+	gl_extensions = "";
+	gl_platform = "";
+	gl_platformextensions = "";
+}
+
+static int GL_OpenLibrary(const char *name)
 {
 	Con_Printf("Loading OpenGL driver %s\n", name);
 	GL_CloseLibrary();
@@ -680,21 +661,10 @@ int GL_OpenLibrary(const char *name)
 		Con_Printf("Unable to LoadLibrary %s\n", name);
 		return false;
 	}
-	strcpy(gl_driver, name);
+	strlcpy(gl_driver, name, sizeof(gl_driver));
 	return true;
 }
 
-void GL_CloseLibrary(void)
-{
-	FreeLibrary(gldll);
-	gldll = 0;
-	gl_driver[0] = 0;
-	qwglGetProcAddress = NULL;
-	gl_extensions = "";
-	gl_platform = "";
-	gl_platformextensions = "";
-}
-
 void *GL_GetProcAddress(const char *name)
 {
 	void *p = NULL;
@@ -719,19 +689,22 @@ void VID_Init(void)
 	wc.cbClsExtra    = 0;
 	wc.cbWndExtra    = 0;
 	wc.hInstance     = global_hInstance;
-	wc.hIcon         = 0;
+	wc.hIcon         = hIcon;
 	wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
 	wc.hbrBackground = NULL;
 	wc.lpszMenuName  = 0;
 	wc.lpszClassName = "DarkPlacesWindowClass";
 
 	if (!RegisterClass (&wc))
-		Sys_Error("Couldn't register window class\n");
+		Con_Printf ("Couldn't register window class\n");
+
+	memset(&initialdevmode, 0, sizeof(initialdevmode));
+	EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &initialdevmode);
 
 	IN_Init();
 }
 
-int VID_InitMode (int fullscreen, int width, int height, int bpp)
+int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
 {
 	int i;
 	HDC hdc;
@@ -760,13 +733,14 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 	};
 	int pixelformat;
 	DWORD WindowStyle, ExWindowStyle;
-	HGLRC baseRC;
 	int CenterX, CenterY;
 	const char *gldrivername;
 	int depth;
+	DEVMODE thismode;
+	qboolean foundmode, foundgoodmode;
 
 	if (vid_initialized)
-		Sys_Error("VID_InitMode called when video is already initialised\n");
+		Sys_Error("VID_InitMode called when video is already initialised");
 
 	// if stencil is enabled, ask for alpha too
 	if (bpp >= 32)
@@ -780,7 +754,11 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 		pfd.cAlphaBits = 0;
 	}
 
+	if (stereobuffer)
+		pfd.dwFlags |= PFD_STEREO;
+
 	gldrivername = "opengl32.dll";
+// COMMANDLINEOPTION: Windows WGL: -gl_driver <drivername> 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];
@@ -795,12 +773,107 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 	vid_isfullscreen = false;
 	if (fullscreen)
 	{
-		gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-		gdevmode.dmBitsPerPel = bpp;
-		gdevmode.dmPelsWidth = width;
-		gdevmode.dmPelsHeight = height;
-		gdevmode.dmSize = sizeof (gdevmode);
-		if (ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
+		if(vid_forcerefreshrate.integer)
+		{
+			foundmode = true;
+			gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
+			gdevmode.dmBitsPerPel = bpp;
+			gdevmode.dmPelsWidth = width;
+			gdevmode.dmPelsHeight = height;
+			gdevmode.dmSize = sizeof (gdevmode);
+			if(refreshrate)
+			{
+				gdevmode.dmFields |= DM_DISPLAYFREQUENCY;
+				gdevmode.dmDisplayFrequency = refreshrate;
+			}
+		}
+		else
+		{
+			if(refreshrate == 0)
+				refreshrate = initialdevmode.dmDisplayFrequency; // default vid_refreshrate to the rate of the desktop
+
+			foundmode = false;
+			foundgoodmode = false;
+
+			thismode.dmSize = sizeof(thismode);
+			thismode.dmDriverExtra = 0;
+			for(i = 0; EnumDisplaySettings(NULL, i, &thismode); ++i)
+			{
+				if(~thismode.dmFields & (DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY))
+				{
+					Con_DPrintf("enumerating modes yielded a bogus item... please debug this\n");
+					continue;
+				}
+				if(developer.integer >= 100)
+					Con_Printf("Found mode %dx%dx%dbpp %dHz... ", (int)thismode.dmPelsWidth, (int)thismode.dmPelsHeight, (int)thismode.dmBitsPerPel, (int)thismode.dmDisplayFrequency);
+				if(thismode.dmBitsPerPel != (DWORD)bpp)
+				{
+					if(developer.integer >= 100)
+						Con_Printf("wrong bpp\n");
+					continue;
+				}
+				if(thismode.dmPelsWidth != (DWORD)width)
+				{
+					if(developer.integer >= 100)
+						Con_Printf("wrong width\n");
+					continue;
+				}
+				if(thismode.dmPelsHeight != (DWORD)height)
+				{
+					if(developer.integer >= 100)
+						Con_Printf("wrong height\n");
+					continue;
+				}
+
+				if(foundgoodmode)
+				{
+					// if we have a good mode, make sure this mode is better than the previous one, and allowed by the refreshrate
+					if(thismode.dmDisplayFrequency > (DWORD)refreshrate)
+					{
+						if(developer.integer >= 100)
+							Con_Printf("too high refresh rate\n");
+						continue;
+					}
+					else if(thismode.dmDisplayFrequency <= gdevmode.dmDisplayFrequency)
+					{
+						if(developer.integer >= 100)
+							Con_Printf("doesn't beat previous best match (too low)\n");
+						continue;
+					}
+				}
+				else if(foundmode)
+				{
+					// we do have one, but it isn't good... make sure it has a lower frequency than the previous one
+					if(thismode.dmDisplayFrequency >= gdevmode.dmDisplayFrequency)
+					{
+						if(developer.integer >= 100)
+							Con_Printf("doesn't beat previous best match (too high)\n");
+						continue;
+					}
+				}
+				// otherwise, take anything
+					
+				memcpy(&gdevmode, &thismode, sizeof(gdevmode));
+				if(thismode.dmDisplayFrequency <= (DWORD)refreshrate)
+					foundgoodmode = true;
+				else
+				{
+					if(developer.integer >= 100)
+						Con_Printf("(out of range)\n");
+				}
+				foundmode = true;
+				if(developer.integer >= 100)
+					Con_Printf("accepted\n");
+			}
+		}
+
+		if (!foundmode)
+		{
+			VID_Shutdown();
+			Con_Printf("Unable to find the requested mode %dx%dx%dbpp\n", width, height, bpp);
+			return false;
+		}
+		else if(ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
 		{
 			VID_Shutdown();
 			Con_Printf("Unable to change to requested mode %dx%dx%dbpp\n", width, height, bpp);
@@ -820,13 +893,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 		if (i & RC_PALETTE)
 		{
 			VID_Shutdown();
-			Con_Printf ("Can't run in non-RGB mode\n");
+			Con_Print("Can't run in non-RGB mode\n");
 			return false;
 		}
 		if (bpp > depth)
 		{
 			VID_Shutdown();
-			Con_Printf ("A higher desktop depth is required to run this video mode\n");
+			Con_Print("A higher desktop depth is required to run this video mode\n");
 			return false;
 		}
 
@@ -856,8 +929,6 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 	// x and y may be changed by WM_MOVE messages
 	window_x = CenterX;
 	window_y = CenterY;
-	window_width = width;
-	window_height = height;
 	rect.left += CenterX;
 	rect.right += CenterX;
 	rect.top += CenterY;
@@ -866,7 +937,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 	mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlacesWindowClass", gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL);
 	if (!mainwindow)
 	{
-		Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %d, %p) failed\n", ExWindowStyle, "DarkPlacesWindowClass", gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL);
+		Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %d, %p) failed\n", (int)ExWindowStyle, "DarkPlacesWindowClass", gamename, (int)WindowStyle, (int)(rect.left), (int)(rect.top), (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), NULL, NULL, (int)global_hInstance, NULL);
 		VID_Shutdown();
 		return false;
 	}
@@ -879,11 +950,6 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 	ShowWindow (mainwindow, SW_SHOWDEFAULT);
 	UpdateWindow (mainwindow);
 
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
-
-	VID_UpdateWindowStatus ();
-
 	// now we try to make sure we get the focus on the mode switch, because
 	// sometimes in some systems we don't.  We grab the foreground, then
 	// finish setting up, pump all our messages, and sleep for a little while
@@ -907,51 +973,51 @@ 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", (int)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", (int)baseDC, pixelformat, &pfd);
 		return false;
 	}
 
 	if (!GL_CheckExtension("wgl", wglfuncs, NULL, false))
 	{
 		VID_Shutdown();
-		Con_Printf("wgl functions not found\n");
+		Con_Print("wgl functions not found\n");
 		return false;
 	}
 
-	baseRC = qwglCreateContext(hdc);
+	baseRC = qwglCreateContext(baseDC);
 	if (!baseRC)
 	{
 		VID_Shutdown();
-		Con_Printf("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n");
+		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", (int)baseDC, (int)baseRC);
 		return false;
 	}
 
-	qglGetString = GL_GetProcAddress("glGetString");
-	qwglGetExtensionsStringARB = GL_GetProcAddress("wglGetExtensionsStringARB");
-	if (qglGetString == NULL)
+	if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
 	{
 		VID_Shutdown();
-		Con_Printf("glGetString not found\n");
+		Con_Print("glGetString not found\n");
 		return false;
 	}
+	if ((qwglGetExtensionsStringARB = (const char *(WINAPI *)(HDC hdc))GL_GetProcAddress("wglGetExtensionsStringARB")) == NULL)
+		Con_Print("wglGetExtensionsStringARB not found\n");
 	gl_renderer = qglGetString(GL_RENDERER);
 	gl_vendor = qglGetString(GL_VENDOR);
 	gl_version = qglGetString(GL_VERSION);
@@ -959,11 +1025,20 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 	gl_platform = "WGL";
 	gl_platformextensions = "";
 
+	Con_DPrintf("GL_VENDOR: %s\n", gl_vendor);
+	Con_DPrintf("GL_RENDERER: %s\n", gl_renderer);
+	Con_DPrintf("GL_VERSION: %s\n", gl_version);
+	Con_DPrintf("GL_EXTENSIONS: %s\n", gl_extensions);
+	Con_DPrintf("%s_EXTENSIONS: %s\n", gl_platform, 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 ();
 
@@ -978,21 +1053,27 @@ 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;
 
 	IN_StartupMouse ();
 	IN_StartupJoystick ();
 
+	if (gl_videosyncavailable)
+	{
+		vid_usevsync = vid_vsync.integer;
+		vid_usingvsync = vid_vsync.integer;
+		qwglSwapIntervalEXT (vid_usevsync);
+	}
+
 	return true;
 }
 
 static void IN_Shutdown(void);
 void VID_Shutdown (void)
 {
-	HGLRC hRC = 0;
-	HDC hDC = 0;
-
 	if(vid_initialized == false)
 		return;
 
@@ -1000,18 +1081,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);
@@ -1021,118 +1098,75 @@ void VID_Shutdown (void)
 	vid_isfullscreen = false;
 }
 
-
-/*
-===========
-IN_ShowMouse
-===========
-*/
-void IN_ShowMouse (void)
-{
-	if (!mouseshowtoggle)
-	{
-		ShowCursor (true);
-		mouseshowtoggle = 1;
-	}
-}
-
-
-/*
-===========
-IN_HideMouse
-===========
-*/
-void IN_HideMouse (void)
-{
-	if (mouseshowtoggle)
-	{
-		ShowCursor (false);
-		mouseshowtoggle = 0;
-	}
-}
-
-
-/*
-===========
-IN_ActivateMouse
-===========
-*/
-void IN_ActivateMouse (void)
+static void IN_Activate (qboolean grab)
 {
+	static qboolean restore_spi;
+	static int originalmouseparms[3];
 
-	mouseactivatetoggle = true;
+	if (!mouseinitialized)
+		return;
 
-	if (mouseinitialized)
+	if (grab)
 	{
-		if (dinput)
+		if (!vid_usingmouse)
 		{
-			if (g_pMouse)
+			vid_usingmouse = true;
+			cl_ignoremousemoves = 2;
+			if (dinput && g_pMouse)
 			{
-				if (!dinput_acquired)
-				{
-					IDirectInputDevice_Acquire(g_pMouse);
-					dinput_acquired = true;
-				}
+				IDirectInputDevice_Acquire(g_pMouse);
+				dinput_acquired = true;
 			}
 			else
 			{
-				return;
+				RECT window_rect;
+				window_rect.left = window_x;
+				window_rect.top = window_y;
+				window_rect.right = window_x + vid.width;
+				window_rect.bottom = window_y + vid.height;
+
+				// change mouse settings to turn off acceleration
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (not used with -dinput, windows only)
+				if (!COM_CheckParm ("-noforcemparms") && SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0))
+				{
+					int newmouseparms[3];
+					newmouseparms[0] = 0; // threshold to double movement (only if accel level is >= 1)
+					newmouseparms[1] = 0; // threshold to quadruple movement (only if accel level is >= 2)
+					newmouseparms[2] = 0; // maximum level of acceleration (0 = off)
+					restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0);
+				}
+				else
+					restore_spi = false;
+				SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2));
+
+				SetCapture (mainwindow);
+				ClipCursor (&window_rect);
 			}
+			ShowCursor (false);
 		}
-		else
-		{
-			RECT window_rect;
-			window_rect.left = window_x;
-			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;
 	}
-}
-
-
-/*
-===========
-IN_DeactivateMouse
-===========
-*/
-void IN_DeactivateMouse (void)
-{
-
-	mouseactivatetoggle = false;
-
-	if (mouseinitialized)
+	else
 	{
-		if (dinput)
+		if (vid_usingmouse)
 		{
-			if (g_pMouse)
+			vid_usingmouse = false;
+			cl_ignoremousemoves = 2;
+			if (dinput_acquired)
 			{
-				if (dinput_acquired)
-				{
-					IDirectInputDevice_Unacquire(g_pMouse);
-					dinput_acquired = false;
-				}
+				IDirectInputDevice_Unacquire(g_pMouse);
+				dinput_acquired = false;
 			}
+			else
+			{
+				// restore system mouseparms if we changed them
+				if (restore_spi)
+					SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0);
+				restore_spi = false;
+				ClipCursor (NULL);
+				ReleaseCapture ();
+			}
+			ShowCursor (true);
 		}
-		else
-		{
-			if (restore_spi)
-				SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0);
-
-			ClipCursor (NULL);
-			ReleaseCapture ();
-		}
-
-		mouseactive = false;
 	}
 }
 
@@ -1142,7 +1176,7 @@ void IN_DeactivateMouse (void)
 IN_InitDInput
 ===========
 */
-qboolean IN_InitDInput (void)
+static qboolean IN_InitDInput (void)
 {
     HRESULT		hr;
 	DIPROPDWORD	dipdw = {
@@ -1161,7 +1195,7 @@ qboolean IN_InitDInput (void)
 
 		if (hInstDI == NULL)
 		{
-			Con_SafePrintf ("Couldn't load dinput.dll\n");
+			Con_Print("Couldn't load dinput.dll\n");
 			return false;
 		}
 	}
@@ -1172,7 +1206,7 @@ qboolean IN_InitDInput (void)
 
 		if (!pDirectInputCreate)
 		{
-			Con_SafePrintf ("Couldn't get DI proc addr\n");
+			Con_Print("Couldn't get DI proc addr\n");
 			return false;
 		}
 	}
@@ -1190,16 +1224,16 @@ qboolean IN_InitDInput (void)
 
 	if (FAILED(hr))
 	{
-		Con_SafePrintf ("Couldn't open DI mouse device\n");
+		Con_Print("Couldn't open DI mouse device\n");
 		return false;
 	}
 
 // set the data format to "mouse format".
-	hr = IDirectInputDevice_SetDataFormat(g_pMouse, &df);
+	hr = IDirectInputDevice_SetDataFormat(g_pMouse, &c_dfDIMouse);
 
 	if (FAILED(hr))
 	{
-		Con_SafePrintf ("Couldn't set DI mouse format\n");
+		Con_Print("Couldn't set DI mouse format\n");
 		return false;
 	}
 
@@ -1209,7 +1243,7 @@ qboolean IN_InitDInput (void)
 
 	if (FAILED(hr))
 	{
-		Con_SafePrintf ("Couldn't set DI coop level\n");
+		Con_Print("Couldn't set DI coop level\n");
 		return false;
 	}
 
@@ -1220,7 +1254,7 @@ qboolean IN_InitDInput (void)
 
 	if (FAILED(hr))
 	{
-		Con_SafePrintf ("Couldn't set DI buffersize\n");
+		Con_Print("Couldn't set DI buffersize\n");
 		return false;
 	}
 
@@ -1233,89 +1267,23 @@ qboolean IN_InitDInput (void)
 IN_StartupMouse
 ===========
 */
-void IN_StartupMouse (void)
+static void IN_StartupMouse (void)
 {
-	if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
+	if (COM_CheckParm ("-nomouse"))
 		return;
 
 	mouseinitialized = true;
 
+// COMMANDLINEOPTION: Windows Input: -dinput enables DirectInput for mouse/joystick input
 	if (COM_CheckParm ("-dinput"))
-	{
 		dinput = IN_InitDInput ();
 
-		if (dinput)
-		{
-			Con_SafePrintf ("DirectInput initialized\n");
-		}
-		else
-		{
-			Con_SafePrintf ("DirectInput not initialized\n");
-		}
-	}
-
-	if (!dinput)
-	{
-		mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0);
-
-		if (mouseparmsvalid)
-		{
-			if ( COM_CheckParm ("-noforcemspd") )
-				newmouseparms[2] = originalmouseparms[2];
-
-			if ( COM_CheckParm ("-noforcemaccel") )
-			{
-				newmouseparms[0] = originalmouseparms[0];
-				newmouseparms[1] = originalmouseparms[1];
-			}
-
-			if ( COM_CheckParm ("-noforcemparms") )
-			{
-				newmouseparms[0] = originalmouseparms[0];
-				newmouseparms[1] = originalmouseparms[1];
-				newmouseparms[2] = originalmouseparms[2];
-			}
-		}
-	}
+	if (dinput)
+		Con_Print("DirectInput initialized\n");
+	else
+		Con_Print("DirectInput not initialized\n");
 
 	mouse_buttons = 10;
-
-// 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<mouse_buttons ; i++)
-		{
-			if ( (mstate & (1<<i)) &&
-				!(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, 0, true);
-			}
-
-			if ( !(mstate & (1<<i)) &&
-				(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, 0, false);
-			}
-		}
-
-		mouse_oldbuttonstate = mstate;
-	}
 }
 
 
@@ -1324,23 +1292,23 @@ void IN_MouseEvent (int mstate)
 IN_MouseMove
 ===========
 */
-void IN_MouseMove (usercmd_t *cmd)
+static void IN_MouseMove (void)
 {
-	int					i, mx, my;
-	DIDEVICEOBJECTDATA	od;
-	DWORD				dwElements;
-	HRESULT				hr;
+	int i, mx, my;
+	POINT current_pos;
 
-	if (!mouseactive)
+	if (!vid_usingmouse)
 	{
-		GetCursorPos (&current_pos);
+		//GetCursorPos (&current_pos);
 		//ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
-		in_mouse_x = in_mouse_y = 0;
 		return;
 	}
 
-	if (dinput)
+	if (dinput_acquired)
 	{
+		DIDEVICEOBJECTDATA	od;
+		DWORD				dwElements;
+		HRESULT				hr;
 		mx = 0;
 		my = 0;
 
@@ -1353,7 +1321,6 @@ void IN_MouseMove (usercmd_t *cmd)
 
 			if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
 			{
-				dinput_acquired = true;
 				IDirectInputDevice_Acquire(g_pMouse);
 				break;
 			}
@@ -1367,11 +1334,24 @@ void IN_MouseMove (usercmd_t *cmd)
 			switch (od.dwOfs)
 			{
 				case DIMOFS_X:
-					mx += od.dwData;
+					mx += (LONG) od.dwData;
 					break;
 
 				case DIMOFS_Y:
-					my += od.dwData;
+					my += (LONG) od.dwData;
+					break;
+
+				case DIMOFS_Z:
+					if((LONG) od.dwData < 0)
+					{
+						Key_Event (K_MWHEELDOWN, 0, true);
+						Key_Event (K_MWHEELDOWN, 0, false);
+					}
+					else if((LONG) od.dwData > 0)
+					{
+						Key_Event (K_MWHEELUP, 0, true);
+						Key_Event (K_MWHEELUP, 0, false);
+					}
 					break;
 
 				case DIMOFS_BUTTON0:
@@ -1394,41 +1374,39 @@ void IN_MouseMove (usercmd_t *cmd)
 					else
 						mstate_di &= ~(1<<2);
 					break;
-			}
-		}
-
-	// perform button actions
-		for (i=0 ; i<mouse_buttons ; i++)
-		{
-			if ( (mstate_di & (1<<i)) &&
-				!(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, 0, true);
-			}
 
-			if ( !(mstate_di & (1<<i)) &&
-				(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, 0, false);
+				case DIMOFS_BUTTON3:
+					if (od.dwData & 0x80)
+						mstate_di |= (1<<3);
+					else
+						mstate_di &= ~(1<<3);
+					break;
 			}
 		}
 
+		// perform button actions
+		for (i=0 ; i<mouse_buttons && i < 16 ; i++)
+			if ((mstate_di ^ mouse_oldbuttonstate) & (1<<i))
+				Key_Event (buttonremap[i], 0, (mstate_di & (1<<i)) != 0);
 		mouse_oldbuttonstate = mstate_di;
+
+		in_mouse_x = mx;
+		in_mouse_y = my;
 	}
 	else
 	{
 		GetCursorPos (&current_pos);
-		mx = current_pos.x - window_center_x + mx_accum;
-		my = current_pos.y - window_center_y + my_accum;
-		mx_accum = 0;
-		my_accum = 0;
-	}
+		mx = current_pos.x - (window_x + vid.width / 2);
+		my = current_pos.y - (window_y + vid.height / 2);
 
-	IN_Mouse(cmd, mx, my);
+		in_mouse_x = mx;
+		in_mouse_y = my;
 
-	// if the mouse has moved, force it to the center, so there's room to move
-	if (!dinput && (mx || my))
-		SetCursorPos (window_center_x, window_center_y);
+		// if the mouse has moved, force it to the center, so there's room to move
+		if (!cl.csqc_wantsmousemove)
+		if (mx || my)
+			SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2));
+	}
 }
 
 
@@ -1437,51 +1415,12 @@ void IN_MouseMove (usercmd_t *cmd)
 IN_Move
 ===========
 */
-void IN_Move (usercmd_t *cmd)
+void IN_Move (void)
 {
 	if (vid_activewindow && !vid_hidden)
 	{
-		IN_MouseMove (cmd);
-		IN_JoyMove (cmd);
-	}
-}
-
-
-/*
-===========
-IN_Accumulate
-===========
-*/
-void IN_Accumulate (void)
-{
-	if (mouseactive)
-	{
-		if (!dinput)
-		{
-			GetCursorPos (&current_pos);
-
-			mx_accum += current_pos.x - window_center_x;
-			my_accum += current_pos.y - window_center_y;
-
-		// force the mouse to the center, so there's room to move
-			SetCursorPos (window_center_x, window_center_y);
-		}
-	}
-}
-
-
-/*
-===================
-IN_ClearStates
-===================
-*/
-void IN_ClearStates (void)
-{
-	if (mouseactive)
-	{
-		mx_accum = 0;
-		my_accum = 0;
-		mouse_oldbuttonstate = 0;
+		IN_MouseMove ();
+		IN_JoyMove ();
 	}
 }
 
@@ -1491,7 +1430,7 @@ void IN_ClearStates (void)
 IN_StartupJoystick
 ===============
 */
-void IN_StartupJoystick (void)
+static void IN_StartupJoystick (void)
 {
 	int			numdevs;
 	JOYCAPS		jc;
@@ -1502,13 +1441,14 @@ void IN_StartupJoystick (void)
 	joy_avail = false;
 
 	// abort startup if user requests no joystick
-	if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe"))
+// COMMANDLINEOPTION: Windows Input: -nojoy disables joystick support, may be a small speed increase
+	if (COM_CheckParm ("-nojoy"))
 		return;
 
 	// verify joystick driver is present
 	if ((numdevs = joyGetNumDevs ()) == 0)
 	{
-		Con_Printf ("\njoystick not found -- driver not present\n\n");
+		Con_Print("\njoystick not found -- driver not present\n\n");
 		return;
 	}
 
@@ -1526,7 +1466,7 @@ void IN_StartupJoystick (void)
 	// abort startup if we didn't find a valid joystick
 	if (mmr != JOYERR_NOERROR)
 	{
-		Con_Printf ("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
+		Con_Printf("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
 		return;
 	}
 
@@ -1535,7 +1475,7 @@ void IN_StartupJoystick (void)
 	memset (&jc, 0, sizeof(jc));
 	if ((mmr = joyGetDevCaps (joy_id, &jc, sizeof(jc))) != JOYERR_NOERROR)
 	{
-		Con_Printf ("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
+		Con_Printf("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
 		return;
 	}
 
@@ -1552,7 +1492,7 @@ void IN_StartupJoystick (void)
 	joy_avail = true;
 	joy_advancedinit = false;
 
-	Con_Printf ("\njoystick detected\n\n");
+	Con_Print("\njoystick detected\n\n");
 }
 
 
@@ -1561,7 +1501,7 @@ void IN_StartupJoystick (void)
 RawValuePointer
 ===========
 */
-PDWORD RawValuePointer (int axis)
+static PDWORD RawValuePointer (int axis)
 {
 	switch (axis)
 	{
@@ -1587,7 +1527,7 @@ PDWORD RawValuePointer (int axis)
 Joy_AdvancedUpdate_f
 ===========
 */
-void Joy_AdvancedUpdate_f (void)
+static void Joy_AdvancedUpdate_f (void)
 {
 
 	// called once by IN_ReadJoystick and by user whenever an update is needed
@@ -1617,7 +1557,7 @@ void Joy_AdvancedUpdate_f (void)
 		if (strcmp (joy_name.string, "joystick") != 0)
 		{
 			// notify user of advanced controller
-			Con_Printf ("\n%s configured\n\n", joy_name.string);
+			Con_Printf("\n%s configured\n\n", joy_name.string);
 		}
 
 		// advanced initialization here
@@ -1653,82 +1593,12 @@ void Joy_AdvancedUpdate_f (void)
 	}
 }
 
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-	int		i, key_index;
-	DWORD	buttonstate, povstate;
-
-	if (!joy_avail)
-	{
-		return;
-	}
-
-
-	// loop through the joystick buttons
-	// key a joystick event or auxillary event for higher number buttons for each state change
-	buttonstate = ji.dwButtons;
-	for (i=0 ; i < (int) joy_numbuttons ; i++)
-	{
-		if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
-		{
-			key_index = (i < 4) ? K_JOY1 : K_AUX1;
-			Key_Event (key_index + i, 0, true);
-		}
-
-		if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
-		{
-			key_index = (i < 4) ? K_JOY1 : K_AUX1;
-			Key_Event (key_index + i, 0, false);
-		}
-	}
-	joy_oldbuttonstate = buttonstate;
-
-	if (joy_haspov)
-	{
-		// convert POV information into 4 bits of state information
-		// this avoids any potential problems related to moving from one
-		// direction to another without going through the center position
-		povstate = 0;
-		if(ji.dwPOV != JOY_POVCENTERED)
-		{
-			if (ji.dwPOV == JOY_POVFORWARD)
-				povstate |= 0x01;
-			if (ji.dwPOV == JOY_POVRIGHT)
-				povstate |= 0x02;
-			if (ji.dwPOV == JOY_POVBACKWARD)
-				povstate |= 0x04;
-			if (ji.dwPOV == JOY_POVLEFT)
-				povstate |= 0x08;
-		}
-		// determine which bits have changed and key an auxillary event for each change
-		for (i=0 ; i < 4 ; i++)
-		{
-			if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
-			{
-				Key_Event (K_AUX29 + i, 0, true);
-			}
-
-			if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
-			{
-				Key_Event (K_AUX29 + i, 0, false);
-			}
-		}
-		joy_oldpovstate = povstate;
-	}
-}
-
-
 /*
 ===============
 IN_ReadJoystick
 ===============
 */
-qboolean IN_ReadJoystick (void)
+static qboolean IN_ReadJoystick (void)
 {
 
 	memset (&ji, 0, sizeof(ji));
@@ -1761,7 +1631,7 @@ qboolean IN_ReadJoystick (void)
 IN_JoyMove
 ===========
 */
-void IN_JoyMove (usercmd_t *cmd)
+static void IN_JoyMove (void)
 {
 	float	speed, aspeed;
 	float	fAxisValue, fTemp;
@@ -1775,6 +1645,64 @@ void IN_JoyMove (usercmd_t *cmd)
 		joy_advancedinit = true;
 	}
 
+	if (joy_avail)
+	{
+		int		i, key_index;
+		DWORD	buttonstate, povstate;
+
+		// loop through the joystick buttons
+		// key a joystick event or auxillary event for higher number buttons for each state change
+		buttonstate = ji.dwButtons;
+		for (i=0 ; i < (int) joy_numbuttons ; i++)
+		{
+			if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
+			{
+				key_index = (i < 16) ? K_JOY1 : K_AUX1;
+				Key_Event (key_index + i, 0, true);
+			}
+
+			if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
+			{
+				key_index = (i < 16) ? K_JOY1 : K_AUX1;
+				Key_Event (key_index + i, 0, false);
+			}
+		}
+		joy_oldbuttonstate = buttonstate;
+
+		if (joy_haspov)
+		{
+			// convert POV information into 4 bits of state information
+			// this avoids any potential problems related to moving from one
+			// direction to another without going through the center position
+			povstate = 0;
+			if(ji.dwPOV != JOY_POVCENTERED)
+			{
+				if (ji.dwPOV == JOY_POVFORWARD)
+					povstate |= 0x01;
+				if (ji.dwPOV == JOY_POVRIGHT)
+					povstate |= 0x02;
+				if (ji.dwPOV == JOY_POVBACKWARD)
+					povstate |= 0x04;
+				if (ji.dwPOV == JOY_POVLEFT)
+					povstate |= 0x08;
+			}
+			// determine which bits have changed and key an auxillary event for each change
+			for (i=0 ; i < 4 ; i++)
+			{
+				if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
+				{
+					Key_Event (K_AUX29 + i, 0, true);
+				}
+
+				if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
+				{
+					Key_Event (K_AUX29 + i, 0, false);
+				}
+			}
+			joy_oldpovstate = povstate;
+		}
+	}
+
 	// verify joystick is available and that the user wants to use it
 	if (!joy_avail || !in_joystick.integer)
 	{
@@ -1792,7 +1720,7 @@ void IN_JoyMove (usercmd_t *cmd)
 	else
 		speed = 1;
 	// LordHavoc: viewzoom affects sensitivity for sniping
-	aspeed = speed * host_realframetime * cl.viewzoom;
+	aspeed = speed * cl.realframetime * cl.viewzoom;
 
 	// loop through the axes
 	for (i = 0; i < JOY_MAX_AXES; i++)
@@ -1856,7 +1784,7 @@ void IN_JoyMove (usercmd_t *cmd)
 				// user wants forward control to be forward control
 				if (fabs(fAxisValue) > 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;
@@ -1864,7 +1792,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;
 
@@ -1874,7 +1802,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
@@ -1953,13 +1881,13 @@ static void IN_Init(void)
 	Cvar_RegisterVariable (&joy_yawsensitivity);
 	Cvar_RegisterVariable (&joy_wwhack1);
 	Cvar_RegisterVariable (&joy_wwhack2);
-	Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f);
+	Cvar_RegisterVariable (&vid_forcerefreshrate);
+	Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f, "applies current joyadv* cvar settings to the joystick driver");
 }
 
 static void IN_Shutdown(void)
 {
-	IN_DeactivateMouse ();
-	IN_ShowMouse ();
+	IN_Activate (false);
 
 	if (g_pMouse)
 		IDirectInputDevice_Release(g_pMouse);