do not generate vertexposition/vertexmesh arrays in
[divverent/darkplaces.git] / vid_wgl.c
index 603adbf..81e45c3 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -17,21 +17,58 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// gl_vidnt.c -- NT GL vid component
+// vid_wgl.c -- NT GL vid component
 
-// we don't need a very new dinput
-#define DIRECTINPUT_VERSION 0x0300
+#ifdef _MSC_VER
+#pragma comment(lib, "comctl32.lib")
+#endif
+
+#ifdef SUPPORTDIRECTX
+// Include DX libs
+#ifdef _MSC_VER
+#pragma comment(lib, "dinput8.lib")
+#pragma comment(lib, "dxguid.lib")
+#endif
+#ifndef DIRECTINPUT_VERSION
+#      define DIRECTINPUT_VERSION 0x0500  /* Version 5.0 */
+#endif
+#endif
 
 #include "quakedef.h"
 #include <windows.h>
 #include <mmsystem.h>
+#ifdef SUPPORTDIRECTX
 #include <dsound.h>
+#endif
 #include "resource.h"
 #include <commctrl.h>
+#ifdef SUPPORTDIRECTX
 #include <dinput.h>
+#endif
+
+#ifdef SUPPORTD3D
+#include <d3d9.h>
+
+cvar_t vid_dx9 = {CVAR_SAVE, "vid_dx9", "0", "use Microsoft Direct3D9(r) for rendering"};
+cvar_t vid_dx9_hal = {CVAR_SAVE, "vid_dx9_hal", "1", "enables hardware rendering (1), otherwise software reference rasterizer (0 - very slow), note that 0 is necessary when using NVPerfHUD (which renders in hardware but requires this option to enable it)"};
+cvar_t vid_dx9_softvertex = {CVAR_SAVE, "vid_dx9_softvertex", "0", "enables software vertex processing (for compatibility testing?  or if you have a very fast CPU), usually you want this off"};
+cvar_t vid_dx9_triplebuffer = {CVAR_SAVE, "vid_dx9_triplebuffer", "0", "enables triple buffering when using vid_vsync in fullscreen, this options adds some latency and only helps when framerate is below 60 so you usually don't want it"};
+//cvar_t vid_dx10 = {CVAR_SAVE, "vid_dx10", "1", "use Microsoft Direct3D10(r) for rendering"};
+//cvar_t vid_dx11 = {CVAR_SAVE, "vid_dx11", "1", "use Microsoft Direct3D11(r) for rendering"};
+
+D3DPRESENT_PARAMETERS vid_d3dpresentparameters;
+
+// we declare this in vid_shared.c because it is required by dedicated server and all clients when SUPPORTD3D is defined
+extern LPDIRECT3DDEVICE9 vid_d3d9dev;
+
+LPDIRECT3D9 vid_d3d9;
+D3DCAPS9 vid_d3d9caps;
+qboolean vid_d3ddevicelost;
+#endif
 
 extern HINSTANCE global_hInstance;
 
+static HINSTANCE gldll;
 
 #ifndef WM_MOUSEWHEEL
 #define WM_MOUSEWHEEL                   0x020A
@@ -91,6 +128,7 @@ static DEVMODE gdevmode, initialdevmode;
 static qboolean vid_initialized = false;
 static qboolean vid_wassuspended = false;
 static qboolean vid_usingmouse = false;
+static qboolean vid_usinghidecursor = false;
 static qboolean vid_usingvsync = false;
 static qboolean vid_usevsync = false;
 static HICON hIcon;
@@ -117,17 +155,15 @@ static qboolean vid_isfullscreen;
 
 static int window_x, window_y;
 
-static void IN_Activate (qboolean grab);
-
 static qboolean mouseinitialized;
-static qboolean dinput;
-
-// input code
 
+#ifdef SUPPORTDIRECTX
+static qboolean dinput;
 #define DINPUT_BUFFERSIZE           16
 #define iDirectInputCreate(a,b,c,d)    pDirectInputCreate(a,b,c,d)
 
 static HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUT * lplpDirectInput, LPUNKNOWN punkOuter);
+#endif
 
 // LordHavoc: thanks to backslash for this support for mouse buttons 4 and 5
 /* backslash :: imouse explorer buttons */
@@ -156,9 +192,11 @@ static int                 mouse_buttons;
 static int                     mouse_oldbuttonstate;
 
 static unsigned int uiWheelMessage;
+#ifdef SUPPORTDIRECTX
 static qboolean        dinput_acquired;
 
 static unsigned int            mstate_di;
+#endif
 
 // joystick defines and variables
 // where should defines be moved?
@@ -172,6 +210,16 @@ static unsigned int                mstate_di;
 #define JOY_AXIS_U                     4
 #define JOY_AXIS_V                     5
 
+// joystick axes state
+typedef struct
+{
+       float oldmove;
+       float move;
+       float mdelta;
+       double keytime;
+}joy_axiscache_t;
+static joy_axiscache_t joy_axescache[JOY_MAX_AXES];
+
 enum _ControlList
 {
        AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn
@@ -210,6 +258,7 @@ static cvar_t joy_pitchsensitivity = {0, "joypitchsensitivity", "1.0", "how fast
 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 joy_axiskeyevents = {CVAR_SAVE, "joy_axiskeyevents", "0", "generate uparrow/leftarrow etc. keyevents for joystick axes, use if your joystick driver is not generating them"};
 
 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"};
 
@@ -220,13 +269,14 @@ static int                        joy_id;
 static DWORD           joy_flags;
 static DWORD           joy_numbuttons;
 
+#ifdef SUPPORTDIRECTX
 static LPDIRECTINPUT           g_pdi;
 static LPDIRECTINPUTDEVICE     g_pMouse;
+static HINSTANCE hInstDI;
+#endif
 
 static JOYINFOEX       ji;
 
-static HINSTANCE hInstDI;
-
 // forward-referenced functions
 static void IN_StartupJoystick (void);
 static void Joy_AdvancedUpdate_f (void);
@@ -236,31 +286,79 @@ static void IN_StartupMouse (void);
 
 //====================================
 
-void VID_Finish (qboolean allowmousegrab)
+qboolean vid_reallyhidden = true;
+#ifdef SUPPORTD3D
+qboolean vid_begunscene = false;
+#endif
+void VID_Finish (void)
 {
-       qboolean vid_usemouse;
+#ifdef SUPPORTD3D
+       if (vid_d3d9dev)
+       {
+               HRESULT hr;
+               if (vid_begunscene)
+               {
+                       IDirect3DDevice9_EndScene(vid_d3d9dev);
+                       vid_begunscene = false;
+               }
+               if (vid_reallyhidden)
+                       return;
+               if (!vid_d3ddevicelost)
+               {
+                       vid_hidden = vid_reallyhidden;
+                       hr = IDirect3DDevice9_Present(vid_d3d9dev, NULL, NULL, NULL, NULL);
+                       if (hr == D3DERR_DEVICELOST)
+                       {
+                               vid_d3ddevicelost = true;
+                               vid_hidden = true;
+                               Sleep(100);
+                       }
+               }
+               else
+               {
+                       hr = IDirect3DDevice9_TestCooperativeLevel(vid_d3d9dev);
+                       switch(hr)
+                       {
+                       case D3DERR_DEVICELOST:
+                               vid_d3ddevicelost = true;
+                               vid_hidden = true;
+                               Sleep(100);
+                               break;
+                       case D3DERR_DEVICENOTRESET:
+                               vid_d3ddevicelost = false;
+                               vid_hidden = vid_reallyhidden;
+                               R_Modules_DeviceLost();
+                               IDirect3DDevice9_Reset(vid_d3d9dev, &vid_d3dpresentparameters);
+                               R_Modules_DeviceRestored();
+                               break;
+                       case D3D_OK:
+                               vid_hidden = vid_reallyhidden;
+                               IDirect3DDevice9_Present(vid_d3d9dev, NULL, NULL, NULL, NULL);
+                               break;
+                       }
+               }
+               if (!vid_begunscene && !vid_hidden)
+               {
+                       IDirect3DDevice9_BeginScene(vid_d3d9dev);
+                       vid_begunscene = true;
+               }
+               return;
+       }
+#endif
 
-       vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
-       if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
+       vid_hidden = vid_reallyhidden;
+
+       vid_usevsync = vid_vsync.integer && !cls.timedemo && qwglSwapIntervalEXT;
+       if (vid_usingvsync != vid_usevsync)
        {
                vid_usingvsync = vid_usevsync;
                qwglSwapIntervalEXT (vid_usevsync);
        }
 
-// handle the mouse state when windowed if that's changed
-       vid_usemouse = false;
-       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;
-       IN_Activate(vid_usemouse);
-
-       if (r_render.integer && !vid_hidden)
+       if (!vid_hidden)
        {
                CHECKGLERROR
-               if (r_speeds.integer || gl_finish.integer)
+               if (r_speeds.integer == 2 || gl_finish.integer)
                {
                        qglFinish();CHECKGLERROR
                }
@@ -395,11 +493,11 @@ void AppActivate(BOOL fActive, BOOL minimize)
 {
        static qboolean sound_active = false;  // initially blocked by Sys_InitConsole()
 
-       vid_activewindow = fActive;
-       vid_hidden = minimize;
+       vid_activewindow = fActive != FALSE;
+       vid_reallyhidden = minimize != FALSE;
 
        // enable/disable sound on focus gain/loss
-       if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer))
+       if ((!vid_reallyhidden && vid_activewindow) || !snd_mutewhenidle.integer)
        {
                if (!sound_active)
                {
@@ -423,21 +521,26 @@ void AppActivate(BOOL fActive, BOOL minimize)
                        if (vid_wassuspended)
                        {
                                vid_wassuspended = false;
-                               ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN);
-                               ShowWindow(mainwindow, SW_SHOWNORMAL);
+                               if (gldll)
+                               {
+                                       ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN);
+                                       ShowWindow(mainwindow, SW_SHOWNORMAL);
+                               }
                        }
 
                        // LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers
-                       MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
+                       if (gldll)
+                               MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
                }
        }
 
        if (!fActive)
        {
-               IN_Activate (false);
+               VID_SetMouse(false, false, false);
                if (vid_isfullscreen)
                {
-                       ChangeDisplaySettings (NULL, 0);
+                       if (gldll)
+                               ChangeDisplaySettings (NULL, 0);
                        vid_wassuspended = true;
                }
                VID_RestoreSystemGamma();
@@ -482,12 +585,13 @@ static keynum_t buttonremap[16] =
 };
 
 /* main window procedure */
+static qboolean IN_JoystickBlockDoubledKeyEvents(int keycode);
 LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
        LONG    lRet = 1;
        int             fActive, fMinimized, temp;
-       char    state[256];
-       char    asciichar[4];
+       unsigned char state[256];
+       unsigned char asciichar[4];
        int             vkey;
        int             charlength;
        qboolean down = false;
@@ -508,7 +612,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                case WM_MOVE:
                        window_x = (int) LOWORD(lParam);
                        window_y = (int) HIWORD(lParam);
-                       IN_Activate(false);
+                       VID_SetMouse(false, false, false);
                        break;
 
                case WM_KEYDOWN:
@@ -520,13 +624,14 @@ 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
-                       charlength = ToAscii (wParam, lParam >> 16, state, (unsigned short *)asciichar, 0);
+                       charlength = ToAscii (wParam, lParam >> 16, state, (LPWORD)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);
+                       if (!IN_JoystickBlockDoubledKeyEvents(vkey))
+                               Key_Event (vkey, asciichar[0], down);
                        break;
 
                case WM_SYSCHAR:
@@ -535,8 +640,11 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 
                case WM_SYSCOMMAND:
                        // prevent screensaver from occuring while the active window
+                       // note: password-locked screensavers on Vista still work
                        if (vid_activewindow && ((wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER))
-                               lRet = 0;; // note: password-locked screensavers on Vista still work
+                               lRet = 0;
+                       else
+                               lRet = DefWindowProc (hWnd, uMsg, wParam, lParam);
                        break;
 
        // this is complicated because Win32 seems to pack multiple mouse events into
@@ -581,7 +689,9 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                        if (wParam & MK_XBUTTON7)
                                temp |= 512;
 
-                       if (vid_usingmouse && !dinput_acquired)
+#ifdef SUPPORTDIRECTX
+                       if (!dinput_acquired)
+#endif
                        {
                                // perform button actions
                                int i;
@@ -645,31 +755,42 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 
 int VID_SetGamma(unsigned short *ramps, int rampsize)
 {
-       HDC hdc = GetDC (NULL);
-       int i = SetDeviceGammaRamp(hdc, ramps);
-       ReleaseDC (NULL, hdc);
-       return i; // return success or failure
+       if (qwglMakeCurrent)
+       {
+               HDC hdc = GetDC (NULL);
+               int i = SetDeviceGammaRamp(hdc, ramps);
+               ReleaseDC (NULL, hdc);
+               return i; // return success or failure
+       }
+       else
+               return 0;
 }
 
 int VID_GetGamma(unsigned short *ramps, int rampsize)
 {
-       HDC hdc = GetDC (NULL);
-       int i = GetDeviceGammaRamp(hdc, ramps);
-       ReleaseDC (NULL, hdc);
-       return i; // return success or failure
+       if (qwglMakeCurrent)
+       {
+               HDC hdc = GetDC (NULL);
+               int i = GetDeviceGammaRamp(hdc, ramps);
+               ReleaseDC (NULL, hdc);
+               return i; // return success or failure
+       }
+       else
+               return 0;
 }
 
-static HINSTANCE gldll;
-
 static void GL_CloseLibrary(void)
 {
-       FreeLibrary(gldll);
-       gldll = 0;
-       gl_driver[0] = 0;
-       qwglGetProcAddress = NULL;
-       gl_extensions = "";
-       gl_platform = "";
-       gl_platformextensions = "";
+       if (gldll)
+       {
+               FreeLibrary(gldll);
+               gldll = 0;
+               gl_driver[0] = 0;
+               qwglGetProcAddress = NULL;
+               gl_extensions = "";
+               gl_platform = "";
+               gl_platformextensions = "";
+       }
 }
 
 static int GL_OpenLibrary(const char *name)
@@ -687,12 +808,17 @@ static int GL_OpenLibrary(const char *name)
 
 void *GL_GetProcAddress(const char *name)
 {
-       void *p = NULL;
-       if (qwglGetProcAddress != NULL)
-               p = (void *) qwglGetProcAddress(name);
-       if (p == NULL)
-               p = (void *) GetProcAddress(gldll, name);
-       return p;
+       if (gldll)
+       {
+               void *p = NULL;
+               if (qwglGetProcAddress != NULL)
+                       p = (void *) qwglGetProcAddress(name);
+               if (p == NULL)
+                       p = (void *) GetProcAddress(gldll, name);
+               return p;
+       }
+       else
+               return NULL;
 }
 
 #ifndef WGL_ARB_pixel_format
@@ -758,6 +884,15 @@ void VID_Init(void)
 {
        WNDCLASS wc;
 
+#ifdef SUPPORTD3D
+       Cvar_RegisterVariable(&vid_dx9);
+       Cvar_RegisterVariable(&vid_dx9_hal);
+       Cvar_RegisterVariable(&vid_dx9_softvertex);
+       Cvar_RegisterVariable(&vid_dx9_triplebuffer);
+//     Cvar_RegisterVariable(&vid_dx10);
+//     Cvar_RegisterVariable(&vid_dx11);
+#endif
+
        InitCommonControls();
        hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
 
@@ -782,7 +917,7 @@ void VID_Init(void)
        IN_Init();
 }
 
-int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
+qboolean VID_InitModeGL(viddef_mode_t *mode)
 {
        int i;
        HDC hdc;
@@ -811,7 +946,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
        };
        int windowpass;
        int pixelformat, newpixelformat;
-       int numpixelformats;
+       UINT numpixelformats;
        DWORD WindowStyle, ExWindowStyle;
        int CenterX, CenterY;
        const char *gldrivername;
@@ -822,6 +957,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
        float *af;
        int attribs[128];
        float attribsf[16];
+       int bpp = mode->bitsperpixel;
+       int width = mode->width;
+       int height = mode->height;
+       int refreshrate = (int)floor(mode->refreshrate+0.5);
+       int stereobuffer = mode->stereobuffer;
+       int samples = mode->samples;
+       int fullscreen = mode->fullscreen;
 
        if (vid_initialized)
                Sys_Error("VID_InitMode called when video is already initialised");
@@ -829,13 +971,21 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
        // if stencil is enabled, ask for alpha too
        if (bpp >= 32)
        {
-               pfd.cStencilBits = 8;
+               pfd.cRedBits = 8;
+               pfd.cGreenBits = 8;
+               pfd.cBlueBits = 8;
                pfd.cAlphaBits = 8;
+               pfd.cDepthBits = 24;
+               pfd.cStencilBits = 8;
        }
        else
        {
-               pfd.cStencilBits = 0;
+               pfd.cRedBits = 5;
+               pfd.cGreenBits = 5;
+               pfd.cBlueBits = 5;
                pfd.cAlphaBits = 0;
+               pfd.cDepthBits = 16;
+               pfd.cStencilBits = 0;
        }
 
        if (stereobuffer)
@@ -859,7 +1009,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                *a++ = WGL_BLUE_BITS_ARB;
                *a++ = 8;
                *a++ = WGL_ALPHA_BITS_ARB;
-               *a++ = 1;
+               *a++ = 8;
                *a++ = WGL_DEPTH_BITS_ARB;
                *a++ = 24;
                *a++ = WGL_STENCIL_BITS_ARB;
@@ -941,24 +1091,24 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                                        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(developer_extra.integer)
+                                       Con_DPrintf("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");
+                                       if(developer_extra.integer)
+                                               Con_DPrintf("wrong bpp\n");
                                        continue;
                                }
                                if(thismode.dmPelsWidth != (DWORD)width)
                                {
-                                       if(developer.integer >= 100)
-                                               Con_Printf("wrong width\n");
+                                       if(developer_extra.integer)
+                                               Con_DPrintf("wrong width\n");
                                        continue;
                                }
                                if(thismode.dmPelsHeight != (DWORD)height)
                                {
-                                       if(developer.integer >= 100)
-                                               Con_Printf("wrong height\n");
+                                       if(developer_extra.integer)
+                                               Con_DPrintf("wrong height\n");
                                        continue;
                                }
 
@@ -967,14 +1117,14 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                                        // 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");
+                                               if(developer_extra.integer)
+                                                       Con_DPrintf("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");
+                                               if(developer_extra.integer)
+                                                       Con_DPrintf("doesn't beat previous best match (too low)\n");
                                                continue;
                                        }
                                }
@@ -983,8 +1133,8 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                                        // 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");
+                                               if(developer_extra.integer)
+                                                       Con_DPrintf("doesn't beat previous best match (too high)\n");
                                                continue;
                                        }
                                }
@@ -995,12 +1145,12 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                                        foundgoodmode = true;
                                else
                                {
-                                       if(developer.integer >= 100)
-                                               Con_Printf("(out of range)\n");
+                                       if(developer_extra.integer)
+                                               Con_DPrintf("(out of range)\n");
                                }
                                foundmode = true;
-                               if(developer.integer >= 100)
-                                       Con_Printf("accepted\n");
+                               if(developer_extra.integer)
+                                       Con_DPrintf("accepted\n");
                        }
                }
 
@@ -1073,12 +1223,16 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
 
        pixelformat = 0;
        newpixelformat = 0;
-       for (windowpass = 0;windowpass < 2;windowpass++)
+       // start out at the final windowpass if samples is 1 as it's the only feature we need extended pixel formats for
+       for (windowpass = samples == 1;windowpass < 2;windowpass++)
        {
+               gl_extensions = "";
+               gl_platformextensions = "";
+
                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", (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);
+                       Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %p, %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), (void *)NULL, (void *)NULL, (void *)global_hInstance, (void *)NULL);
                        VID_Shutdown();
                        return false;
                }
@@ -1091,14 +1245,14 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                if (!pixelformat)
                {
                        VID_Shutdown();
-                       Con_Printf("ChoosePixelFormat(%d, %p) failed\n", (int)baseDC, &pfd);
+                       Con_Printf("ChoosePixelFormat(%p, %p) failed\n", (void *)baseDC, (void *)&pfd);
                        return false;
                }
 
                if (SetPixelFormat(baseDC, pixelformat, &pfd) == false)
                {
                        VID_Shutdown();
-                       Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", (int)baseDC, pixelformat, &pfd);
+                       Con_Printf("SetPixelFormat(%p, %d, %p) failed\n", (void *)baseDC, pixelformat, (void *)&pfd);
                        return false;
                }
 
@@ -1119,7 +1273,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                if (!qwglMakeCurrent(baseDC, baseRC))
                {
                        VID_Shutdown();
-                       Con_Printf("wglMakeCurrent(%d, %d) failed\n", (int)baseDC, (int)baseRC);
+                       Con_Printf("wglMakeCurrent(%p, %p) failed\n", (void *)baseDC, (void *)baseRC);
                        return false;
                }
 
@@ -1132,15 +1286,17 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                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);
-               gl_extensions = qglGetString(GL_EXTENSIONS);
+               gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
                gl_platform = "WGL";
                gl_platformextensions = "";
 
                if (qwglGetExtensionsStringARB)
-                       gl_platformextensions = qwglGetExtensionsStringARB(baseDC);
+                       gl_platformextensions = (const char *)qwglGetExtensionsStringARB(baseDC);
+
+               if (!gl_extensions)
+                       gl_extensions = "";
+               if (!gl_platformextensions)
+                       gl_platformextensions = "";
 
                // now some nice Windows pain:
                // we have created a window, we needed one to find out if there are
@@ -1165,12 +1321,6 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                }
        }
 
-       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);
-
        /*
        if (!fullscreen)
                SetWindowPos (mainwindow, NULL, CenterX, CenterY, 0, 0,SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME);
@@ -1202,47 +1352,319 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
        // fix the leftover Alt from any Alt-Tab or the like that switched us away
        ClearAllStates ();
 
-       gl_videosyncavailable = false;
-
 // COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control
-       gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
+       GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
 
        GL_Init ();
 
        //vid_menudrawfn = VID_MenuDraw;
        //vid_menukeyfn = VID_MenuKey;
        vid_usingmouse = false;
+       vid_usinghidecursor = false;
        vid_usingvsync = false;
-       vid_hidden = false;
+       vid_reallyhidden = vid_hidden = false;
        vid_initialized = true;
 
        IN_StartupMouse ();
        IN_StartupJoystick ();
 
-       if (gl_videosyncavailable)
+       if (qwglSwapIntervalEXT)
        {
-               vid_usevsync = vid_vsync.integer;
-               vid_usingvsync = vid_vsync.integer;
+               vid_usevsync = vid_vsync.integer != 0;
+               vid_usingvsync = vid_vsync.integer != 0;
                qwglSwapIntervalEXT (vid_usevsync);
        }
 
        return true;
 }
 
+#ifdef SUPPORTD3D
+static D3DADAPTER_IDENTIFIER9 d3d9adapteridentifier;
+
+extern cvar_t gl_info_extensions;
+extern cvar_t gl_info_vendor;
+extern cvar_t gl_info_renderer;
+extern cvar_t gl_info_version;
+extern cvar_t gl_info_platform;
+extern cvar_t gl_info_driver;
+qboolean VID_InitModeDX(viddef_mode_t *mode, int version)
+{
+       int deviceindex;
+       RECT rect;
+       MSG msg;
+       DWORD WindowStyle, ExWindowStyle;
+       int CenterX, CenterY;
+       int bpp = mode->bitsperpixel;
+       int width = mode->width;
+       int height = mode->height;
+       int refreshrate = (int)floor(mode->refreshrate+0.5);
+//     int stereobuffer = mode->stereobuffer;
+       int samples = mode->samples;
+       int fullscreen = mode->fullscreen;
+       int numdevices;
+
+       if (vid_initialized)
+               Sys_Error("VID_InitMode called when video is already initialised");
+
+       vid_isfullscreen = fullscreen != 0;
+       if (fullscreen)
+       {
+               WindowStyle = WS_POPUP;
+               ExWindowStyle = WS_EX_TOPMOST;
+       }
+       else
+       {
+               WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
+               ExWindowStyle = 0;
+       }
+
+       rect.top = 0;
+       rect.left = 0;
+       rect.right = width;
+       rect.bottom = height;
+       AdjustWindowRectEx(&rect, WindowStyle, false, 0);
+
+       if (fullscreen)
+       {
+               CenterX = 0;
+               CenterY = 0;
+       }
+       else
+       {
+               CenterX = (GetSystemMetrics(SM_CXSCREEN) - (rect.right - rect.left)) / 2;
+               CenterY = (GetSystemMetrics(SM_CYSCREEN) - (rect.bottom - rect.top)) / 2;
+       }
+       CenterX = max(0, CenterX);
+       CenterY = max(0, CenterY);
+
+       // x and y may be changed by WM_MOVE messages
+       window_x = CenterX;
+       window_y = CenterY;
+       rect.left += CenterX;
+       rect.right += CenterX;
+       rect.top += CenterY;
+       rect.bottom += CenterY;
+
+       gl_extensions = "";
+       gl_platformextensions = "";
+
+       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, %p, %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), (void *)NULL, (void *)NULL, global_hInstance, (void *)NULL);
+               VID_Shutdown();
+               return false;
+       }
+
+       baseDC = GetDC(mainwindow);
+
+       vid_d3d9 = Direct3DCreate9(D3D_SDK_VERSION);
+       if (!vid_d3d9)
+               Sys_Error("VID_InitMode: Direct3DCreate9 failed");
+
+       numdevices = IDirect3D9_GetAdapterCount(vid_d3d9);
+       vid_d3d9dev = NULL;
+       memset(&d3d9adapteridentifier, 0, sizeof(d3d9adapteridentifier));
+       for (deviceindex = 0;deviceindex < numdevices && !vid_d3d9dev;deviceindex++)
+       {
+               memset(&vid_d3dpresentparameters, 0, sizeof(vid_d3dpresentparameters));
+//             vid_d3dpresentparameters.Flags = D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL;
+               vid_d3dpresentparameters.Flags = 0;
+               vid_d3dpresentparameters.SwapEffect = D3DSWAPEFFECT_DISCARD;
+               vid_d3dpresentparameters.hDeviceWindow = mainwindow;
+               vid_d3dpresentparameters.BackBufferWidth = width;
+               vid_d3dpresentparameters.BackBufferHeight = height;
+               vid_d3dpresentparameters.MultiSampleType = samples > 1 ? (D3DMULTISAMPLE_TYPE)samples : D3DMULTISAMPLE_NONE;
+               vid_d3dpresentparameters.BackBufferCount = fullscreen ? (vid_dx9_triplebuffer.integer ? 3 : 2) : 1;
+               vid_d3dpresentparameters.FullScreen_RefreshRateInHz = fullscreen ? refreshrate : 0;
+               vid_d3dpresentparameters.Windowed = !fullscreen;
+               vid_d3dpresentparameters.EnableAutoDepthStencil = true;
+               vid_d3dpresentparameters.AutoDepthStencilFormat = bpp > 16 ? D3DFMT_D24S8 : D3DFMT_D16;
+               vid_d3dpresentparameters.BackBufferFormat = fullscreen?D3DFMT_X8R8G8B8:D3DFMT_UNKNOWN;
+               vid_d3dpresentparameters.PresentationInterval = vid_vsync.integer ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
+
+               memset(&d3d9adapteridentifier, 0, sizeof(d3d9adapteridentifier));
+               IDirect3D9_GetAdapterIdentifier(vid_d3d9, deviceindex, 0, &d3d9adapteridentifier);
+
+               IDirect3D9_CreateDevice(vid_d3d9, deviceindex, vid_dx9_hal.integer ? D3DDEVTYPE_HAL : D3DDEVTYPE_REF, mainwindow, vid_dx9_softvertex.integer ? D3DCREATE_SOFTWARE_VERTEXPROCESSING : D3DCREATE_HARDWARE_VERTEXPROCESSING, &vid_d3dpresentparameters, &vid_d3d9dev);
+       }
+
+       if (!vid_d3d9dev)
+       {
+               VID_Shutdown();
+               return false;
+       }
+
+       IDirect3DDevice9_GetDeviceCaps(vid_d3d9dev, &vid_d3d9caps);
+
+       Con_Printf("Using D3D9 device: %s\n", d3d9adapteridentifier.Description);
+       gl_extensions = "";
+       gl_platform = "D3D9";
+       gl_platformextensions = "";
+
+       ShowWindow (mainwindow, SW_SHOWDEFAULT);
+       UpdateWindow (mainwindow);
+
+       // 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
+       // to let messages finish bouncing around the system, then we put
+       // ourselves at the top of the z order, then grab the foreground again,
+       // Who knows if it helps, but it probably doesn't hurt
+       SetForegroundWindow (mainwindow);
+
+       while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+       {
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
+       }
+
+       Sleep (100);
+
+       SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOCOPYBITS);
+
+       SetForegroundWindow (mainwindow);
+
+       // fix the leftover Alt from any Alt-Tab or the like that switched us away
+       ClearAllStates ();
+
+       gl_renderer = d3d9adapteridentifier.Description;
+       gl_vendor = d3d9adapteridentifier.Driver;
+       gl_version = "";
+       gl_extensions = "";
+
+       Con_Printf("D3D9 adapter info:\n");
+       Con_Printf("Description: %s\n", d3d9adapteridentifier.Description);
+       Con_Printf("DeviceId: %x\n", (unsigned int)d3d9adapteridentifier.DeviceId);
+       Con_Printf("DeviceName: %p\n", d3d9adapteridentifier.DeviceName);
+       Con_Printf("Driver: %s\n", d3d9adapteridentifier.Driver);
+       Con_Printf("DriverVersion: %08x%08x\n", (unsigned int)d3d9adapteridentifier.DriverVersion.u.HighPart, (unsigned int)d3d9adapteridentifier.DriverVersion.u.LowPart);
+       Con_DPrintf("GL_EXTENSIONS: %s\n", gl_extensions);
+       Con_DPrintf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions);
+
+       // clear the extension flags
+       memset(&vid.support, 0, sizeof(vid.support));
+       Cvar_SetQuick(&gl_info_extensions, "");
+
+       CHECKGLERROR
+
+       vid.forcevbo = false;
+       vid.support.arb_depth_texture = true;
+       vid.support.arb_draw_buffers = vid_d3d9caps.NumSimultaneousRTs > 1;
+       vid.support.arb_occlusion_query = true; // can't find a cap for this
+       vid.support.arb_shadow = true;
+       vid.support.arb_texture_compression = true;
+       vid.support.arb_texture_cube_map = true;
+       vid.support.arb_texture_non_power_of_two = (vid_d3d9caps.TextureCaps & D3DPTEXTURECAPS_POW2) == 0;
+       vid.support.arb_vertex_buffer_object = true;
+       vid.support.ext_blend_subtract = true;
+       vid.support.ext_draw_range_elements = true;
+       vid.support.ext_framebuffer_object = true;
+       vid.support.ext_texture_3d = true;
+       vid.support.ext_texture_compression_s3tc = true;
+       vid.support.ext_texture_filter_anisotropic = true;
+       vid.support.ati_separate_stencil = (vid_d3d9caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED) != 0;
+
+       vid.maxtexturesize_2d = min(vid_d3d9caps.MaxTextureWidth, vid_d3d9caps.MaxTextureHeight);
+       vid.maxtexturesize_3d = vid_d3d9caps.MaxVolumeExtent;
+       vid.maxtexturesize_cubemap = vid.maxtexturesize_2d;
+       vid.texunits = 4;
+       vid.teximageunits = vid_d3d9caps.MaxSimultaneousTextures;
+       vid.texarrayunits = 8; // can't find a caps field for this?
+       vid.max_anisotropy = vid_d3d9caps.MaxAnisotropy;
+       vid.maxdrawbuffers = vid_d3d9caps.NumSimultaneousRTs;
+
+       vid.texunits = bound(4, vid.texunits, MAX_TEXTUREUNITS);
+       vid.teximageunits = bound(16, vid.teximageunits, MAX_TEXTUREUNITS);
+       vid.texarrayunits = bound(8, vid.texarrayunits, MAX_TEXTUREUNITS);
+       Con_DPrintf("Using D3D9.0 rendering path - %i texture matrix, %i texture images, %i texcoords, shadowmapping supported%s\n", vid.texunits, vid.teximageunits, vid.texarrayunits, vid.maxdrawbuffers > 1 ? ", MRT detected (allows prepass deferred lighting)" : "");
+       vid.renderpath = RENDERPATH_D3D9;
+
+       Cvar_SetQuick(&gl_info_vendor, gl_vendor);
+       Cvar_SetQuick(&gl_info_renderer, gl_renderer);
+       Cvar_SetQuick(&gl_info_version, gl_version);
+       Cvar_SetQuick(&gl_info_platform, gl_platform ? gl_platform : "");
+       Cvar_SetQuick(&gl_info_driver, gl_driver);
+
+       // LordHavoc: report supported extensions
+       Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions );
+
+       // clear to black (loading plaque will be seen over this)
+       IDirect3DDevice9_Clear(vid_d3d9dev, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0);
+       IDirect3DDevice9_BeginScene(vid_d3d9dev);
+       IDirect3DDevice9_EndScene(vid_d3d9dev);
+       IDirect3DDevice9_Present(vid_d3d9dev, NULL, NULL, NULL, NULL);
+       // because the only time we end/begin scene is in VID_Finish, we'd better start a scene now...
+       IDirect3DDevice9_BeginScene(vid_d3d9dev);
+       vid_begunscene = true;
+
+       //vid_menudrawfn = VID_MenuDraw;
+       //vid_menukeyfn = VID_MenuKey;
+       vid_usingmouse = false;
+       vid_usinghidecursor = false;
+       vid_usingvsync = false;
+       vid_hidden = vid_reallyhidden = false;
+       vid_initialized = true;
+
+       IN_StartupMouse ();
+       IN_StartupJoystick ();
+
+       return true;
+}
+#endif
+
+qboolean VID_InitMode(viddef_mode_t *mode)
+{
+#ifdef SUPPORTD3D
+//     if (vid_dx11.integer)
+//             return VID_InitModeDX(mode, 11);
+//     if (vid_dx10.integer)
+//             return VID_InitModeDX(mode, 10);
+       if (vid_dx9.integer)
+               return VID_InitModeDX(mode, 9);
+#endif
+       return VID_InitModeGL(mode);
+}
+
+
 static void IN_Shutdown(void);
 void VID_Shutdown (void)
 {
+       qboolean isgl;
        if(vid_initialized == false)
                return;
 
+       VID_SetMouse(false, false, false);
        VID_RestoreSystemGamma();
 
        vid_initialized = false;
+       isgl = gldll != NULL;
        IN_Shutdown();
+       gl_driver[0] = 0;
+       gl_extensions = "";
+       gl_platform = "";
+       gl_platformextensions = "";
+#ifdef SUPPORTD3D
+       if (vid_d3d9dev)
+       {
+               if (vid_begunscene)
+                       IDirect3DDevice9_EndScene(vid_d3d9dev);
+               vid_begunscene = false;
+//             Cmd_ExecuteString("r_texturestats", src_command);
+//             Cmd_ExecuteString("memlist", src_command);
+               IDirect3DDevice9_Release(vid_d3d9dev);
+       }
+       vid_d3d9dev = NULL;
+       if (vid_d3d9)
+               IDirect3D9_Release(vid_d3d9);
+       vid_d3d9 = NULL;
+#endif
        if (qwglMakeCurrent)
                qwglMakeCurrent(NULL, NULL);
+       qwglMakeCurrent = NULL;
        if (baseRC && qwglDeleteContext)
                qwglDeleteContext(baseRC);
+       qwglDeleteContext = NULL;
        // close the library before we get rid of the window
        GL_CloseLibrary();
        if (baseDC && mainwindow)
@@ -1251,12 +1673,12 @@ void VID_Shutdown (void)
        if (mainwindow)
                DestroyWindow(mainwindow);
        mainwindow = 0;
-       if (vid_isfullscreen)
+       if (vid_isfullscreen && isgl)
                ChangeDisplaySettings (NULL, 0);
        vid_isfullscreen = false;
 }
 
-static void IN_Activate (qboolean grab)
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
        static qboolean restore_spi;
        static int originalmouseparms[3];
@@ -1264,18 +1686,20 @@ static void IN_Activate (qboolean grab)
        if (!mouseinitialized)
                return;
 
-       if (grab)
+       if (relative)
        {
                if (!vid_usingmouse)
                {
                        vid_usingmouse = true;
                        cl_ignoremousemoves = 2;
+#ifdef SUPPORTDIRECTX
                        if (dinput && g_pMouse)
                        {
                                IDirectInputDevice_Acquire(g_pMouse);
                                dinput_acquired = true;
                        }
                        else
+#endif
                        {
                                RECT window_rect;
                                window_rect.left = window_x;
@@ -1291,7 +1715,7 @@ static void IN_Activate (qboolean grab)
                                        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);
+                                       restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0) != FALSE;
                                }
                                else
                                        restore_spi = false;
@@ -1300,7 +1724,6 @@ static void IN_Activate (qboolean grab)
                                SetCapture (mainwindow);
                                ClipCursor (&window_rect);
                        }
-                       ShowCursor (false);
                }
        }
        else
@@ -1309,12 +1732,14 @@ static void IN_Activate (qboolean grab)
                {
                        vid_usingmouse = false;
                        cl_ignoremousemoves = 2;
+#ifdef SUPPORTDIRECTX
                        if (dinput_acquired)
                        {
                                IDirectInputDevice_Unacquire(g_pMouse);
                                dinput_acquired = false;
                        }
                        else
+#endif
                        {
                                // restore system mouseparms if we changed them
                                if (restore_spi)
@@ -1323,12 +1748,18 @@ static void IN_Activate (qboolean grab)
                                ClipCursor (NULL);
                                ReleaseCapture ();
                        }
-                       ShowCursor (true);
                }
        }
+
+       if (vid_usinghidecursor != hidecursor)
+       {
+               vid_usinghidecursor = hidecursor;
+               ShowCursor (!hidecursor);
+       }
 }
 
 
+#ifdef SUPPORTDIRECTX
 /*
 ===========
 IN_InitDInput
@@ -1360,7 +1791,7 @@ static qboolean IN_InitDInput (void)
 
        if (!pDirectInputCreate)
        {
-               pDirectInputCreate = (void *)GetProcAddress(hInstDI,"DirectInputCreateA");
+               pDirectInputCreate = (HRESULT (__stdcall *)(HINSTANCE,DWORD,LPDIRECTINPUT *,LPUNKNOWN))GetProcAddress(hInstDI,"DirectInputCreateA");
 
                if (!pDirectInputCreate)
                {
@@ -1378,7 +1809,11 @@ static qboolean IN_InitDInput (void)
        }
 
 // obtain an interface to the system mouse device.
+#ifdef __cplusplus
+       hr = IDirectInput_CreateDevice(g_pdi, GUID_SysMouse, &g_pMouse, NULL);
+#else
        hr = IDirectInput_CreateDevice(g_pdi, &GUID_SysMouse, &g_pMouse, NULL);
+#endif
 
        if (FAILED(hr))
        {
@@ -1418,6 +1853,7 @@ static qboolean IN_InitDInput (void)
 
        return true;
 }
+#endif
 
 
 /*
@@ -1432,6 +1868,7 @@ static void IN_StartupMouse (void)
 
        mouseinitialized = true;
 
+#ifdef SUPPORTDIRECTX
 // COMMANDLINEOPTION: Windows Input: -dinput enables DirectInput for mouse/joystick input
        if (COM_CheckParm ("-dinput"))
                dinput = IN_InitDInput ();
@@ -1440,6 +1877,7 @@ static void IN_StartupMouse (void)
                Con_Print("DirectInput initialized\n");
        else
                Con_Print("DirectInput not initialized\n");
+#endif
 
        mouse_buttons = 10;
 }
@@ -1452,23 +1890,22 @@ IN_MouseMove
 */
 static void IN_MouseMove (void)
 {
-       int i, mx, my;
        POINT current_pos;
 
+       GetCursorPos (&current_pos);
+       in_windowmouse_x = current_pos.x - window_x;
+       in_windowmouse_y = current_pos.y - window_y;
+
        if (!vid_usingmouse)
-       {
-               //GetCursorPos (&current_pos);
-               //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
                return;
-       }
 
+#ifdef SUPPORTDIRECTX
        if (dinput_acquired)
        {
+               int i;
                DIDEVICEOBJECTDATA      od;
                DWORD                           dwElements;
                HRESULT                         hr;
-               mx = 0;
-               my = 0;
 
                for (;;)
                {
@@ -1489,57 +1926,31 @@ static void IN_MouseMove (void)
 
                        /* Look at the element to see what happened */
 
-                       switch (od.dwOfs)
+                       if ((int)od.dwOfs == DIMOFS_X)
+                               in_mouse_x += (LONG) od.dwData;
+                       if ((int)od.dwOfs == DIMOFS_Y)
+                               in_mouse_y += (LONG) od.dwData;
+                       if ((int)od.dwOfs == DIMOFS_Z)
                        {
-                               case DIMOFS_X:
-                                       mx += (LONG) od.dwData;
-                                       break;
-
-                               case DIMOFS_Y:
-                                       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:
-                                       if (od.dwData & 0x80)
-                                               mstate_di |= 1;
-                                       else
-                                               mstate_di &= ~1;
-                                       break;
-
-                               case DIMOFS_BUTTON1:
-                                       if (od.dwData & 0x80)
-                                               mstate_di |= (1<<1);
-                                       else
-                                               mstate_di &= ~(1<<1);
-                                       break;
-
-                               case DIMOFS_BUTTON2:
-                                       if (od.dwData & 0x80)
-                                               mstate_di |= (1<<2);
-                                       else
-                                               mstate_di &= ~(1<<2);
-                                       break;
-
-                               case DIMOFS_BUTTON3:
-                                       if (od.dwData & 0x80)
-                                               mstate_di |= (1<<3);
-                                       else
-                                               mstate_di &= ~(1<<3);
-                                       break;
+                               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);
+                               }
                        }
+                       if ((int)od.dwOfs == DIMOFS_BUTTON0)
+                               mstate_di = (mstate_di & ~1) | ((od.dwData & 0x80) >> 7);
+                       if ((int)od.dwOfs == DIMOFS_BUTTON1)
+                               mstate_di = (mstate_di & ~2) | ((od.dwData & 0x80) >> 6);
+                       if ((int)od.dwOfs == DIMOFS_BUTTON2)
+                               mstate_di = (mstate_di & ~4) | ((od.dwData & 0x80) >> 5);
+                       if ((int)od.dwOfs == DIMOFS_BUTTON3)
+                               mstate_di = (mstate_di & ~8) | ((od.dwData & 0x80) >> 4);
                }
 
                // perform button actions
@@ -1547,22 +1958,15 @@ static void IN_MouseMove (void)
                        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
+#endif
        {
-               GetCursorPos (&current_pos);
-               mx = current_pos.x - (window_x + vid.width / 2);
-               my = current_pos.y - (window_y + vid.height / 2);
-
-               in_mouse_x = mx;
-               in_mouse_y = my;
+               in_mouse_x += in_windowmouse_x - (int)(vid.width / 2);
+               in_mouse_y += in_windowmouse_y - (int)(vid.height / 2);
 
                // if the mouse has moved, force it to the center, so there's room to move
-               if (!cl.csqc_wantsmousemove)
-               if (mx || my)
+               if (in_mouse_x || in_mouse_y)
                        SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2));
        }
 }
@@ -1575,7 +1979,7 @@ IN_Move
 */
 void IN_Move (void)
 {
-       if (vid_activewindow && !vid_hidden)
+       if (vid_activewindow && !vid_reallyhidden)
        {
                IN_MouseMove ();
                IN_JoyMove ();
@@ -1639,7 +2043,7 @@ static void IN_StartupJoystick (void)
 
        // save the joystick's number of buttons and POV status
        joy_numbuttons = jc.wNumButtons;
-       joy_haspov = jc.wCaps & JOYCAPS_HASPOV;
+       joy_haspov = (jc.wCaps & JOYCAPS_HASPOV) != 0;
 
        // old button and POV states default to no buttons pressed
        joy_oldbuttonstate = joy_oldpovstate = 0;
@@ -1783,17 +2187,150 @@ static qboolean IN_ReadJoystick (void)
        }
 }
 
+/*
+===========
+ IN_JoystickGetAxisNum
+===========
+*/
+
+int IN_JoystickGetAxisNum(int ControlListType)
+{
+       int i;
+
+       for (i = 0; i < JOY_MAX_AXES; i++)
+               if (dwAxisMap[i] == ControlListType)
+                       return i;
+       return -1;
+}
+
+/*
+===========
+ IN_JoystickGetAxis
+===========
+*/
+static double IN_JoystickGetAxis(int axis, double sensitivity, double deadzone)
+{
+       float   fAxisValue, fTemp;
+
+       if (!joy_avail || axis < 0 || axis >= JOY_MAX_AXES)
+               return 0; // no such axis on this joystick
+
+       // get the floating point zero-centered, potentially-inverted data for the current axis
+       fAxisValue = (float) *pdwRawValue[axis];
+
+       // move centerpoint to zero
+       fAxisValue -= 32768.0;
+
+       if (joy_wwhack2.integer != 0.0)
+       {
+               if (dwAxisMap[axis] == AxisTurn)
+               {
+                       // this is a special formula for the Logitech WingMan Warrior
+                       // y=ax^b; where a = 300 and b = 1.3
+                       // also x values are in increments of 800 (so this is factored out)
+                       // then bounds check result to level out excessively high spin rates
+                       fTemp = 300.0 * pow(abs(fAxisValue) / 800.0, 1.3);
+                       if (fTemp > 14000.0)
+                               fTemp = 14000.0;
+                       // restore direction information
+                       fAxisValue = (fAxisValue > 0.0) ? fTemp : -fTemp;
+               }
+       }
+
+       // convert range from -32768..32767 to -1..1
+       fAxisValue /= 32768.0;
+
+       // deadzone around center
+       if (fabs(fAxisValue) < deadzone)
+               return 0; 
+
+       // apply sensitivity
+       return fAxisValue * sensitivity;
+}
+
+/*
+===========
+ IN_JoystickKeyeventForAxis
+===========
+*/
+
+static void IN_JoystickKeyeventForAxis(int axis, int key_pos, int key_neg)
+{
+       double joytime;
+
+       if (axis < 0 || axis >= JOY_MAX_AXES)
+               return; // no such axis on this joystick
+
+       joytime = Sys_DoubleTime();
+       // no key event, continuous keydown event
+       if (joy_axescache[axis].move == joy_axescache[axis].oldmove)
+       {
+               if (joy_axescache[axis].move != 0 && joytime > joy_axescache[axis].keytime)
+               {
+                       //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].move > 0) ? key_pos : key_neg), 1, cl.time);
+                       Key_Event((joy_axescache[axis].move > 0) ? key_pos : key_neg, 0, 1);
+                       joy_axescache[axis].keytime = joytime + 0.5 / 20;
+               }
+               return;
+       }
+       // generate key up event
+       if (joy_axescache[axis].oldmove)
+       {
+               //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].oldmove > 0) ? key_pos : key_neg), 1, cl.time);
+               Key_Event((joy_axescache[axis].oldmove > 0) ? key_pos : key_neg, 0, 0);
+       }
+       // generate key down event
+       if (joy_axescache[axis].move)
+       {
+               //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].move > 0) ? key_pos : key_neg), 1, cl.time);
+               Key_Event((joy_axescache[axis].move > 0) ? key_pos : key_neg, 0, 1);
+               joy_axescache[axis].keytime = joytime + 0.5;
+       }
+}
+
+/*
+===========
+ IN_JoystickBlockDoubledKeyEvents
+===========
+*/
+
+static qboolean IN_ReadJoystick (void);
+static qboolean IN_JoystickBlockDoubledKeyEvents(int keycode)
+{
+       int axis;
+
+       if (!joy_axiskeyevents.integer)
+               return false;
+
+       // block keyevent if it's going to be provided by joystick keyevent system
+       if (joy_avail)
+       {
+               // collect the joystick data, if possible
+               if (IN_ReadJoystick() != true)
+                       return false;
+               axis = IN_JoystickGetAxisNum(AxisForward);
+               if (keycode == K_UPARROW || keycode == K_DOWNARROW)
+                       if (IN_JoystickGetAxis(axis, 1, 0.01) || joy_axescache[axis].move || joy_axescache[axis].oldmove)
+                               return true;
+               axis = IN_JoystickGetAxisNum(AxisSide);
+               if (keycode == K_RIGHTARROW || keycode == K_LEFTARROW)
+                       if (IN_JoystickGetAxis(axis, 1, 0.01) || joy_axescache[axis].move || joy_axescache[axis].oldmove)
+                               return true;
+       }
+
+       return false;
+}
 
 /*
 ===========
-IN_JoyMove
+ IN_JoyMove
 ===========
 */
 static void IN_JoyMove (void)
 {
        float   speed, aspeed;
-       float   fAxisValue, fTemp;
-       int             i, mouselook = (in_mlook.state & 1) || freelook.integer;
+       float   fAxisValue;
+       int             i, mouselook = (in_mlook.state & 1) || freelook.integer, AxisForwardIndex = -1, AxisSideIndex = -1;
 
        // complete initialization if first time in
        // this is needed as cvars are not available at initialization time
@@ -1818,7 +2355,6 @@ static void IN_JoyMove (void)
                                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;
@@ -1883,135 +2419,109 @@ static void IN_JoyMove (void)
        // loop through the axes
        for (i = 0; i < JOY_MAX_AXES; i++)
        {
-               // get the floating point zero-centered, potentially-inverted data for the current axis
-               fAxisValue = (float) *pdwRawValue[i];
-               // move centerpoint to zero
-               fAxisValue -= 32768.0;
-
-               if (joy_wwhack2.integer != 0.0)
-               {
-                       if (dwAxisMap[i] == AxisTurn)
-                       {
-                               // this is a special formula for the Logitech WingMan Warrior
-                               // y=ax^b; where a = 300 and b = 1.3
-                               // also x values are in increments of 800 (so this is factored out)
-                               // then bounds check result to level out excessively high spin rates
-                               fTemp = 300.0 * pow(abs(fAxisValue) / 800.0, 1.3);
-                               if (fTemp > 14000.0)
-                                       fTemp = 14000.0;
-                               // restore direction information
-                               fAxisValue = (fAxisValue > 0.0) ? fTemp : -fTemp;
-                       }
-               }
-
-               // convert range from -32768..32767 to -1..1
-               fAxisValue /= 32768.0;
-
+               // convert axis to real move
                switch (dwAxisMap[i])
                {
-               case AxisForward:
-                       if ((joy_advanced.integer == 0) && mouselook)
-                       {
-                               // user wants forward control to become look control
-                               if (fabs(fAxisValue) > joy_pitchthreshold.value)
+                       case AxisForward:
+                               if (AxisForwardIndex < 0)
+                                       AxisForwardIndex = i;
+                               if ((joy_advanced.integer == 0) && mouselook)
                                {
-                                       // 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)
+                                       // user wants forward control to become look control
+                                       fAxisValue = IN_JoystickGetAxis(i, joy_pitchsensitivity.value, joy_pitchthreshold.value);
+                                       if (fAxisValue != 0)
                                        {
-                                               cl.viewangles[PITCH] -= (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.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)
+                                                       cl.viewangles[PITCH] -= fAxisValue * aspeed * cl_pitchspeed.value;
+                                               else
+                                                       cl.viewangles[PITCH] += fAxisValue * aspeed * cl_pitchspeed.value;
+                                               V_StopPitchDrift();
                                        }
                                        else
                                        {
-                                               cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
+                                               // no pitch movement
+                                               // disable pitch return-to-center unless requested by user
+                                               // *** this code can be removed when the lookspring bug is fixed
+                                               // *** the bug always has the lookspring feature on
+                                               if (lookspring.value == 0.0)
+                                                       V_StopPitchDrift();
                                        }
-                                       V_StopPitchDrift();
                                }
                                else
                                {
-                                       // no pitch movement
-                                       // disable pitch return-to-center unless requested by user
-                                       // *** this code can be removed when the lookspring bug is fixed
-                                       // *** the bug always has the lookspring feature on
-                                       if(lookspring.value == 0.0)
-                                               V_StopPitchDrift();
+                                       // user wants forward control to be forward control
+                                       fAxisValue = IN_JoystickGetAxis(i, joy_forwardsensitivity.value, joy_forwardthreshold.value);
+                                       cl.cmd.forwardmove += fAxisValue * speed * cl_forwardspeed.value;
                                }
-                       }
-                       else
-                       {
-                               // user wants forward control to be forward control
-                               if (fabs(fAxisValue) > joy_forwardthreshold.value)
-                               {
-                                       cl.cmd.forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value;
-                               }
-                       }
-                       break;
+                               break;
 
-               case AxisSide:
-                       if (fabs(fAxisValue) > joy_sidethreshold.value)
-                       {
-                               cl.cmd.sidemove += (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value;
-                       }
-                       break;
+                       case AxisSide:
+                               if (AxisSideIndex < 0)
+                                       AxisSideIndex = i;
+                               fAxisValue = IN_JoystickGetAxis(i, joy_sidesensitivity.value, joy_sidethreshold.value);
+                               cl.cmd.sidemove += fAxisValue * speed * cl_sidespeed.value;
+                               break;
 
-               case AxisTurn:
-                       if ((in_strafe.state & 1) || (lookstrafe.integer && mouselook))
-                       {
-                               // user wants turn control to become side control
-                               if (fabs(fAxisValue) > joy_sidethreshold.value)
+                       case AxisTurn:
+                               if ((in_strafe.state & 1) || (lookstrafe.integer && mouselook))
                                {
-                                       cl.cmd.sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value;
+                                       // user wants turn control to become side control
+                                       fAxisValue = IN_JoystickGetAxis(i, joy_sidesensitivity.value, joy_sidethreshold.value);
+                                       cl.cmd.sidemove -= fAxisValue * speed * cl_sidespeed.value;
                                }
-                       }
-                       else
-                       {
-                               // user wants turn control to be turn control
-                               if (fabs(fAxisValue) > joy_yawthreshold.value)
+                               else
                                {
-                                       if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
-                                       {
-                                               cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * aspeed * cl_yawspeed.value;
-                                       }
+                                       // user wants turn control to be turn control
+                                       fAxisValue = IN_JoystickGetAxis(i, joy_yawsensitivity.value, joy_yawthreshold.value);
+                                       if (dwControlMap[i] == JOY_ABSOLUTE_AXIS)
+                                               cl.viewangles[YAW] += fAxisValue * aspeed * cl_yawspeed.value;
                                        else
-                                       {
-                                               cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * speed * 180.0;
-                                       }
-
+                                               cl.viewangles[YAW] += fAxisValue * speed * 180.0;
                                }
-                       }
-                       break;
+                               break;
 
-               case AxisLook:
-                       if (mouselook)
-                       {
-                               if (fabs(fAxisValue) > joy_pitchthreshold.value)
+                       case AxisLook:
+                               fAxisValue = IN_JoystickGetAxis(i, joy_pitchsensitivity.value, joy_pitchthreshold.value);
+                               if (mouselook)
                                {
-                                       // pitch movement detected and pitch movement desired by user
-                                       if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
+                                       if (fAxisValue != 0)
                                        {
-                                               cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
+                                               // pitch movement detected and pitch movement desired by user
+                                               if (dwControlMap[i] == JOY_ABSOLUTE_AXIS)
+                                                       cl.viewangles[PITCH] += fAxisValue * aspeed * cl_pitchspeed.value;
+                                               else
+                                                       cl.viewangles[PITCH] += fAxisValue * speed * 180.0;
+                                               V_StopPitchDrift();
                                        }
                                        else
                                        {
-                                               cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * speed * 180.0;
+                                               // no pitch movement
+                                               // disable pitch return-to-center unless requested by user
+                                               // *** this code can be removed when the lookspring bug is fixed
+                                               // *** the bug always has the lookspring feature on
+                                               if(lookspring.integer == 0)
+                                                       V_StopPitchDrift();
                                        }
-                                       V_StopPitchDrift();
                                }
-                               else
-                               {
-                                       // no pitch movement
-                                       // disable pitch return-to-center unless requested by user
-                                       // *** this code can be removed when the lookspring bug is fixed
-                                       // *** the bug always has the lookspring feature on
-                                       if(lookspring.integer == 0)
-                                               V_StopPitchDrift();
-                               }
-                       }
-                       break;
+                               break;
 
-               default:
-                       break;
+                       default:
+                               fAxisValue = IN_JoystickGetAxis(i, 1, 0.01);
+                               break;
                }
+       
+               // cache for keyevents
+               joy_axescache[i].oldmove = joy_axescache[i].move;
+               joy_axescache[i].move = IN_JoystickGetAxis(i, 1, 0.01);
+       }
+
+       // run keyevents
+       if (joy_axiskeyevents.integer)
+       {
+               IN_JoystickKeyeventForAxis(AxisForwardIndex, K_DOWNARROW, K_UPARROW);
+               IN_JoystickKeyeventForAxis(AxisSideIndex, K_RIGHTARROW, K_LEFTARROW);
        }
 }
 
@@ -2039,14 +2549,14 @@ static void IN_Init(void)
        Cvar_RegisterVariable (&joy_yawsensitivity);
        Cvar_RegisterVariable (&joy_wwhack1);
        Cvar_RegisterVariable (&joy_wwhack2);
+       Cvar_RegisterVariable (&joy_axiskeyevents);
        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_Activate (false);
-
+#ifdef SUPPORTDIRECTX
        if (g_pMouse)
                IDirectInputDevice_Release(g_pMouse);
        g_pMouse = NULL;
@@ -2054,4 +2564,34 @@ static void IN_Shutdown(void)
        if (g_pdi)
                IDirectInput_Release(g_pdi);
        g_pdi = NULL;
+#endif
+}
+
+size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
+{
+       int i;
+       size_t k;
+       DEVMODE thismode;
+
+       thismode.dmSize = sizeof(thismode);
+       thismode.dmDriverExtra = 0;
+       k = 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(k >= maxcount)
+                       break;
+               modes[k].width = thismode.dmPelsWidth;
+               modes[k].height = thismode.dmPelsHeight;
+               modes[k].bpp = thismode.dmBitsPerPel;
+               modes[k].refreshrate = thismode.dmDisplayFrequency;
+               modes[k].pixelheight_num = 1;
+               modes[k].pixelheight_denom = 1; // Win32 apparently does not provide this (FIXME)
+               ++k;
+       }
+       return k;
 }