]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_wgl.c
-Added static, global baseDC and baseRC variables to avoid having to call
[xonotic/darkplaces.git] / vid_wgl.c
index 0c8004be484553a7e02e9f62630a9fb14050ace7..ad17aa3eb8a24c961deac6a7a02f8bf958be64a9 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -20,10 +20,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // gl_vidnt.c -- NT GL vid component
 
 #include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
 #include "resource.h"
 #include <commctrl.h>
 
+extern void S_BlockSound (void);
+extern void S_UnblockSound (void);
+extern HINSTANCE global_hInstance;
+
+
+#ifndef WM_MOUSEWHEEL
+#define WM_MOUSEWHEEL                   0x020A
+#endif
+
+// Tell startup code that we have a client
 int cl_available = true;
 
 int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *);
@@ -40,13 +51,7 @@ BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC);
 BOOL (WINAPI *qwglSwapIntervalEXT)(int interval);
 const char *(WINAPI *qwglGetExtensionsStringARB)(HDC hdc);
 
-static gl_extensionfunctionlist_t getextensionsstringfuncs[] =
-{
-       {"wglGetExtensionsString", (void **) &qwglGetExtensionsStringARB},
-       {NULL, NULL}
-};
-
-static gl_extensionfunctionlist_t wglfuncs[] =
+static dllfunction_t wglfuncs[] =
 {
        {"wglChoosePixelFormat", (void **) &qwglChoosePixelFormat},
        {"wglDescribePixelFormat", (void **) &qwglDescribePixelFormat},
@@ -62,26 +67,23 @@ static gl_extensionfunctionlist_t wglfuncs[] =
        {NULL, NULL}
 };
 
-static gl_extensionfunctionlist_t wglswapintervalfuncs[] =
+static dllfunction_t wglswapintervalfuncs[] =
 {
        {"wglSwapIntervalEXT", (void **) &qwglSwapIntervalEXT},
        {NULL, NULL}
 };
 
-void VID_RestoreGameGamma(void);
-void VID_GetSystemGamma(void);
-void VID_RestoreSystemGamma(void);
-
 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 HICON hIcon;
 
 HWND mainwindow;
+static HDC      baseDC;
+static HGLRC baseRC;
 
 //HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
 
@@ -110,6 +112,158 @@ void IN_UpdateClipCursor (void);
 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);
+
+// LordHavoc: thanks to backslash for this support for mouse buttons 4 and 5
+/* backslash :: imouse explorer buttons */
+/* These are #ifdefed out for non-Win2K in the February 2001 version of
+   MS's platform SDK, but we need them for compilation. . . */
+#ifndef WM_XBUTTONDOWN
+   #define WM_XBUTTONDOWN      0x020B
+   #define WM_XBUTTONUP      0x020C
+#endif
+#ifndef MK_XBUTTON1
+   #define MK_XBUTTON1         0x0020
+   #define MK_XBUTTON2         0x0040
+// LordHavoc: lets hope this allows more buttons in the future...
+   #define MK_XBUTTON3         0x0080
+   #define MK_XBUTTON4         0x0100
+   #define MK_XBUTTON5         0x0200
+   #define MK_XBUTTON6         0x0400
+   #define MK_XBUTTON7         0x0800
+#endif
+/* :: backslash */
+
+// mouse variables
+int                    mouse_buttons;
+int                    mouse_oldbuttonstate;
+POINT          current_pos;
+int                    mouse_x, mouse_y, old_mouse_x, old_mouse_y;
+
+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 qboolean        dinput_acquired;
+
+static unsigned int            mstate_di;
+
+// joystick defines and variables
+// where should defines be moved?
+#define JOY_ABSOLUTE_AXIS      0x00000000              // control like a joystick
+#define JOY_RELATIVE_AXIS      0x00000010              // control like a mouse, spinner, trackball
+#define        JOY_MAX_AXES            6                               // X, Y, Z, R, U, V
+#define JOY_AXIS_X                     0
+#define JOY_AXIS_Y                     1
+#define JOY_AXIS_Z                     2
+#define JOY_AXIS_R                     3
+#define JOY_AXIS_U                     4
+#define JOY_AXIS_V                     5
+
+enum _ControlList
+{
+       AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn
+};
+
+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];
+
+// 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 LPDIRECTINPUT           g_pdi;
+static LPDIRECTINPUTDEVICE     g_pMouse;
+
+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
@@ -150,14 +304,22 @@ 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)
+       {
+               old_vsync = bound(0, vid_vsync.integer, 1);
+               Cvar_SetValueQuick(&vid_vsync, old_vsync);
+               if (gl_videosyncavailable)
+                       qwglSwapIntervalEXT (old_vsync);
+       }
+
        if (r_render.integer && !scr_skipupdate)
        {
-               qglFinish();
-               hdc = GetDC(mainwindow);
-               SwapBuffers(hdc);
-               ReleaseDC(mainwindow, hdc);
+               if (r_speeds.integer || gl_finish.integer)
+                       qglFinish();
+               SwapBuffers(baseDC);
        }
 
 // handle the mouse state when windowed if that's changed
@@ -195,15 +357,15 @@ void VID_Finish (void)
 
 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
-       'q'        ,'w'   ,'e'  ,'r'  ,'t'  ,'y'    ,'u'    ,'i'   ,'o'      ,'p'   ,'['    ,']'        ,13   ,K_CTRL      ,'a'        ,'s'   , // 1
-       'd'        ,'f'   ,'g'  ,'h'  ,'j'  ,'k'    ,'l'    ,';'   ,'\''     ,'`'   ,K_SHIFT,'\\'       ,'z'  ,'x'         ,'c'        ,'v'   , // 2
-       'b'        ,'n'   ,'m'  ,','  ,'.'  ,'/'    ,K_SHIFT,'*'   ,K_ALT    ,' '   ,0      ,K_F1       ,K_F2 ,K_F3        ,K_F4       ,K_F5  , // 3
-       K_F6       ,K_F7  ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0      ,K_HOME,K_UPARROW,K_PGUP,'-'    ,K_LEFTARROW,'5'  ,K_RIGHTARROW,'+'        ,K_END , // 4
-       K_DOWNARROW,K_PGDN,K_INS,K_DEL,0    ,0      ,0      ,K_F11 ,K_F12    ,0     ,0      ,0          ,0    ,0           ,0          ,0     , // 5
-       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0     , // 6
-       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0       // 7
+//  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
+       'q'        ,'w'   ,'e'  ,'r'  ,'t'  ,'y'    ,'u'    ,'i'   ,'o'      ,'p'   ,'['       ,']'        ,13    ,K_CTRL      ,'a'        ,'s'  ,//1
+       'd'        ,'f'   ,'g'  ,'h'  ,'j'  ,'k'    ,'l'    ,';'   ,'\''     ,'`'   ,K_SHIFT   ,'\\'       ,'z'   ,'x'         ,'c'        ,'v'  ,//2
+       'b'        ,'n'   ,'m'  ,','  ,'.'  ,'/'    ,K_SHIFT,'*'   ,K_ALT    ,' '   ,0         ,K_F1       ,K_F2  ,K_F3        ,K_F4       ,K_F5 ,//3
+       K_F6       ,K_F7  ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0      ,K_HOME,K_UPARROW,K_PGUP,K_KP_MINUS,K_LEFTARROW,K_KP_5,K_RIGHTARROW,K_KP_PLUS  ,K_END,//4
+       K_DOWNARROW,K_PGDN,K_INS,K_DEL,0    ,0      ,0      ,K_F11 ,K_F12    ,0     ,0         ,0          ,0     ,0           ,0          ,0    ,//5
+       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0         ,0          ,0     ,0           ,0          ,0    ,//6
+       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0         ,0          ,0     ,0           ,0          ,0     //7
 };
 
 
@@ -214,14 +376,64 @@ MapKey
 Map from windows to quake keynums
 =======
 */
-int MapKey (int key, int virtualkey)
+static int MapKey (int key, int virtualkey)
 {
-       key = (key>>16)&255;
-       if (key > 127)
-               return 0;
-       if (scantokey[key] == 0)
-               Con_DPrintf("key 0x%02x has no translation\n", key);
-       return scantokey[key];
+       int result;
+       int modified = (key >> 16) & 255;
+       qboolean is_extended = false;
+
+       if (modified < 128 && scantokey[modified])
+               result = scantokey[modified];
+       else
+       {
+               result = 0;
+               Con_DPrintf("key 0x%02x (0x%8x, 0x%8x) has no translation\n", modified, key, virtualkey);
+       }
+
+       if (key & (1 << 24))
+               is_extended = true;
+
+       if ( !is_extended )
+       {
+               switch ( result )
+               {
+               case K_HOME:
+                       return K_KP_HOME;
+               case K_UPARROW:
+                       return K_KP_UPARROW;
+               case K_PGUP:
+                       return K_KP_PGUP;
+               case K_LEFTARROW:
+                       return K_KP_LEFTARROW;
+               case K_RIGHTARROW:
+                       return K_KP_RIGHTARROW;
+               case K_END:
+                       return K_KP_END;
+               case K_DOWNARROW:
+                       return K_KP_DOWNARROW;
+               case K_PGDN:
+                       return K_KP_PGDN;
+               case K_INS:
+                       return K_KP_INS;
+               case K_DEL:
+                       return K_KP_DEL;
+               default:
+                       return result;
+               }
+       }
+       else
+       {
+               switch ( result )
+               {
+               case 0x0D:
+                       return K_KP_ENTER;
+               case 0x2F:
+                       return K_KP_SLASH;
+               case 0xAF:
+                       return K_KP_PLUS;
+               }
+               return result;
+       }
 }
 
 /*
@@ -239,19 +451,10 @@ ClearAllStates
 */
 void ClearAllStates (void)
 {
-       int             i;
-
-// send an up event for each key, to make sure the server clears them all
-       for (i=0 ; i<256 ; i++)
-       {
-               Key_Event (i, false);
-       }
-
        Key_ClearStates ();
        IN_ClearStates ();
 }
 
-void VID_RestoreGameGamma(void);
 extern qboolean host_loopactive;
 
 void AppActivate(BOOL fActive, BOOL minimize)
@@ -297,8 +500,6 @@ void AppActivate(BOOL fActive, BOOL minimize)
                        // LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers
                        MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
                }
-               if (host_loopactive)
-                       VID_RestoreGameGamma();
        }
 
        if (!fActive)
@@ -315,6 +516,24 @@ 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))
+       {
+       // we always update if there are any event, even if we're paused
+               scr_skipupdate = 0;
+
+               if (!GetMessage (&msg, NULL, 0, 0))
+                       Sys_Quit ();
+
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
+       }
+}
+
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* main window procedure */
@@ -322,6 +541,11 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
        LONG    lRet = 1;
        int             fActive, fMinimized, temp;
+       char    state[256];
+       char    asciichar[4];
+       int             vkey;
+       qboolean down = false;
+
        extern unsigned int uiWheelMessage;
 
        if ( uMsg == uiWheelMessage )
@@ -342,15 +566,19 @@ 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:
-                       Key_Event (MapKey(lParam, wParam), true);
-                       break;
-
+                       down = true;
                case WM_KEYUP:
                case WM_SYSKEYUP:
-                       Key_Event (MapKey(lParam, wParam), false);
+                       vkey = MapKey(lParam, wParam);
+                       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)
+                               asciichar[0] = 0;
+                       Key_Event (vkey, asciichar[0], down);
                        break;
 
                case WM_SYSCHAR:
@@ -365,6 +593,8 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                case WM_RBUTTONUP:
                case WM_MBUTTONDOWN:
                case WM_MBUTTONUP:
+               case WM_XBUTTONDOWN:   // backslash :: imouse explorer buttons
+               case WM_XBUTTONUP:      // backslash :: imouse explorer buttons
                case WM_MOUSEMOVE:
                        temp = 0;
 
@@ -377,6 +607,26 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                        if (wParam & MK_MBUTTON)
                                temp |= 4;
 
+                       /* backslash :: imouse explorer buttons */
+                       if (wParam & MK_XBUTTON1)
+                               temp |= 8;
+
+                       if (wParam & MK_XBUTTON2)
+                               temp |= 16;
+                       /* :: backslash */
+
+                       // LordHavoc: lets hope this allows more buttons in the future...
+                       if (wParam & MK_XBUTTON3)
+                               temp |= 32;
+                       if (wParam & MK_XBUTTON4)
+                               temp |= 64;
+                       if (wParam & MK_XBUTTON5)
+                               temp |= 128;
+                       if (wParam & MK_XBUTTON6)
+                               temp |= 256;
+                       if (wParam & MK_XBUTTON7)
+                               temp |= 512;
+
                        IN_MouseEvent (temp);
 
                        break;
@@ -386,11 +636,11 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                // Event.
                case WM_MOUSEWHEEL:
                        if ((short) HIWORD(wParam) > 0) {
-                               Key_Event(K_MWHEELUP, true);
-                               Key_Event(K_MWHEELUP, false);
+                               Key_Event(K_MWHEELUP, 0, true);
+                               Key_Event(K_MWHEELUP, 0, false);
                        } else {
-                               Key_Event(K_MWHEELDOWN, true);
-                               Key_Event(K_MWHEELDOWN, false);
+                               Key_Event(K_MWHEELDOWN, 0, true);
+                               Key_Event(K_MWHEELDOWN, 0, false);
                        }
                        break;
 
@@ -413,14 +663,9 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 
                        break;
 
-               case WM_DESTROY:
-               {
-                       if (mainwindow)
-                               DestroyWindow (mainwindow);
-
-                       PostQuitMessage (0);
-               }
-               break;
+               //case WM_DESTROY:
+               //      PostQuitMessage (0);
+               //      break;
 
                case MM_MCINOTIFY:
                        lRet = CDAudio_MessageHandler (hWnd, uMsg, wParam, lParam);
@@ -436,169 +681,27 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
        return lRet;
 }
 
-
-//static int grabsysgamma = true;
-WORD systemgammaramps[3][256], currentgammaramps[3][256];
-
-int VID_SetGamma(float prescale, float gamma, float scale, float base)
+int VID_SetGamma(unsigned short *ramps)
 {
-       int i;
-       HDC hdc;
-       hdc = GetDC (NULL);
-
-       BuildGammaTable16(prescale, gamma, scale, base, &currentgammaramps[0][0]);
-       for (i = 0;i < 256;i++)
-               currentgammaramps[1][i] = currentgammaramps[2][i] = currentgammaramps[0][i];
-
-       i = SetDeviceGammaRamp(hdc, &currentgammaramps[0][0]);
-
+       HDC hdc = GetDC (NULL);
+       int i = SetDeviceGammaRamp(hdc, ramps);
        ReleaseDC (NULL, hdc);
        return i; // return success or failure
 }
 
-void VID_RestoreGameGamma(void)
+int VID_GetGamma(unsigned short *ramps)
 {
-       VID_UpdateGamma(true);
-}
-
-void VID_GetSystemGamma(void)
-{
-       HDC hdc;
-       hdc = GetDC (NULL);
-
-       GetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
-
-       ReleaseDC (NULL, hdc);
-}
-
-void VID_RestoreSystemGamma(void)
-{
-       HDC hdc;
-       hdc = GetDC (NULL);
-
-       SetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
-
+       HDC hdc = GetDC (NULL);
+       int i = GetDeviceGammaRamp(hdc, ramps);
        ReleaseDC (NULL, hdc);
+       return i; // return success or failure
 }
 
-//========================================================
-// Video menu stuff
-//========================================================
-
-#if 0
-extern void M_Menu_Options_f (void);
-extern void M_Print (float cx, float cy, char *str);
-extern void M_PrintWhite (float cx, float cy, char *str);
-extern void M_DrawCharacter (float cx, float cy, int num);
-extern void M_DrawPic (float cx, float cy, char *picname);
-
-static int vid_wmodes;
-
-typedef struct
-{
-       int modenum;
-       char *desc;
-       int iscur;
-} modedesc_t;
-
-#define MAX_COLUMN_SIZE                9
-#define MODE_AREA_HEIGHT       (MAX_COLUMN_SIZE + 2)
-#define MAX_MODEDESCS          (MAX_COLUMN_SIZE*3)
-
-static modedesc_t modedescs[MAX_MODEDESCS];
-
-/*
-================
-VID_MenuDraw
-================
-*/
-void VID_MenuDraw (void)
-{
-       cachepic_t *p;
-       char *ptr;
-       int lnummodes, i, k, column, row;
-       vmode_t *pv;
-
-       p = Draw_CachePic ("gfx/vidmodes.lmp");
-       M_DrawPic ( (320-p->width)/2, 4, "gfx/vidmodes.lmp");
-
-       vid_wmodes = 0;
-       lnummodes = VID_NumModes ();
-
-       for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
-       {
-               ptr = VID_GetModeDescription (i);
-               pv = VID_GetModePtr (i);
-
-               k = vid_wmodes;
-
-               modedescs[k].modenum = i;
-               modedescs[k].desc = ptr;
-               modedescs[k].iscur = 0;
-
-               if (i == vid_modenum)
-                       modedescs[k].iscur = 1;
-
-               vid_wmodes++;
-
-       }
-
-       if (vid_wmodes > 0)
-       {
-               M_Print (2*8, 36+0*8, "Fullscreen Modes (WIDTHxHEIGHTxBPP)");
-
-               column = 8;
-               row = 36+2*8;
-
-               for (i=0 ; i<vid_wmodes ; i++)
-               {
-                       if (modedescs[i].iscur)
-                               M_PrintWhite (column, row, modedescs[i].desc);
-                       else
-                               M_Print (column, row, modedescs[i].desc);
-
-                       column += 13*8;
-
-                       if ((i % VID_ROW_SIZE) == (VID_ROW_SIZE - 1))
-                       {
-                               column = 8;
-                               row += 8;
-                       }
-               }
-       }
-
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*2, "Video modes must be set from the");
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*3, "command line with -width <width>");
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4, "and -bpp <bits-per-pixel>");
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6, "Select windowed mode with -window");
-}
-
-
-/*
-================
-VID_MenuKey
-================
-*/
-void VID_MenuKey (int key)
-{
-       switch (key)
-       {
-       case K_ESCAPE:
-               S_LocalSound ("misc/menu1.wav");
-               M_Menu_Options_f ();
-               break;
-
-       default:
-               break;
-       }
-}
-#endif
-
 static HINSTANCE gldll;
 
 int GL_OpenLibrary(const char *name)
 {
-       Con_Printf("Loading GL driver %s\n", name);
+       Con_Printf("Loading OpenGL driver %s\n", name);
        GL_CloseLibrary();
        if (!(gldll = LoadLibrary(name)))
        {
@@ -630,12 +733,13 @@ void *GL_GetProcAddress(const char *name)
        return p;
 }
 
+static void IN_Init(void);
 void VID_Init(void)
 {
        WNDCLASS wc;
 
        InitCommonControls();
-       hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
+       hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
 
        // Register the frame class
        wc.style         = 0;
@@ -643,7 +747,7 @@ 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;
@@ -651,6 +755,8 @@ void VID_Init(void)
 
        if (!RegisterClass (&wc))
                Sys_Error("Couldn't register window class\n");
+
+       IN_Init();
 }
 
 int VID_InitMode (int fullscreen, int width, int height, int bpp)
@@ -682,22 +788,38 @@ 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;
 
        if (vid_initialized)
                Sys_Error("VID_InitMode called when video is already initialised\n");
 
-       if (!GL_OpenLibrary("opengl32.dll"))
+       // if stencil is enabled, ask for alpha too
+       if (bpp >= 32)
+       {
+               pfd.cStencilBits = 8;
+               pfd.cAlphaBits = 8;
+       }
+       else
+       {
+               pfd.cStencilBits = 0;
+               pfd.cAlphaBits = 0;
+       }
+
+       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];
+       if (!GL_OpenLibrary(gldrivername))
        {
-               Con_Printf("Unable to load GL driver\n");
+               Con_Printf("Unable to load GL driver %s\n", gldrivername);
                return false;
        }
 
        memset(&gdevmode, 0, sizeof(gdevmode));
 
-       VID_GetSystemGamma();
-
        vid_isfullscreen = false;
        if (fullscreen)
        {
@@ -715,17 +837,24 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
 
                vid_isfullscreen = true;
                WindowStyle = WS_POPUP;
-               ExWindowStyle = 0;
+               ExWindowStyle = WS_EX_TOPMOST;
        }
        else
        {
                hdc = GetDC (NULL);
                i = GetDeviceCaps(hdc, RASTERCAPS);
+               depth = GetDeviceCaps(hdc, PLANES) * GetDeviceCaps(hdc, BITSPIXEL);
                ReleaseDC (NULL, hdc);
                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_Print("A higher desktop depth is required to run this video mode\n");
                        return false;
                }
 
@@ -765,8 +894,8 @@ 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);
                VID_Shutdown();
-               Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %d, %p) failed\n", ExWindowStyle, gamename, gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL);
                return false;
        }
 
@@ -778,10 +907,7 @@ 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 ();
+       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
@@ -805,247 +931,116 @@ 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);
-
-       if ((pixelformat = ChoosePixelFormat(hdc, &pfd)) == 0)
-       {
-               VID_Shutdown();
-               Con_Printf("ChoosePixelFormat(%d, %p) failed\n", hdc, &pfd);
-               return false;
-       }
-
-       if (SetPixelFormat(hdc, pixelformat, &pfd) == false)
-       {
-               VID_Shutdown();
-               Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", hdc, pixelformat, &pfd);
-               return false;
-       }
-
-       if (!GL_CheckExtension("wgl", wglfuncs, NULL, false))
-       {
-               VID_Shutdown();
-               Con_Printf("wgl functions not found\n");
-               return false;
-       }
-
-       baseRC = qwglCreateContext(hdc);
-       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");
-               return false;
-       }
-       if (!qwglMakeCurrent(hdc, baseRC))
-       {
-               VID_Shutdown();
-               Con_Printf("wglMakeCurrent(%d, %d) failed\n", hdc, baseRC);
-               return false;
-       }
 
-       qglGetString = GL_GetProcAddress("glGetString");
-       if (qglGetString == NULL)
-       {
-               VID_Shutdown();
-               Con_Printf("glGetString not found\n");
-               return false;
-       }
-       gl_renderer = qglGetString(GL_RENDERER);
-       gl_vendor = qglGetString(GL_VENDOR);
-       gl_version = qglGetString(GL_VERSION);
-       gl_extensions = qglGetString(GL_EXTENSIONS);
-       gl_platform = "WGL";
-       gl_platformextensions = "";
-
-       if (GL_CheckExtension("WGL_ARB_extensions_string", getextensionsstringfuncs, NULL, false))
-               gl_platformextensions = qwglGetExtensionsStringARB(hdc);
-
-       gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, NULL, false);
-       ReleaseDC(mainwindow, hdc);
-
-       GL_Init ();
+       baseDC = GetDC(mainwindow);
 
-       // LordHavoc: special differences for ATI (broken 8bit color when also using 32bit? weird!)
-       if (strncasecmp(gl_vendor,"ATI",3)==0)
-       {
-               if (strncasecmp(gl_renderer,"Rage Pro",8)==0)
-                       isRagePro = true;
-       }
-       if (strncasecmp(gl_renderer,"Matrox G200 Direct3D",20)==0) // a D3D driver for GL? sigh...
-               isG200 = true;
-
-       //vid_menudrawfn = VID_MenuDraw;
-       //vid_menukeyfn = VID_MenuKey;
-       vid_hidden = false;
-       vid_initialized = true;
-       return true;
-}
-
-void VID_Shutdown (void)
-{
-       HGLRC hRC = 0;
-       HDC hDC = 0;
-
-       if (vid_initialized)
+       if ((pixelformat = ChoosePixelFormat(baseDC, &pfd)) == 0)
        {
-               vid_initialized = false;
-               if (qwglGetCurrentContext)
-                       hRC = qwglGetCurrentContext();
-               if (qwglGetCurrentDC)
-                       hDC = qwglGetCurrentDC();
-
-               if (qwglMakeCurrent)
-                       qwglMakeCurrent(NULL, NULL);
-
-               if (hRC && qwglDeleteContext)
-                       qwglDeleteContext(hRC);
-
-               // close the library before we get rid of the window
-               GL_CloseLibrary();
-
-               if (hDC && mainwindow)
-                       ReleaseDC(mainwindow, hDC);
-
-               if (vid_isfullscreen)
-                       ChangeDisplaySettings (NULL, 0);
-
-               AppActivate(false, false);
-
-               VID_RestoreSystemGamma();
-       }
-}
-
-
-// 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);
-
-// 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 qboolean        dinput_acquired;
-
-static unsigned int            mstate_di;
-
-// joystick defines and variables
-// where should defines be moved?
-#define JOY_ABSOLUTE_AXIS      0x00000000              // control like a joystick
-#define JOY_RELATIVE_AXIS      0x00000010              // control like a mouse, spinner, trackball
-#define        JOY_MAX_AXES            6                               // X, Y, Z, R, U, V
-#define JOY_AXIS_X                     0
-#define JOY_AXIS_Y                     1
-#define JOY_AXIS_Z                     2
-#define JOY_AXIS_R                     3
-#define JOY_AXIS_U                     4
-#define JOY_AXIS_V                     5
+               VID_Shutdown();
+               Con_Printf("ChoosePixelFormat(%d, %p) failed\n", baseDC, &pfd);
+               return false;
+       }
 
-enum _ControlList
-{
-       AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn
-};
+       if (SetPixelFormat(baseDC, pixelformat, &pfd) == false)
+       {
+               VID_Shutdown();
+               Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", baseDC, pixelformat, &pfd);
+               return false;
+       }
 
-DWORD  dwAxisFlags[JOY_MAX_AXES] =
-{
-       JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ, JOY_RETURNR, JOY_RETURNU, JOY_RETURNV
-};
+       if (!GL_CheckExtension("wgl", wglfuncs, NULL, false))
+       {
+               VID_Shutdown();
+               Con_Print("wgl functions not found\n");
+               return false;
+       }
 
-DWORD  dwAxisMap[JOY_MAX_AXES];
-DWORD  dwControlMap[JOY_MAX_AXES];
-PDWORD pdwRawValue[JOY_MAX_AXES];
+       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(baseDC, baseRC))
+       {
+               VID_Shutdown();
+               Con_Printf("wglMakeCurrent(%d, %d) failed\n", baseDC, baseRC);
+               return false;
+       }
 
-// 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"};
+       qglGetString = GL_GetProcAddress("glGetString");
+       qwglGetExtensionsStringARB = GL_GetProcAddress("wglGetExtensionsStringARB");
+       if (qglGetString == NULL)
+       {
+               VID_Shutdown();
+               Con_Print("glGetString not found\n");
+               return false;
+       }
+       gl_renderer = qglGetString(GL_RENDERER);
+       gl_vendor = qglGetString(GL_VENDOR);
+       gl_version = qglGetString(GL_VERSION);
+       gl_extensions = qglGetString(GL_EXTENSIONS);
+       gl_platform = "WGL";
+       gl_platformextensions = "";
 
-qboolean       joy_avail, joy_advancedinit, joy_haspov;
-DWORD          joy_oldbuttonstate, joy_oldpovstate;
+       gl_videosyncavailable = false;
 
-int                    joy_id;
-DWORD          joy_flags;
-DWORD          joy_numbuttons;
+       if (qwglGetExtensionsStringARB)
+               gl_platformextensions = qwglGetExtensionsStringARB(baseDC);
 
-static LPDIRECTINPUT           g_pdi;
-static LPDIRECTINPUTDEVICE     g_pMouse;
+// COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control
+       gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
+       //ReleaseDC(mainwindow, hdc);
 
-static JOYINFOEX       ji;
+       GL_Init ();
 
-static HINSTANCE hInstDI;
+       // LordHavoc: special differences for ATI (broken 8bit color when also using 32bit? weird!)
+       if (strncasecmp(gl_vendor,"ATI",3)==0)
+       {
+               if (strncasecmp(gl_renderer,"Rage Pro",8)==0)
+                       isRagePro = true;
+       }
+       if (strncasecmp(gl_renderer,"Matrox G200 Direct3D",20)==0) // a D3D driver for GL? sigh...
+               isG200 = true;
 
-//static qboolean      dinput;
+       //vid_menudrawfn = VID_MenuDraw;
+       //vid_menukeyfn = VID_MenuKey;
+       vid_hidden = false;
+       vid_initialized = true;
 
-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;
+       IN_StartupMouse ();
+       IN_StartupJoystick ();
 
-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,},
-};
+       return true;
+}
 
-#define NUM_OBJECTS (sizeof(rgodf) / sizeof(rgodf[0]))
+static void IN_Shutdown(void);
+void VID_Shutdown (void)
+{
+       if(vid_initialized == false)
+               return;
 
-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
-};
+       VID_RestoreSystemGamma();
 
-// forward-referenced functions
-void IN_StartupJoystick (void);
-void Joy_AdvancedUpdate_f (void);
-void IN_JoyMove (usercmd_t *cmd);
+       vid_initialized = false;
+       IN_Shutdown();
+       if (qwglMakeCurrent)
+               qwglMakeCurrent(NULL, NULL);
+       if (baseRC && qwglDeleteContext)
+               qwglDeleteContext(baseRC);
+       // close the library before we get rid of the window
+       GL_CloseLibrary();
+       if (baseDC && mainwindow)
+               ReleaseDC(mainwindow, baseDC);
+       AppActivate(false, false);
+       if (mainwindow)
+               DestroyWindow(mainwindow);
+       mainwindow = 0;
+       if (vid_isfullscreen)
+               ChangeDisplaySettings (NULL, 0);
+       vid_isfullscreen = false;
+}
 
 
 /*
@@ -1184,10 +1179,10 @@ qboolean IN_InitDInput (void)
        if (!hInstDI)
        {
                hInstDI = LoadLibrary("dinput.dll");
-               
+
                if (hInstDI == NULL)
                {
-                       Con_SafePrint("Couldn't load dinput.dll\n");
+                       Con_SafePrint("Couldn't load dinput.dll\n");
                        return false;
                }
        }
@@ -1198,7 +1193,7 @@ qboolean IN_InitDInput (void)
 
                if (!pDirectInputCreate)
                {
-                       Con_SafePrint("Couldn't get DI proc addr\n");
+                       Con_SafePrint("Couldn't get DI proc addr\n");
                        return false;
                }
        }
@@ -1216,7 +1211,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrint("Couldn't open DI mouse device\n");
+               Con_SafePrint("Couldn't open DI mouse device\n");
                return false;
        }
 
@@ -1225,7 +1220,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrint("Couldn't set DI mouse format\n");
+               Con_SafePrint("Couldn't set DI mouse format\n");
                return false;
        }
 
@@ -1235,7 +1230,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrint("Couldn't set DI coop level\n");
+               Con_SafePrint("Couldn't set DI coop level\n");
                return false;
        }
 
@@ -1246,7 +1241,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrint("Couldn't set DI buffersize\n");
+               Con_SafePrint("Couldn't set DI buffersize\n");
                return false;
        }
 
@@ -1261,22 +1256,23 @@ IN_StartupMouse
 */
 void IN_StartupMouse (void)
 {
-       if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) 
-               return; 
+       if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
+               return;
 
        mouseinitialized = true;
 
+// COMMANDLINEOPTION: Windows Input: -dinput uses DirectInput (instead of GDI) for mouse/joystick input, may be more precise or responsive, but probably not
        if (COM_CheckParm ("-dinput"))
        {
                dinput = IN_InitDInput ();
 
                if (dinput)
                {
-                       Con_SafePrint("DirectInput initialized\n");
+                       Con_SafePrint("DirectInput initialized\n");
                }
                else
                {
-                       Con_SafePrint("DirectInput not initialized\n");
+                       Con_SafePrint("DirectInput not initialized\n");
                }
        }
 
@@ -1286,16 +1282,19 @@ void IN_StartupMouse (void)
 
                if (mouseparmsvalid)
                {
-                       if ( COM_CheckParm ("-noforcemspd") ) 
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (ignored with -dinput, windows only)
+                       if ( COM_CheckParm ("-noforcemspd") )
                                newmouseparms[2] = originalmouseparms[2];
 
-                       if ( COM_CheckParm ("-noforcemaccel") ) 
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (ignored with -dinput, windows only)
+                       if ( COM_CheckParm ("-noforcemaccel") )
                        {
                                newmouseparms[0] = originalmouseparms[0];
                                newmouseparms[1] = originalmouseparms[1];
                        }
 
-                       if ( COM_CheckParm ("-noforcemparms") ) 
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (ignored with -dinput, windows only)
+                       if ( COM_CheckParm ("-noforcemparms") )
                        {
                                newmouseparms[0] = originalmouseparms[0];
                                newmouseparms[1] = originalmouseparms[1];
@@ -1304,7 +1303,7 @@ void IN_StartupMouse (void)
                }
        }
 
-       mouse_buttons = 3;
+       mouse_buttons = 10;
 
 // if a fullscreen video mode was set before the mouse was initialized,
 // set the mouse state appropriately
@@ -1313,66 +1312,6 @@ void IN_StartupMouse (void)
 }
 
 
-/*
-===========
-IN_Init
-===========
-*/
-void IN_Init (void)
-{
-       // joystick variables
-       Cvar_RegisterVariable (&in_joystick);
-       Cvar_RegisterVariable (&joy_name);
-       Cvar_RegisterVariable (&joy_advanced);
-       Cvar_RegisterVariable (&joy_advaxisx);
-       Cvar_RegisterVariable (&joy_advaxisy);
-       Cvar_RegisterVariable (&joy_advaxisz);
-       Cvar_RegisterVariable (&joy_advaxisr);
-       Cvar_RegisterVariable (&joy_advaxisu);
-       Cvar_RegisterVariable (&joy_advaxisv);
-       Cvar_RegisterVariable (&joy_forwardthreshold);
-       Cvar_RegisterVariable (&joy_sidethreshold);
-       Cvar_RegisterVariable (&joy_pitchthreshold);
-       Cvar_RegisterVariable (&joy_yawthreshold);
-       Cvar_RegisterVariable (&joy_forwardsensitivity);
-       Cvar_RegisterVariable (&joy_sidesensitivity);
-       Cvar_RegisterVariable (&joy_pitchsensitivity);
-       Cvar_RegisterVariable (&joy_yawsensitivity);
-       Cvar_RegisterVariable (&joy_wwhack1);
-       Cvar_RegisterVariable (&joy_wwhack2);
-
-       Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f);
-
-       uiWheelMessage = RegisterWindowMessage ( "MSWHEEL_ROLLMSG" );
-
-       IN_StartupMouse ();
-       IN_StartupJoystick ();
-}
-
-/*
-===========
-IN_Shutdown
-===========
-*/
-void IN_Shutdown (void)
-{
-       IN_DeactivateMouse ();
-       IN_ShowMouse ();
-
-    if (g_pMouse)
-       {
-               IDirectInputDevice_Release(g_pMouse);
-               g_pMouse = NULL;
-       }
-
-    if (g_pdi)
-       {
-               IDirectInput_Release(g_pdi);
-               g_pdi = NULL;
-       }
-}
-
-
 /*
 ===========
 IN_MouseEvent
@@ -1390,16 +1329,16 @@ void IN_MouseEvent (int mstate)
                        if ( (mstate & (1<<i)) &&
                                !(mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, true);
+                               Key_Event (K_MOUSE1 + i, 0, true);
                        }
 
                        if ( !(mstate & (1<<i)) &&
                                (mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, false);
+                               Key_Event (K_MOUSE1 + i, 0, false);
                        }
-               }       
-                       
+               }
+
                mouse_oldbuttonstate = mstate;
        }
 }
@@ -1420,7 +1359,8 @@ void IN_MouseMove (usercmd_t *cmd)
        if (!mouseactive)
        {
                GetCursorPos (&current_pos);
-               ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+               //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+               IN_Mouse( cmd, 0, 0 );
                return;
        }
 
@@ -1488,13 +1428,13 @@ void IN_MouseMove (usercmd_t *cmd)
                        if ( (mstate_di & (1<<i)) &&
                                !(mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, true);
+                               Key_Event (K_MOUSE1 + i, 0, true);
                        }
 
                        if ( !(mstate_di & (1<<i)) &&
                                (mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, false);
+                               Key_Event (K_MOUSE1 + i, 0, false);
                        }
                }
 
@@ -1503,10 +1443,8 @@ void IN_MouseMove (usercmd_t *cmd)
        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_center_x;
+               my = current_pos.y - window_center_y;
        }
 
        IN_Mouse(cmd, mx, my);
@@ -1529,31 +1467,6 @@ void IN_Move (usercmd_t *cmd)
                IN_MouseMove (cmd);
                IN_JoyMove (cmd);
        }
-
-       cl.viewangles[PITCH] = bound (in_pitch_min.value, cl.viewangles[PITCH], in_pitch_max.value);
-}
-
-
-/*
-===========
-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);
-               }
-       }
 }
 
 
@@ -1565,37 +1478,34 @@ IN_ClearStates
 void IN_ClearStates (void)
 {
        if (mouseactive)
-       {
-               mx_accum = 0;
-               my_accum = 0;
                mouse_oldbuttonstate = 0;
-       }
 }
 
 
-/* 
-=============== 
-IN_StartupJoystick 
-=============== 
-*/  
-void IN_StartupJoystick (void) 
-{ 
+/*
+===============
+IN_StartupJoystick
+===============
+*/
+void IN_StartupJoystick (void)
+{
        int                     numdevs;
        JOYCAPS         jc;
        MMRESULT        mmr;
        mmr = 0;
+
        // assume no joystick
-       joy_avail = false; 
+       joy_avail = false;
 
        // abort startup if user requests no joystick
-       if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe")) 
-               return; 
+// COMMANDLINEOPTION: Windows Input: -nojoy disables joystick support, may be a small speed increase
+       if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe"))
+               return;
+
        // verify joystick driver is present
        if ((numdevs = joyGetNumDevs ()) == 0)
        {
-               Con_Print("\njoystick not found -- driver not present\n\n");
+               Con_Print("\njoystick not found -- driver not present\n\n");
                return;
        }
 
@@ -1608,12 +1518,12 @@ void IN_StartupJoystick (void)
 
                if ((mmr = joyGetPosEx (joy_id, &ji)) == JOYERR_NOERROR)
                        break;
-       } 
+       }
 
        // 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;
        }
 
@@ -1622,7 +1532,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;
        }
 
@@ -1636,10 +1546,10 @@ void IN_StartupJoystick (void)
        // mark the joystick as available and advanced initialization not completed
        // this is needed as cvars are not available during initialization
 
-       joy_avail = true; 
+       joy_avail = true;
        joy_advancedinit = false;
 
-       Con_Printf ("\njoystick detected\n\n"); 
+       Con_Print("\njoystick detected\n\n");
 }
 
 
@@ -1704,7 +1614,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
@@ -1740,7 +1650,6 @@ void Joy_AdvancedUpdate_f (void)
        }
 }
 
-
 /*
 ===========
 IN_Commands
@@ -1756,7 +1665,7 @@ void IN_Commands (void)
                return;
        }
 
-       
+
        // loop through the joystick buttons
        // key a joystick event or auxillary event for higher number buttons for each state change
        buttonstate = ji.dwButtons;
@@ -1764,14 +1673,14 @@ void IN_Commands (void)
        {
                if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
                {
-                       key_index = (i < 4) ? K_JOY1 : K_AUX1;
-                       Key_Event (key_index + i, true);
+                       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 < 4) ? K_JOY1 : K_AUX1;
-                       Key_Event (key_index + i, false);
+                       key_index = (i < 16) ? K_JOY1 : K_AUX1;
+                       Key_Event (key_index + i, 0, false);
                }
        }
        joy_oldbuttonstate = buttonstate;
@@ -1798,12 +1707,12 @@ void IN_Commands (void)
                {
                        if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
                        {
-                               Key_Event (K_AUX29 + i, true);
+                               Key_Event (K_AUX29 + i, 0, true);
                        }
 
                        if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
                        {
-                               Key_Event (K_AUX29 + i, false);
+                               Key_Event (K_AUX29 + i, 0, false);
                        }
                }
                joy_oldpovstate = povstate;
@@ -1811,11 +1720,11 @@ void IN_Commands (void)
 }
 
 
-/* 
-=============== 
+/*
+===============
 IN_ReadJoystick
-=============== 
-*/  
+===============
+*/
 qboolean IN_ReadJoystick (void)
 {
 
@@ -1866,7 +1775,7 @@ void IN_JoyMove (usercmd_t *cmd)
        // verify joystick is available and that the user wants to use it
        if (!joy_avail || !in_joystick.integer)
        {
-               return; 
+               return;
        }
 
        // collect the joystick data, if possible
@@ -1906,7 +1815,7 @@ void IN_JoyMove (usercmd_t *cmd)
                        }
                }
 
-               // convert range from -32768..32767 to -1..1 
+               // convert range from -32768..32767 to -1..1
                fAxisValue /= 32768.0;
 
                switch (dwAxisMap[i])
@@ -1916,7 +1825,7 @@ void IN_JoyMove (usercmd_t *cmd)
                        {
                                // user wants forward control to become look control
                                if (fabs(fAxisValue) > joy_pitchthreshold.value)
-                               {               
+                               {
                                        // if mouse invert is on, invert the joystick pitch value
                                        // only absolute control support here (joy_advanced is false)
                                        if (m_pitch.value < 0.0)
@@ -2017,3 +1926,43 @@ void IN_JoyMove (usercmd_t *cmd)
        }
 }
 
+static void IN_Init(void)
+{
+       uiWheelMessage = RegisterWindowMessage ( "MSWHEEL_ROLLMSG" );
+
+       // joystick variables
+       Cvar_RegisterVariable (&in_joystick);
+       Cvar_RegisterVariable (&joy_name);
+       Cvar_RegisterVariable (&joy_advanced);
+       Cvar_RegisterVariable (&joy_advaxisx);
+       Cvar_RegisterVariable (&joy_advaxisy);
+       Cvar_RegisterVariable (&joy_advaxisz);
+       Cvar_RegisterVariable (&joy_advaxisr);
+       Cvar_RegisterVariable (&joy_advaxisu);
+       Cvar_RegisterVariable (&joy_advaxisv);
+       Cvar_RegisterVariable (&joy_forwardthreshold);
+       Cvar_RegisterVariable (&joy_sidethreshold);
+       Cvar_RegisterVariable (&joy_pitchthreshold);
+       Cvar_RegisterVariable (&joy_yawthreshold);
+       Cvar_RegisterVariable (&joy_forwardsensitivity);
+       Cvar_RegisterVariable (&joy_sidesensitivity);
+       Cvar_RegisterVariable (&joy_pitchsensitivity);
+       Cvar_RegisterVariable (&joy_yawsensitivity);
+       Cvar_RegisterVariable (&joy_wwhack1);
+       Cvar_RegisterVariable (&joy_wwhack2);
+       Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f);
+}
+
+static void IN_Shutdown(void)
+{
+       IN_DeactivateMouse ();
+       IN_ShowMouse ();
+
+       if (g_pMouse)
+               IDirectInputDevice_Release(g_pMouse);
+       g_pMouse = NULL;
+
+       if (g_pdi)
+               IDirectInput_Release(g_pdi);
+       g_pdi = NULL;
+}