remove an unused extension function list
[xonotic/darkplaces.git] / vid_wgl.c
index c30a890..1ecdb05 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -24,336 +24,85 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "resource.h"
 #include <commctrl.h>
 
-#define MAX_MODE_LIST  30
-#define VID_ROW_SIZE   3
-#define MAXWIDTH               10000
-#define MAXHEIGHT              10000
-
-#define MODE_WINDOWED                  0
-#define NO_MODE                                        (MODE_WINDOWED - 1)
-#define MODE_FULLSCREEN_DEFAULT        (MODE_WINDOWED + 1)
-
-typedef struct {
-       modestate_t     type;
-       int                     width;
-       int                     height;
-       int                     modenum;
-       int                     dib;
-       int                     fullscreen;
-       int                     bpp;
-       int                     halfscreen;
-       char            modedesc[17];
-} vmode_t;
-
-typedef struct {
-       int                     width;
-       int                     height;
-} lmode_t;
-
-lmode_t        lowresmodes[] = {
-       {320, 200},
-       {320, 240},
-       {400, 300},
-       {512, 384},
+int cl_available = true;
+
+int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *);
+int (WINAPI *qwglDescribePixelFormat)(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
+//int (WINAPI *qwglGetPixelFormat)(HDC);
+BOOL (WINAPI *qwglSetPixelFormat)(HDC, int, CONST PIXELFORMATDESCRIPTOR *);
+BOOL (WINAPI *qwglSwapBuffers)(HDC);
+HGLRC (WINAPI *qwglCreateContext)(HDC);
+BOOL (WINAPI *qwglDeleteContext)(HGLRC);
+HGLRC (WINAPI *qwglGetCurrentContext)(VOID);
+HDC (WINAPI *qwglGetCurrentDC)(VOID);
+PROC (WINAPI *qwglGetProcAddress)(LPCSTR);
+BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC);
+BOOL (WINAPI *qwglSwapIntervalEXT)(int interval);
+const char *(WINAPI *qwglGetExtensionsStringARB)(HDC hdc);
+
+static gl_extensionfunctionlist_t wglfuncs[] =
+{
+       {"wglChoosePixelFormat", (void **) &qwglChoosePixelFormat},
+       {"wglDescribePixelFormat", (void **) &qwglDescribePixelFormat},
+//     {"wglGetPixelFormat", (void **) &qwglGetPixelFormat},
+       {"wglSetPixelFormat", (void **) &qwglSetPixelFormat},
+       {"wglSwapBuffers", (void **) &qwglSwapBuffers},
+       {"wglCreateContext", (void **) &qwglCreateContext},
+       {"wglDeleteContext", (void **) &qwglDeleteContext},
+       {"wglGetProcAddress", (void **) &qwglGetProcAddress},
+       {"wglMakeCurrent", (void **) &qwglMakeCurrent},
+       {"wglGetCurrentContext", (void **) &qwglGetCurrentContext},
+       {"wglGetCurrentDC", (void **) &qwglGetCurrentDC},
+       {NULL, NULL}
 };
 
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
+static gl_extensionfunctionlist_t wglswapintervalfuncs[] =
+{
+       {"wglSwapIntervalEXT", (void **) &qwglSwapIntervalEXT},
+       {NULL, NULL}
+};
 
-qboolean               DDActive;
-qboolean               scr_skipupdate;
+void VID_RestoreGameGamma(void);
+void VID_GetSystemGamma(void);
+void VID_RestoreSystemGamma(void);
 
-static vmode_t modelist[MAX_MODE_LIST];
-static int             nummodes;
-static vmode_t *pcurrentmode;
-static vmode_t badmode;
+qboolean scr_skipupdate;
 
-static DEVMODE gdevmode;
-static qboolean        vid_initialized = false;
-static qboolean        windowed, leavecurrentmode;
-static qboolean vid_canalttab = false;
+static DEVMODE gdevmode;
+static qboolean vid_initialized = false;
 static qboolean vid_wassuspended = false;
-static int             windowed_mouse;
-extern qboolean        mouseactive;  // from in_win.c
-static HICON   hIcon;
-
-int                    DIBWidth, DIBHeight;
-RECT           WindowRect;
-DWORD          WindowStyle, ExWindowStyle;
-
-HWND   mainwindow;
-
-int                    vid_modenum = NO_MODE;
-int                    vid_realmode;
-int                    vid_default = MODE_WINDOWED;
-static int     windowed_default;
-unsigned char  vid_curpal[256*3];
-
-HGLRC  baseRC;
-HDC            maindc;
-
-glvert_t glv;
+static int vid_usingmouse;
+extern qboolean mouseactive;  // from in_win.c
+static HICON hIcon;
 
-HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
+HWND mainwindow;
 
-viddef_t       vid;                            // global video state
+//HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
 
-float          gldepthmin, gldepthmax;
+static int vid_isfullscreen;
 
-modestate_t    modestate = MS_UNINIT;
+//void VID_MenuDraw (void);
+//void VID_MenuKey (int key);
 
-void VID_MenuDraw (void);
-void VID_MenuKey (int key);
-
-LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-void AppActivate(BOOL fActive, BOOL minimize);
-char *VID_GetModeDescription (int mode);
-void ClearAllStates (void);
-void VID_UpdateWindowStatus (void);
-
-// LordHavoc: ARB multitexture support
-int gl_mtex_enum = 0;
-
-qboolean isG200 = false; // LordHavoc: the Matrox G200 can't do per pixel alpha, and it uses a D3D driver for GL... ugh...
-qboolean isRagePro = false; // LordHavoc: the ATI Rage Pro has limitations with per pixel alpha (the color scaler does not apply to per pixel alpha images...), although not as bad as a G200.
-qboolean gl_mtexable = false;
-qboolean gl_arrays = false;
+//LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+//void AppActivate(BOOL fActive, BOOL minimize);
+//void ClearAllStates (void);
+//void VID_UpdateWindowStatus (void);
 
 //====================================
 
-cvar_t         vid_mode = {"vid_mode","0", false};
-// Note that 0 is MODE_WINDOWED
-//cvar_t               _vid_default_mode = {"_vid_default_mode","0", true};
-// Note that 3 is MODE_FULLSCREEN_DEFAULT
-//cvar_t               _vid_default_mode_win = {"_vid_default_mode_win","3", true};
-cvar_t         _windowed_mouse = {"_windowed_mouse","1", true};
-
-int                    window_center_x, window_center_y, window_x, window_y, window_width, window_height;
-RECT           window_rect;
-
-// direct draw software compatability stuff
-
-void CenterWindow(HWND hWndCenter, int width, int height, BOOL lefttopjustify)
-{
-    int     CenterX, CenterY;
-
-       CenterX = (GetSystemMetrics(SM_CXSCREEN) - width) / 2;
-       CenterY = (GetSystemMetrics(SM_CYSCREEN) - height) / 2;
-       if (CenterX > CenterY*2)
-               CenterX >>= 1;  // dual screens
-       CenterX = (CenterX < 0) ? 0: CenterX;
-       CenterY = (CenterY < 0) ? 0: CenterY;
-       SetWindowPos (hWndCenter, NULL, CenterX, CenterY, 0, 0,
-                       SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME);
-}
-
-qboolean VID_SetWindowedMode (int modenum)
-{
-       int                             lastmodestate, width, height;
-       RECT                    rect;
-
-       lastmodestate = modestate;
-
-       WindowRect.top = WindowRect.left = 0;
-
-       WindowRect.right = modelist[modenum].width;
-       WindowRect.bottom = modelist[modenum].height;
-
-       DIBWidth = modelist[modenum].width;
-       DIBHeight = modelist[modenum].height;
-
-       WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
-       ExWindowStyle = 0;
-
-       rect = WindowRect;
-       AdjustWindowRectEx(&rect, WindowStyle, FALSE, 0);
-
-       width = rect.right - rect.left;
-       height = rect.bottom - rect.top;
-
-       // Create the DIB window
-       mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlaces", "DarkPlacesGL", WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
-
-       if (!mainwindow)
-               Sys_Error ("Couldn't create DIB window");
-
-       // Center and show the DIB window
-       CenterWindow(mainwindow, WindowRect.right - WindowRect.left, WindowRect.bottom - WindowRect.top, false);
-
-       ShowWindow (mainwindow, SW_SHOWDEFAULT);
-       UpdateWindow (mainwindow);
-
-       modestate = MS_WINDOWED;
-
-       if (vid.conheight > modelist[modenum].height)
-               vid.conheight = modelist[modenum].height;
-       if (vid.conwidth > modelist[modenum].width)
-               vid.conwidth = modelist[modenum].width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
-
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)TRUE, (LPARAM)hIcon);
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)FALSE, (LPARAM)hIcon);
-
-       return true;
-}
-
-
-qboolean VID_SetFullDIBMode (int modenum)
-{
-       int                             lastmodestate, width, height;
-       RECT                    rect;
-
-       if (!leavecurrentmode)
-       {
-               gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-               gdevmode.dmBitsPerPel = modelist[modenum].bpp;
-               gdevmode.dmPelsWidth = modelist[modenum].width <<
-                                                          modelist[modenum].halfscreen;
-               gdevmode.dmPelsHeight = modelist[modenum].height;
-               gdevmode.dmSize = sizeof (gdevmode);
-
-               if (ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
-                       Sys_Error ("Couldn't set fullscreen DIB mode");
-       }
-
-       lastmodestate = modestate;
-       modestate = MS_FULLDIB;
-
-       WindowRect.top = WindowRect.left = 0;
-
-       WindowRect.right = modelist[modenum].width;
-       WindowRect.bottom = modelist[modenum].height;
-
-       DIBWidth = modelist[modenum].width;
-       DIBHeight = modelist[modenum].height;
-
-       WindowStyle = WS_POPUP;
-       ExWindowStyle = 0;
-
-       rect = WindowRect;
-       AdjustWindowRectEx(&rect, WindowStyle, FALSE, 0);
-
-       width = rect.right - rect.left;
-       height = rect.bottom - rect.top;
-
-       // Create the DIB window
-       mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlaces", "DarkPlacesGL", WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
-
-       if (!mainwindow)
-               Sys_Error ("Couldn't create DIB window");
-
-       ShowWindow (mainwindow, SW_SHOWDEFAULT);
-       UpdateWindow (mainwindow);
-
-       if (vid.conheight > modelist[modenum].height)
-               vid.conheight = modelist[modenum].height;
-       if (vid.conwidth > modelist[modenum].width)
-               vid.conwidth = modelist[modenum].width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
-
-// needed because we're not getting WM_MOVE messages fullscreen on NT
-       window_x = 0;
-       window_y = 0;
-
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)TRUE, (LPARAM)hIcon);
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)FALSE, (LPARAM)hIcon);
+int window_x, window_y, window_width, window_height;
+int window_center_x, window_center_y;
 
-       return true;
-}
-
-
-int VID_SetMode (int modenum)
-{
-       int                             original_mode, temp;
-       qboolean                stat;
-    MSG                                msg;
-
-       if ((windowed && (modenum != 0)) || (!windowed && (modenum < 1)) || (!windowed && (modenum >= nummodes)))
-               Sys_Error ("Bad video mode\n");
-
-// so Con_Printfs don't mess us up by forcing vid and snd updates
-       temp = scr_disabled_for_loading;
-       scr_disabled_for_loading = true;
-
-       CDAudio_Pause ();
-
-       if (vid_modenum == NO_MODE)
-               original_mode = windowed_default;
-       else
-               original_mode = vid_modenum;
-
-       // Set either the fullscreen or windowed mode
-       if (modelist[modenum].type == MS_WINDOWED)
-       {
-               if (_windowed_mouse.value && key_dest == key_game)
-               {
-                       stat = VID_SetWindowedMode(modenum);
-                       IN_ActivateMouse ();
-                       IN_HideMouse ();
-               }
-               else
-               {
-                       IN_DeactivateMouse ();
-                       IN_ShowMouse ();
-                       stat = VID_SetWindowedMode(modenum);
-               }
-       }
-       else if (modelist[modenum].type == MS_FULLDIB)
-       {
-               stat = VID_SetFullDIBMode(modenum);
-               IN_ActivateMouse ();
-               IN_HideMouse ();
-       }
-       else
-               Sys_Error ("VID_SetMode: Bad mode type in modelist");
-
-       window_width = DIBWidth;
-       window_height = DIBHeight;
-       VID_UpdateWindowStatus ();
-
-       CDAudio_Resume ();
-       scr_disabled_for_loading = temp;
-
-       if (!stat)
-               Sys_Error ("Couldn't set video mode");
-
-// 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);
-       vid_modenum = modenum;
-       Cvar_SetValue ("vid_mode", (float)vid_modenum);
-
-       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 ();
-
-       if (!msg_suppress_1)
-               Con_SafePrintf ("Video mode %s initialized.\n", VID_GetModeDescription (vid_modenum));
-
-       vid.recalc_refdef = 1;
-
-       return true;
-}
+void IN_ShowMouse (void);
+void IN_DeactivateMouse (void);
+void IN_HideMouse (void);
+void IN_ActivateMouse (void);
+void IN_MouseEvent (int mstate);
+void IN_UpdateClipCursor (void);
 
+qboolean mouseinitialized;
+static qboolean dinput;
 
 /*
 ================
@@ -362,225 +111,83 @@ VID_UpdateWindowStatus
 */
 void VID_UpdateWindowStatus (void)
 {
+       window_center_x = window_x + window_width / 2;
+       window_center_y = window_y + window_height / 2;
 
-       window_rect.left = window_x;
-       window_rect.top = window_y;
-       window_rect.right = window_x + window_width;
-       window_rect.bottom = window_y + window_height;
-       window_center_x = (window_rect.left + window_rect.right) / 2;
-       window_center_y = (window_rect.top + window_rect.bottom) / 2;
-
-       IN_UpdateClipCursor ();
-}
-
-
-//====================================
-
-void (GLAPIENTRY *qglVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (GLAPIENTRY *qglColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (GLAPIENTRY *qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (GLAPIENTRY *qglArrayElement)(GLint i);
-void (GLAPIENTRY *qglDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-void (GLAPIENTRY *qglMTexCoord2f)(GLenum, GLfloat, GLfloat);
-void (GLAPIENTRY *qglSelectTexture)(GLenum);
-
-void VID_CheckVertexArrays (void)
-{
-       if (COM_CheckParm("-novertex"))
+       if (mouseinitialized && mouseactive && !dinput)
        {
-               Con_Printf("...vertex array support disabled\n");
-               return;
+               RECT window_rect;
+               window_rect.left = window_x;
+               window_rect.top = window_y;
+               window_rect.right = window_x + window_width;
+               window_rect.bottom = window_y + window_height;
+               ClipCursor (&window_rect);
        }
-       if ((qglArrayElement = (void *) wglGetProcAddress("glArrayElement"))
-        && (qglColorPointer = (void *) wglGetProcAddress("glColorPointer"))
-//      && (qglDrawArrays = (void *) wglGetProcAddress("glDrawArrays"))
-        && (qglDrawElements = (void *) wglGetProcAddress("glDrawElements"))
-//      && (qglInterleavedArrays = (void *) wglGetProcAddress("glInterleavedArrays"))
-        && (qglTexCoordPointer = (void *) wglGetProcAddress("glTexCoordPointer"))
-        && (qglVertexPointer = (void *) wglGetProcAddress("glVertexPointer"))
-               )
-       {
-               Con_Printf("...vertex array support detected\n");
-               gl_arrays = true;
-               return;
-       }
-
-       Con_Printf("...vertex array support disabled (not detected - get a better driver)\n");
 }
 
-int            texture_extension_number = 1;
 
-void VID_CheckMultitexture(void) 
-{
-       qglMTexCoord2f = NULL;
-       qglSelectTexture = NULL;
-       // Check to see if multitexture is disabled
-       if (COM_CheckParm("-nomtex"))
-       {
-               Con_Printf("...multitexture disabled\n");
-               return;
-       }
-       // Test for ARB_multitexture
-       if (!COM_CheckParm("-SGISmtex") && strstr(gl_extensions, "GL_ARB_multitexture "))
-       {
-               Con_Printf("...using GL_ARB_multitexture\n");
-               qglMTexCoord2f = (void *) wglGetProcAddress("glMultiTexCoord2fARB");
-               qglSelectTexture = (void *) wglGetProcAddress("glActiveTextureARB");
-               gl_mtexable = true;
-               gl_mtex_enum = GL_TEXTURE0_ARB;
-       }
-       else if (strstr(gl_extensions, "GL_SGIS_multitexture ")) // Test for SGIS_multitexture (if ARB_multitexture not found)
-       {
-               Con_Printf("...using GL_SGIS_multitexture\n");
-               qglMTexCoord2f = (void *) wglGetProcAddress("glMTexCoord2fSGIS");
-               qglSelectTexture = (void *) wglGetProcAddress("glSelectTextureSGIS");
-               gl_mtexable = true;
-               gl_mtex_enum = TEXTURE0_SGIS;
-       }
-       if (!gl_mtexable)
-               Con_Printf("...multitexture disabled (not detected)\n");
-}
+//====================================
 
 /*
 =================
-GL_BeginRendering
-
+VID_GetWindowSize
 =================
 */
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
+void VID_GetWindowSize (int *x, int *y, int *width, int *height)
 {
-       *x = *y = 0;
-       *width = WindowRect.right - WindowRect.left;
-       *height = WindowRect.bottom - WindowRect.top;
-
-//     if (!wglMakeCurrent( maindc, baseRC ))
-//             Sys_Error ("wglMakeCurrent failed");
-
-//     glViewport (*x, *y, *width, *height);
+       *x = 0;
+       *y = 0;
+       *width = window_width;
+       *height = window_height;
 }
 
 
-void GL_EndRendering (void)
+void VID_Finish (void)
 {
-       if (r_render.value && !scr_skipupdate)
-               SwapBuffers(maindc);
+       HDC hdc;
+       int vid_usemouse;
+       if (r_render.integer && !scr_skipupdate)
+       {
+               qglFinish();
+               hdc = GetDC(mainwindow);
+               SwapBuffers(hdc);
+               ReleaseDC(mainwindow, hdc);
+       }
 
 // handle the mouse state when windowed if that's changed
-       if (modestate == MS_WINDOWED)
+       vid_usemouse = false;
+       if (vid_mouse.integer && !key_consoleactive)
+               vid_usemouse = true;
+       if (vid_isfullscreen)
+               vid_usemouse = true;
+       if (!vid_activewindow)
+               vid_usemouse = false;
+       if (vid_usemouse)
        {
-               if (!_windowed_mouse.value)
-               {
-                       if (windowed_mouse)
-                       {
-                               IN_DeactivateMouse ();
-                               IN_ShowMouse ();
-                               windowed_mouse = false;
-                       }
-               }
-               else
+               if (!vid_usingmouse)
                {
-                       windowed_mouse = true;
-                       if (key_dest == key_game && !mouseactive && ActiveApp)
-                       {
-                               IN_ActivateMouse ();
-                               IN_HideMouse ();
-                       }
-                       else if (mouseactive && key_dest != key_game)
-                       {
-                               IN_DeactivateMouse ();
-                               IN_ShowMouse ();
-                       }
+                       vid_usingmouse = true;
+                       IN_ActivateMouse ();
+                       IN_HideMouse();
                }
        }
-}
-
-void VID_SetDefaultMode (void)
-{
-       IN_DeactivateMouse ();
-}
-
-
-void   VID_Shutdown (void)
-{
-       HGLRC hRC;
-       HDC       hDC;
-       int i;
-       GLuint temp[8192];
-
-       if (vid_initialized)
+       else
        {
-               vid_canalttab = false;
-               hRC = wglGetCurrentContext();
-       hDC = wglGetCurrentDC();
-
-       wglMakeCurrent(NULL, NULL);
-
-               // LordHavoc: free textures before closing (may help NVIDIA)
-               for (i = 0;i < 8192;i++) temp[i] = i+1;
-               glDeleteTextures(8192, temp);
-
-       if (hRC)
-           wglDeleteContext(hRC);
-
-               if (hDC && mainwindow)
-                       ReleaseDC(mainwindow, hDC);
-
-               if (modestate == MS_FULLDIB)
-                       ChangeDisplaySettings (NULL, 0);
-
-               if (maindc && mainwindow)
-                       ReleaseDC (mainwindow, maindc);
-
-               AppActivate(false, false);
+               if (vid_usingmouse)
+               {
+                       vid_usingmouse = false;
+                       IN_DeactivateMouse ();
+                       IN_ShowMouse();
+               }
        }
 }
 
-
 //==========================================================================
 
 
-BOOL bSetupPixelFormat(HDC hDC)
-{
-    static PIXELFORMATDESCRIPTOR pfd = {
-       sizeof(PIXELFORMATDESCRIPTOR),  // size of this pfd
-       1,                              // version number
-       PFD_DRAW_TO_WINDOW              // support window
-       |  PFD_SUPPORT_OPENGL   // support OpenGL
-       |  PFD_DOUBLEBUFFER ,   // double buffered
-       PFD_TYPE_RGBA,                  // RGBA type
-       24,                             // 24-bit color depth
-       0, 0, 0, 0, 0, 0,               // color bits ignored
-       0,                              // no alpha buffer
-       0,                              // shift bit ignored
-       0,                              // no accumulation buffer
-       0, 0, 0, 0,                     // accum bits ignored
-       32,                             // 32-bit z-buffer      
-       0,                              // no stencil buffer
-       0,                              // no auxiliary buffer
-       PFD_MAIN_PLANE,                 // main layer
-       0,                              // reserved
-       0, 0, 0                         // layer masks ignored
-    };
-    int pixelformat;
-
-    if ( (pixelformat = ChoosePixelFormat(hDC, &pfd)) == 0 )
-    {
-        MessageBox(NULL, "ChoosePixelFormat failed", "Error", MB_OK);
-        return FALSE;
-    }
-
-    if (SetPixelFormat(hDC, pixelformat, &pfd) == FALSE)
-    {
-        MessageBox(NULL, "SetPixelFormat failed", "Error", MB_OK);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
 
 
-byte scantokey[128] =
+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
@@ -593,20 +200,6 @@ byte scantokey[128] =
        0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0       // 7
 };
 
-/*
-byte shiftscantokey[128] =
-{ 
-//     0           1      2     3     4     5       6       7      8         9      A       B           C    D            E           F 
-       0          ,27    ,'!'  ,'@'  ,'#'  ,'$'    ,'%'    ,'^'   ,'&'      ,'*'   ,'('    ,')'        ,'_' ,'+'         ,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,'%' ,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 
-}; 
-*/
 
 /*
 =======
@@ -622,8 +215,6 @@ int MapKey (int key, int virtualkey)
                return 0;
        if (scantokey[key] == 0)
                Con_DPrintf("key 0x%02x has no translation\n", key);
-//     if (scantokey[key] >= 0x20 && scantokey[key] < 0x7F)
-//             return realchar;
        return scantokey[key];
 }
 
@@ -643,7 +234,7 @@ 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++)
        {
@@ -654,6 +245,9 @@ void ClearAllStates (void)
        IN_ClearStates ();
 }
 
+void VID_RestoreGameGamma(void);
+extern qboolean host_loopactive;
+
 void AppActivate(BOOL fActive, BOOL minimize)
 /****************************************************************************
 *
@@ -668,16 +262,16 @@ void AppActivate(BOOL fActive, BOOL minimize)
 {
        static BOOL     sound_active;
 
-       ActiveApp = fActive;
-       Minimized = minimize;
+       vid_activewindow = fActive;
+       vid_hidden = minimize;
 
 // enable/disable sound on focus gain/loss
-       if (!ActiveApp && sound_active)
+       if (!vid_activewindow && sound_active)
        {
                S_BlockSound ();
                sound_active = false;
        }
-       else if (ActiveApp && !sound_active)
+       else if (vid_activewindow && !sound_active)
        {
                S_UnblockSound ();
                sound_active = true;
@@ -685,11 +279,10 @@ void AppActivate(BOOL fActive, BOOL minimize)
 
        if (fActive)
        {
-               if (modestate == MS_FULLDIB)
+               if (vid_isfullscreen)
                {
-                       IN_ActivateMouse ();
-                       IN_HideMouse ();
-                       if (vid_canalttab && vid_wassuspended) {
+                       if (vid_wassuspended)
+                       {
                                vid_wassuspended = false;
                                ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN);
                                ShowWindow(mainwindow, SW_SHOWNORMAL);
@@ -698,52 +291,40 @@ 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);
                }
-               else if ((modestate == MS_WINDOWED) && _windowed_mouse.value && key_dest == key_game)
-               {
-                       IN_ActivateMouse ();
-                       IN_HideMouse ();
-               }
+               if (host_loopactive)
+                       VID_RestoreGameGamma();
        }
 
        if (!fActive)
        {
-               if (modestate == MS_FULLDIB)
-               {
-                       IN_DeactivateMouse ();
-                       IN_ShowMouse ();
-                       if (vid_canalttab) { 
-                               ChangeDisplaySettings (NULL, 0);
-                               vid_wassuspended = true;
-                       }
-               }
-               else if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
+               vid_usingmouse = false;
+               IN_DeactivateMouse ();
+               IN_ShowMouse ();
+               if (vid_isfullscreen)
                {
-                       IN_DeactivateMouse ();
-                       IN_ShowMouse ();
+                       ChangeDisplaySettings (NULL, 0);
+                       vid_wassuspended = true;
                }
+               VID_RestoreSystemGamma();
        }
 }
 
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* main window procedure */
-LONG WINAPI MainWndProc (
-    HWND    hWnd,
-    UINT    uMsg,
-    WPARAM  wParam,
-    LPARAM  lParam)
+LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
-    LONG    lRet = 1;
+       LONG    lRet = 1;
        int             fActive, fMinimized, temp;
        extern unsigned int uiWheelMessage;
 
        if ( uMsg == uiWheelMessage )
                uMsg = WM_MOUSEWHEEL;
 
-    switch (uMsg)
-    {
+       switch (uMsg)
+       {
                case WM_KILLFOCUS:
-                       if (modestate == MS_FULLDIB)
+                       if (vid_isfullscreen)
                                ShowWindow(mainwindow, SW_SHOWMINNOACTIVE);
                        break;
 
@@ -760,7 +341,7 @@ LONG WINAPI MainWndProc (
                case WM_SYSKEYDOWN:
                        Key_Event (MapKey(lParam, wParam), true);
                        break;
-                       
+
                case WM_KEYUP:
                case WM_SYSKEYUP:
                        Key_Event (MapKey(lParam, wParam), false);
@@ -797,7 +378,7 @@ LONG WINAPI MainWndProc (
                // JACK: This is the mouse wheel with the Intellimouse
                // Its delta is either positive or neg, and we generate the proper
                // Event.
-               case WM_MOUSEWHEEL: 
+               case WM_MOUSEWHEEL:
                        if ((short) HIWORD(wParam) > 0) {
                                Key_Event(K_MWHEELUP, true);
                                Key_Event(K_MWHEELUP, false);
@@ -807,14 +388,14 @@ LONG WINAPI MainWndProc (
                        }
                        break;
 
-       case WM_SIZE:
-            break;
+               case WM_SIZE:
+                       break;
 
-           case WM_CLOSE:
+               case WM_CLOSE:
                        if (MessageBox (mainwindow, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION) == IDYES)
                                Sys_Quit ();
 
-               break;
+                       break;
 
                case WM_ACTIVATE:
                        fActive = LOWORD(wParam);
@@ -826,624 +407,456 @@ LONG WINAPI MainWndProc (
 
                        break;
 
-           case WM_DESTROY:
-        {
+               case WM_DESTROY:
+               {
                        if (mainwindow)
                                DestroyWindow (mainwindow);
 
-            PostQuitMessage (0);
-        }
-        break;
+                       PostQuitMessage (0);
+               }
+               break;
 
                case MM_MCINOTIFY:
-            lRet = CDAudio_MessageHandler (hWnd, uMsg, wParam, lParam);
+                       lRet = CDAudio_MessageHandler (hWnd, uMsg, wParam, lParam);
                        break;
 
-       default:
-            /* pass all unhandled messages to DefWindowProc */
-            lRet = DefWindowProc (hWnd, uMsg, wParam, lParam);
-        break;
-    }
+               default:
+                       /* pass all unhandled messages to DefWindowProc */
+                       lRet = DefWindowProc (hWnd, uMsg, wParam, lParam);
+               break;
+       }
 
-    /* return 1 if handled message, 0 if not */
-    return lRet;
+       /* return 1 if handled message, 0 if not */
+       return lRet;
 }
 
 
-/*
-=================
-VID_NumModes
-=================
-*/
-int VID_NumModes (void)
-{
-       return nummodes;
-}
+//static int grabsysgamma = true;
+WORD systemgammaramps[3][256], currentgammaramps[3][256];
 
-       
-/*
-=================
-VID_GetModePtr
-=================
-*/
-vmode_t *VID_GetModePtr (int modenum)
+int VID_SetGamma(float prescale, float gamma, float scale, float base)
 {
+       int i;
+       HDC hdc;
+       hdc = GetDC (NULL);
 
-       if ((modenum >= 0) && (modenum < nummodes))
-               return &modelist[modenum];
-       else
-               return &badmode;
-}
+       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]);
 
-/*
-=================
-VID_GetModeDescription
-=================
-*/
-char *VID_GetModeDescription (int mode)
+       ReleaseDC (NULL, hdc);
+       return i; // return success or failure
+}
+
+void VID_RestoreGameGamma(void)
 {
-       char            *pinfo;
-       vmode_t         *pv;
-       static char     temp[100];
+       VID_UpdateGamma(true);
+}
 
-       if ((mode < 0) || (mode >= nummodes))
-               return NULL;
+void VID_GetSystemGamma(void)
+{
+       HDC hdc;
+       hdc = GetDC (NULL);
 
-       if (!leavecurrentmode)
-       {
-               pv = VID_GetModePtr (mode);
-               pinfo = pv->modedesc;
-       }
-       else
-       {
-               sprintf (temp, "Desktop resolution (%dx%d)", modelist[MODE_FULLSCREEN_DEFAULT].width, modelist[MODE_FULLSCREEN_DEFAULT].height);
-               pinfo = temp;
-       }
+       GetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
 
-       return pinfo;
+       ReleaseDC (NULL, hdc);
 }
 
-
-// KJB: Added this to return the mode driver name in description for console
-
-char *VID_GetExtModeDescription (int mode)
+void VID_RestoreSystemGamma(void)
 {
-       static char     pinfo[40];
-       vmode_t         *pv;
+       HDC hdc;
+       hdc = GetDC (NULL);
 
-       if ((mode < 0) || (mode >= nummodes))
-               return NULL;
-
-       pv = VID_GetModePtr (mode);
-       if (modelist[mode].type == MS_FULLDIB)
-       {
-               if (!leavecurrentmode)
-                       sprintf(pinfo,"%s fullscreen", pv->modedesc);
-               else
-                       sprintf (pinfo, "Desktop resolution (%dx%d)", modelist[MODE_FULLSCREEN_DEFAULT].width, modelist[MODE_FULLSCREEN_DEFAULT].height);
-       }
-       else
-       {
-               if (modestate == MS_WINDOWED)
-                       sprintf(pinfo, "%s windowed", pv->modedesc);
-               else
-                       sprintf(pinfo, "windowed");
-       }
+       SetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
 
-       return pinfo;
+       ReleaseDC (NULL, hdc);
 }
 
+//========================================================
+// Video menu stuff
+//========================================================
 
-/*
-=================
-VID_DescribeCurrentMode_f
-=================
-*/
-void VID_DescribeCurrentMode_f (void)
-{
-       Con_Printf ("%s\n", VID_GetExtModeDescription (vid_modenum));
-}
+#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;
 
-/*
-=================
-VID_NumModes_f
-=================
-*/
-void VID_NumModes_f (void)
+typedef struct
 {
+       int modenum;
+       char *desc;
+       int iscur;
+} modedesc_t;
 
-       if (nummodes == 1)
-               Con_Printf ("%d video mode is available\n", nummodes);
-       else
-               Con_Printf ("%d video modes are available\n", nummodes);
-}
+#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_DescribeMode_f
-=================
+================
+VID_MenuDraw
+================
 */
-void VID_DescribeMode_f (void)
+void VID_MenuDraw (void)
 {
-       int             t, modenum;
-       
-       modenum = atoi (Cmd_Argv(1));
-
-       t = leavecurrentmode;
-       leavecurrentmode = 0;
-
-       Con_Printf ("%s\n", VID_GetExtModeDescription (modenum));
+       cachepic_t *p;
+       char *ptr;
+       int lnummodes, i, k, column, row;
+       vmode_t *pv;
 
-       leavecurrentmode = t;
-}
-
-
-/*
-=================
-VID_DescribeModes_f
-=================
-*/
-void VID_DescribeModes_f (void)
-{
-       int                     i, lnummodes, t;
-       char            *pinfo;
-       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 ();
 
-       t = leavecurrentmode;
-       leavecurrentmode = 0;
-
-       for (i=1 ; i<lnummodes ; i++)
+       for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
        {
+               ptr = VID_GetModeDescription (i);
                pv = VID_GetModePtr (i);
-               pinfo = VID_GetExtModeDescription (i);
-               Con_Printf ("%2d: %s\n", i, pinfo);
-       }
-
-       leavecurrentmode = t;
-}
 
-void VID_AddMode(int type, int width, int height, int modenum, int halfscreen, int dib, int fullscreen, int bpp)
-{
-       int i;
-       if (nummodes >= MAX_MODE_LIST)
-               return;
-       modelist[nummodes].type = type;
-       modelist[nummodes].width = width;
-       modelist[nummodes].height = height;
-       modelist[nummodes].modenum = modenum;
-       modelist[nummodes].halfscreen = halfscreen;
-       modelist[nummodes].dib = dib;
-       modelist[nummodes].fullscreen = fullscreen;
-       modelist[nummodes].bpp = bpp;
-       if (bpp == 0)
-               sprintf (modelist[nummodes].modedesc, "%dx%d", width, height);
-       else
-               sprintf (modelist[nummodes].modedesc, "%dx%dx%d", width, height, bpp);
-       for (i = 0;i < nummodes;i++)
-       {
-               if (!memcmp(&modelist[i], &modelist[nummodes], sizeof(vmode_t)))
-                       return;
-       }
-       nummodes++;
-}
-
-void VID_InitDIB (HINSTANCE hInstance)
-{
-       int w, h;
-       WNDCLASS                wc;
-
-       // Register the frame class
-    wc.style         = 0;
-    wc.lpfnWndProc   = (WNDPROC)MainWndProc;
-    wc.cbClsExtra    = 0;
-    wc.cbWndExtra    = 0;
-    wc.hInstance     = hInstance;
-    wc.hIcon         = 0;
-    wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
-       wc.hbrBackground = NULL;
-    wc.lpszMenuName  = 0;
-    wc.lpszClassName = "DarkPlaces";
-
-    if (!RegisterClass (&wc) )
-               Sys_Error ("Couldn't register window class");
-
-       /*
-       modelist[0].type = MS_WINDOWED;
-
-       if (COM_CheckParm("-width"))
-               modelist[0].width = atoi(com_argv[COM_CheckParm("-width")+1]);
-       else
-               modelist[0].width = 640;
+               k = vid_wmodes;
 
-       if (modelist[0].width < 320)
-               modelist[0].width = 320;
+               modedescs[k].modenum = i;
+               modedescs[k].desc = ptr;
+               modedescs[k].iscur = 0;
 
-       if (COM_CheckParm("-height"))
-               modelist[0].height= atoi(com_argv[COM_CheckParm("-height")+1]);
-       else
-               modelist[0].height = modelist[0].width * 240/320;
+               if (i == vid_modenum)
+                       modedescs[k].iscur = 1;
 
-       if (modelist[0].height < 240)
-               modelist[0].height = 240;
+               vid_wmodes++;
 
-       sprintf (modelist[0].modedesc, "%dx%d", modelist[0].width, modelist[0].height);
+       }
 
-       modelist[0].modenum = MODE_WINDOWED;
-       modelist[0].dib = 1;
-       modelist[0].fullscreen = 0;
-       modelist[0].halfscreen = 0;
-       modelist[0].bpp = 0;
+       if (vid_wmodes > 0)
+       {
+               M_Print (2*8, 36+0*8, "Fullscreen Modes (WIDTHxHEIGHTxBPP)");
 
-       nummodes = 1;
-       */
-       if (COM_CheckParm("-width"))
-               w = atoi(com_argv[COM_CheckParm("-width")+1]);
-       else
-               w = 640;
+               column = 8;
+               row = 36+2*8;
 
-       if (w < 320)
-               w = 320;
+               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);
 
-       if (COM_CheckParm("-height"))
-               h = atoi(com_argv[COM_CheckParm("-height")+1]);
-       else
-               h = w * 240/320;
+                       column += 13*8;
 
-       if (h < 240)
-               h = 240;
+                       if ((i % VID_ROW_SIZE) == (VID_ROW_SIZE - 1))
+                       {
+                               column = 8;
+                               row += 8;
+                       }
+               }
+       }
 
-       VID_AddMode(MS_WINDOWED, w, h, 0, 0, 1, 0, 0);
+       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_InitFullDIB
-=================
+================
+VID_MenuKey
+================
 */
-void VID_InitFullDIB (HINSTANCE hInstance)
+void VID_MenuKey (int key)
 {
-       DEVMODE devmode;
-//     int             i;
-       int             modenum;
-       int             originalnummodes;
-//     int             existingmode;
-       int             numlowresmodes;
-       int             j;
-       int             bpp;
-       int             done;
-       BOOL    stat;
-
-// enumerate >8 bpp modes
-       originalnummodes = nummodes;
-       modenum = 0;
-
-       do
-       {
-               stat = EnumDisplaySettings (NULL, modenum, &devmode);
-
-               if ((devmode.dmBitsPerPel >= 15) && (devmode.dmPelsWidth <= MAXWIDTH) && (devmode.dmPelsHeight <= MAXHEIGHT) && (nummodes < MAX_MODE_LIST))
-               {
-                       devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-
-                       if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL)
-                       {
-                       // if the width is more than twice the height, reduce it by half because this
-                       // is probably a dual-screen monitor
-                               if ((!COM_CheckParm("-noadjustaspect")) && (devmode.dmPelsWidth > (devmode.dmPelsHeight << 1)))
-                                       VID_AddMode(MS_FULLDIB, devmode.dmPelsWidth >> 1, devmode.dmPelsHeight, 0, 1, 1, 1, devmode.dmBitsPerPel);
-                               else
-                                       VID_AddMode(MS_FULLDIB, devmode.dmPelsWidth, devmode.dmPelsHeight, 0, 0, 1, 1, devmode.dmBitsPerPel);
-                               /*
-                               modelist[nummodes].type = MS_FULLDIB;
-                               modelist[nummodes].width = devmode.dmPelsWidth;
-                               modelist[nummodes].height = devmode.dmPelsHeight;
-                               modelist[nummodes].modenum = 0;
-                               modelist[nummodes].halfscreen = 0;
-                               modelist[nummodes].dib = 1;
-                               modelist[nummodes].fullscreen = 1;
-                               modelist[nummodes].bpp = devmode.dmBitsPerPel;
-                               sprintf (modelist[nummodes].modedesc, "%dx%dx%d", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode.dmBitsPerPel);
-
-                       // if the width is more than twice the height, reduce it by half because this
-                       // is probably a dual-screen monitor
-                               if (!COM_CheckParm("-noadjustaspect"))
-                               {
-                                       if (modelist[nummodes].width > (modelist[nummodes].height << 1))
-                                       {
-                                               modelist[nummodes].width >>= 1;
-                                               modelist[nummodes].halfscreen = 1;
-                                               sprintf (modelist[nummodes].modedesc, "%dx%dx%d", modelist[nummodes].width, modelist[nummodes].height, modelist[nummodes].bpp);
-                                       }
-                               }
-
-                               for (i=originalnummodes, existingmode = 0 ; i<nummodes ; i++)
-                               {
-                                       if ((modelist[nummodes].width == modelist[i].width) && (modelist[nummodes].height == modelist[i].height) && (modelist[nummodes].bpp == modelist[i].bpp))
-                                       {
-                                               existingmode = 1;
-                                               break;
-                                       }
-                               }
-
-                               if (!existingmode)
-                                       nummodes++;
-                               */
-                       }
-               }
+       switch (key)
+       {
+       case K_ESCAPE:
+               S_LocalSound ("misc/menu1.wav");
+               M_Menu_Options_f ();
+               break;
 
-               modenum++;
+       default:
+               break;
        }
-       while (stat);
+}
+#endif
 
-// see if there are any low-res modes that aren't being reported
-       numlowresmodes = sizeof(lowresmodes) / sizeof(lowresmodes[0]);
-       bpp = 16;
-       done = 0;
+static HINSTANCE gldll;
 
-       do
+int GL_OpenLibrary(const char *name)
+{
+       Con_Printf("Loading GL driver %s\n", name);
+       GL_CloseLibrary();
+       if (!(gldll = LoadLibrary(name)))
        {
-               for (j=0 ; (j<numlowresmodes) && (nummodes < MAX_MODE_LIST) ; j++)
-               {
-                       devmode.dmBitsPerPel = bpp;
-                       devmode.dmPelsWidth = lowresmodes[j].width;
-                       devmode.dmPelsHeight = lowresmodes[j].height;
-                       devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-
-                       if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL)
-                               VID_AddMode(MS_FULLDIB, devmode.dmPelsWidth, devmode.dmPelsHeight, 0, 0, 1, 1, devmode.dmBitsPerPel);
-                       /*
-                       {
-                               modelist[nummodes].type = MS_FULLDIB;
-                               modelist[nummodes].width = devmode.dmPelsWidth;
-                               modelist[nummodes].height = devmode.dmPelsHeight;
-                               modelist[nummodes].modenum = 0;
-                               modelist[nummodes].halfscreen = 0;
-                               modelist[nummodes].dib = 1;
-                               modelist[nummodes].fullscreen = 1;
-                               modelist[nummodes].bpp = devmode.dmBitsPerPel;
-                               sprintf (modelist[nummodes].modedesc, "%dx%dx%d", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode.dmBitsPerPel);
-
-                               for (i=originalnummodes, existingmode = 0 ; i<nummodes ; i++)
-                               {
-                                       if ((modelist[nummodes].width == modelist[i].width) && (modelist[nummodes].height == modelist[i].height) && (modelist[nummodes].bpp == modelist[i].bpp))
-                                       {
-                                               existingmode = 1;
-                                               break;
-                                       }
-                               }
-
-                               if (!existingmode)
-                                       nummodes++;
-                       }
-                       */
-               }
-               switch (bpp)
-               {
-                       case 16:
-                               bpp = 32;
-                               break;
-
-                       case 32:
-                               bpp = 24;
-                               break;
-
-                       case 24:
-                               done = 1;
-                               break;
-               }
+               Con_Printf("Unable to LoadLibrary %s\n", name);
+               return false;
        }
-       while (!done);
-
-       if (nummodes == originalnummodes)
-               Con_SafePrintf ("No fullscreen DIB modes found\n");
+       strcpy(gl_driver, name);
+       return true;
 }
 
-/*
-===================
-VID_Init
-===================
-*/
-void   VID_Init ()
+void GL_CloseLibrary(void)
 {
-       int             i;
-//     int             existingmode;
-       int             basenummodes, width, height, bpp, findbpp, done;
-       HDC             hdc;
-       DEVMODE devmode;
-
-       memset(&devmode, 0, sizeof(devmode));
+       FreeLibrary(gldll);
+       gldll = 0;
+       gl_driver[0] = 0;
+       qwglGetProcAddress = NULL;
+       gl_extensions = "";
+       gl_platform = "";
+       gl_platformextensions = "";
+}
 
-       Cvar_RegisterVariable (&vid_mode);
-//     Cvar_RegisterVariable (&_vid_default_mode);
-//     Cvar_RegisterVariable (&_vid_default_mode_win);
-       Cvar_RegisterVariable (&_windowed_mouse);
+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;
+}
 
-       Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);
-       Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f);
-       Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f);
-       Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f);
+void VID_Init(void)
+{
+       WNDCLASS wc;
 
+       InitCommonControls();
        hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
 
-       InitCommonControls();
+       // Register the frame class
+       wc.style         = 0;
+       wc.lpfnWndProc   = (WNDPROC)MainWndProc;
+       wc.cbClsExtra    = 0;
+       wc.cbWndExtra    = 0;
+       wc.hInstance     = global_hInstance;
+       wc.hIcon         = 0;
+       wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
+       wc.hbrBackground = NULL;
+       wc.lpszMenuName  = 0;
+       wc.lpszClassName = "DarkPlacesWindowClass";
 
-       VID_InitDIB (global_hInstance);
-       basenummodes = nummodes = 1;
+       if (!RegisterClass (&wc))
+               Sys_Error("Couldn't register window class\n");
+}
+
+int VID_InitMode (int fullscreen, int width, int height, int bpp)
+{
+       int i;
+       HDC hdc;
+       RECT rect;
+       MSG msg;
+       PIXELFORMATDESCRIPTOR pfd =
+       {
+               sizeof(PIXELFORMATDESCRIPTOR),  // size of this pfd
+               1,                              // version number
+               PFD_DRAW_TO_WINDOW              // support window
+               |  PFD_SUPPORT_OPENGL   // support OpenGL
+               |  PFD_DOUBLEBUFFER ,   // double buffered
+               PFD_TYPE_RGBA,                  // RGBA type
+               24,                             // 24-bit color depth
+               0, 0, 0, 0, 0, 0,               // color bits ignored
+               0,                              // no alpha buffer
+               0,                              // shift bit ignored
+               0,                              // no accumulation buffer
+               0, 0, 0, 0,                     // accum bits ignored
+               32,                             // 32-bit z-buffer
+               0,                              // no stencil buffer
+               0,                              // no auxiliary buffer
+               PFD_MAIN_PLANE,                 // main layer
+               0,                              // reserved
+               0, 0, 0                         // layer masks ignored
+       };
+       int pixelformat;
+       DWORD WindowStyle, ExWindowStyle;
+       HGLRC baseRC;
+       int CenterX, CenterY;
 
-       VID_InitFullDIB (global_hInstance);
+       if (vid_initialized)
+               Sys_Error("VID_InitMode called when video is already initialised\n");
 
-       if (COM_CheckParm("-window"))
+       if (!GL_OpenLibrary("opengl32.dll"))
        {
-               hdc = GetDC (NULL);
+               Con_Printf("Unable to load GL driver\n");
+               return false;
+       }
 
-               if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
-                       Sys_Error ("Can't run in non-RGB mode");
+       memset(&gdevmode, 0, sizeof(gdevmode));
 
-               ReleaseDC (NULL, hdc);
+       VID_GetSystemGamma();
 
-               windowed = true;
+       vid_isfullscreen = false;
+       if (fullscreen)
+       {
+               gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
+               gdevmode.dmBitsPerPel = bpp;
+               gdevmode.dmPelsWidth = width;
+               gdevmode.dmPelsHeight = height;
+               gdevmode.dmSize = sizeof (gdevmode);
+               if (ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
+               {
+                       VID_Shutdown();
+                       Con_Printf("Unable to change to requested mode %dx%dx%dbpp\n", width, height, bpp);
+                       return false;
+               }
 
-               vid_default = MODE_WINDOWED;
+               vid_isfullscreen = true;
+               WindowStyle = WS_POPUP;
+               ExWindowStyle = 0;
        }
        else
        {
-               if (nummodes == 1)
-                       Sys_Error ("No RGB fullscreen modes available");
-
-               windowed = false;
-
-               if (COM_CheckParm("-mode"))
-                       vid_default = atoi(com_argv[COM_CheckParm("-mode")+1]);
-               else
+               hdc = GetDC (NULL);
+               i = GetDeviceCaps(hdc, RASTERCAPS);
+               ReleaseDC (NULL, hdc);
+               if (i & RC_PALETTE)
                {
-                       if (COM_CheckParm("-current"))
-                       {
-                               modelist[MODE_FULLSCREEN_DEFAULT].width = GetSystemMetrics (SM_CXSCREEN);
-                               modelist[MODE_FULLSCREEN_DEFAULT].height = GetSystemMetrics (SM_CYSCREEN);
-                               vid_default = MODE_FULLSCREEN_DEFAULT;
-                               leavecurrentmode = 1;
-                       }
-                       else
-                       {
-                               if (COM_CheckParm("-width"))
-                                       width = atoi(com_argv[COM_CheckParm("-width")+1]);
-                               else
-                                       width = 640;
+                       VID_Shutdown();
+                       Con_Printf ("Can't run in non-RGB mode\n");
+                       return false;
+               }
 
-                               if (COM_CheckParm("-bpp"))
-                               {
-                                       bpp = atoi(com_argv[COM_CheckParm("-bpp")+1]);
-                                       findbpp = 0;
-                               }
-                               else
-                               {
-                                       bpp = 15;
-                                       findbpp = 1;
-                               }
+               WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
+               ExWindowStyle = 0;
+       }
 
-                               if (COM_CheckParm("-height"))
-                                       height = atoi(com_argv[COM_CheckParm("-height")+1]);
+       rect.top = 0;
+       rect.left = 0;
+       rect.right = width;
+       rect.bottom = height;
+       AdjustWindowRectEx(&rect, WindowStyle, false, 0);
 
-                       // if they want to force it, add the specified mode to the list
-                               if (COM_CheckParm("-force") && (nummodes < MAX_MODE_LIST))
-                                       VID_AddMode(MS_FULLDIB, width, height, 0, 0, 1, 1, bpp);
-                               /*
-                               {
-                                       modelist[nummodes].type = MS_FULLDIB;
-                                       modelist[nummodes].width = width;
-                                       modelist[nummodes].height = height;
-                                       modelist[nummodes].modenum = 0;
-                                       modelist[nummodes].halfscreen = 0;
-                                       modelist[nummodes].dib = 1;
-                                       modelist[nummodes].fullscreen = 1;
-                                       modelist[nummodes].bpp = bpp;
-                                       sprintf (modelist[nummodes].modedesc, "%dx%dx%d", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode.dmBitsPerPel);
-
-                                       for (i=nummodes, existingmode = 0 ; i<nummodes ; i++)
-                                       {
-                                               if ((modelist[nummodes].width == modelist[i].width) && (modelist[nummodes].height == modelist[i].height) && (modelist[nummodes].bpp == modelist[i].bpp))
-                                               {
-                                                       existingmode = 1;
-                                                       break;
-                                               }
-                                       }
+       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;
+       window_width = width;
+       window_height = height;
+       rect.left += CenterX;
+       rect.right += CenterX;
+       rect.top += CenterY;
+       rect.bottom += CenterY;
+
+       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)
+       {
+               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;
+       }
 
-                                       if (!existingmode)
-                                               nummodes++;
-                               }
-                               */
+       /*
+       if (!fullscreen)
+               SetWindowPos (mainwindow, NULL, CenterX, CenterY, 0, 0,SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME);
+       */
+
+       ShowWindow (mainwindow, SW_SHOWDEFAULT);
+       UpdateWindow (mainwindow);
 
-                               done = 0;
+       SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
+       SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
 
-                               do
-                               {
-                                       if (COM_CheckParm("-height"))
-                                       {
-                                               height = atoi(com_argv[COM_CheckParm("-height")+1]);
-
-                                               for (i=1, vid_default=0 ; i<nummodes ; i++)
-                                               {
-                                                       if ((modelist[i].width == width) && (modelist[i].height == height) && (modelist[i].bpp == bpp))
-                                                       {
-                                                               vid_default = i;
-                                                               done = 1;
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               for (i=1, vid_default=0 ; i<nummodes ; i++)
-                                               {
-                                                       if ((modelist[i].width == width) && (modelist[i].bpp == bpp))
-                                                       {
-                                                               vid_default = i;
-                                                               done = 1;
-                                                               break;
-                                                       }
-                                               }
-                                       }
+       VID_UpdateWindowStatus ();
 
-                                       if (!done)
-                                       {
-                                               if (findbpp)
-                                               {
-                                                       switch (bpp)
-                                                       {
-                                                       case 15: bpp = 16;break;
-                                                       case 16: bpp = 32;break;
-                                                       case 32: bpp = 24;break;
-                                                       case 24: done = 1;break;
-                                                       }
-                                               }
-                                               else
-                                                       done = 1;
-                                       }
-                               }
-                               while (!done);
+       // 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);
 
-                               if (!vid_default)
-                                       Sys_Error ("Specified video mode not available");
-                       }
-               }
+       while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+       {
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
        }
 
-       vid_initialized = true;
-
-       if ((i = COM_CheckParm("-conwidth")) != 0)
-               vid.conwidth = atoi(com_argv[i+1]);
-       else
-               vid.conwidth = 640;
+       Sleep (100);
 
-       vid.conwidth &= 0xfff8; // make it a multiple of eight
+       SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOCOPYBITS);
 
-       if (vid.conwidth < 320)
-               vid.conwidth = 320;
+       SetForegroundWindow (mainwindow);
 
-       // pick a conheight that matches with correct aspect
-       vid.conheight = vid.conwidth*3 / 4;
+       // fix the leftover Alt from any Alt-Tab or the like that switched us away
+       ClearAllStates ();
+       
+       hdc = GetDC(mainwindow);
 
-       if ((i = COM_CheckParm("-conheight")) != 0)
-               vid.conheight = atoi(com_argv[i+1]);
-       if (vid.conheight < 200)
-               vid.conheight = 200;
+       if ((pixelformat = ChoosePixelFormat(hdc, &pfd)) == 0)
+       {
+               VID_Shutdown();
+               Con_Printf("ChoosePixelFormat(%d, %p) failed\n", hdc, &pfd);
+               return false;
+       }
 
-       VID_SetMode (vid_default);
+       if (SetPixelFormat(hdc, pixelformat, &pfd) == false)
+       {
+               VID_Shutdown();
+               Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", hdc, pixelformat, &pfd);
+               return false;
+       }
 
-       maindc = GetDC(mainwindow);
-       bSetupPixelFormat(maindc);
+       if (!GL_CheckExtension("wgl", wglfuncs, NULL, false))
+       {
+               VID_Shutdown();
+               Con_Printf("wgl functions not found\n");
+               return false;
+       }
 
-       baseRC = wglCreateContext( maindc );
+       baseRC = qwglCreateContext(hdc);
        if (!baseRC)
-               Sys_Error ("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.");
-       if (!wglMakeCurrent( maindc, baseRC ))
-               Sys_Error ("wglMakeCurrent failed");
+       {
+               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");
+       qwglGetExtensionsStringARB = GL_GetProcAddress("wglGetExtensionsStringARB");
+       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 (qwglGetExtensionsStringARB)
+               gl_platformextensions = qwglGetExtensionsStringARB(hdc);
+
+       gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, NULL, false);
+       ReleaseDC(mainwindow, hdc);
 
        GL_Init ();
 
@@ -1456,130 +869,1146 @@ void  VID_Init ()
        if (strncasecmp(gl_renderer,"Matrox G200 Direct3D",20)==0) // a D3D driver for GL? sigh...
                isG200 = true;
 
-//     sprintf (gldir, "%s/glquake", com_gamedir);
-//     Sys_mkdir (gldir);
+       //vid_menudrawfn = VID_MenuDraw;
+       //vid_menukeyfn = VID_MenuKey;
+       vid_hidden = false;
+       vid_initialized = true;
+       return true;
+}
 
-       vid_realmode = vid_modenum;
+void VID_Shutdown (void)
+{
+       HGLRC hRC = 0;
+       HDC hDC = 0;
 
-       vid_menudrawfn = VID_MenuDraw;
-       vid_menukeyfn = VID_MenuKey;
+       if (vid_initialized)
+       {
+               vid_initialized = false;
+               if (qwglGetCurrentContext)
+                       hRC = qwglGetCurrentContext();
+               if (qwglGetCurrentDC)
+                       hDC = qwglGetCurrentDC();
 
-       strcpy (badmode.modedesc, "Bad mode");
-       vid_canalttab = true;
-}
+               if (qwglMakeCurrent)
+                       qwglMakeCurrent(NULL, NULL);
 
+               if (hRC && qwglDeleteContext)
+                       qwglDeleteContext(hRC);
 
-//========================================================
-// Video menu stuff
-//========================================================
+               // close the library before we get rid of the window
+               GL_CloseLibrary();
 
-extern void M_Menu_Options_f (void);
-extern void M_Print (int cx, int cy, char *str);
-extern void M_PrintWhite (int cx, int cy, char *str);
-extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
+               if (hDC && mainwindow)
+                       ReleaseDC(mainwindow, hDC);
 
-static int     vid_line, vid_wmodes;
+               if (vid_isfullscreen)
+                       ChangeDisplaySettings (NULL, 0);
 
-typedef struct
-{
-       int             modenum;
-       char    *desc;
-       int             iscur;
-} modedesc_t;
+               AppActivate(false, false);
 
-#define MAX_COLUMN_SIZE                9
-#define MODE_AREA_HEIGHT       (MAX_COLUMN_SIZE + 2)
-#define MAX_MODEDESCS          (MAX_COLUMN_SIZE*3)
+               VID_RestoreSystemGamma();
+       }
+}
 
-static modedesc_t      modedescs[MAX_MODEDESCS];
 
-/*
-================
-VID_MenuDraw
-================
+// 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
+
+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);
+
+
+/*
+===========
+IN_ShowMouse
+===========
 */
-void VID_MenuDraw (void)
+void IN_ShowMouse (void)
 {
-       qpic_t          *p;
-       char            *ptr;
-       int                     lnummodes, i, k, column, row;
-       vmode_t         *pv;
+       if (!mouseshowtoggle)
+       {
+               ShowCursor (true);
+               mouseshowtoggle = 1;
+       }
+}
 
-       p = Draw_CachePic ("gfx/vidmodes.lmp");
-       M_DrawPic ( (320-p->width)/2, 4, p);
 
-       vid_wmodes = 0;
-       lnummodes = VID_NumModes ();
-       
-       for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
+/*
+===========
+IN_HideMouse
+===========
+*/
+void IN_HideMouse (void)
+{
+       if (mouseshowtoggle)
        {
-               ptr = VID_GetModeDescription (i);
-               pv = VID_GetModePtr (i);
+               ShowCursor (false);
+               mouseshowtoggle = 0;
+       }
+}
 
-               k = vid_wmodes;
 
-               modedescs[k].modenum = i;
-               modedescs[k].desc = ptr;
-               modedescs[k].iscur = 0;
+/*
+===========
+IN_ActivateMouse
+===========
+*/
+void IN_ActivateMouse (void)
+{
 
-               if (i == vid_modenum)
-                       modedescs[k].iscur = 1;
+       mouseactivatetoggle = true;
 
-               vid_wmodes++;
+       if (mouseinitialized)
+       {
+               if (dinput)
+               {
+                       if (g_pMouse)
+                       {
+                               if (!dinput_acquired)
+                               {
+                                       IDirectInputDevice_Acquire(g_pMouse);
+                                       dinput_acquired = true;
+                               }
+                       }
+                       else
+                       {
+                               return;
+                       }
+               }
+               else
+               {
+                       RECT window_rect;
+                       window_rect.left = window_x;
+                       window_rect.top = window_y;
+                       window_rect.right = window_x + window_width;
+                       window_rect.bottom = window_y + window_height;
+
+                       if (mouseparmsvalid)
+                               restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0);
+
+                       SetCursorPos (window_center_x, window_center_y);
+                       SetCapture (mainwindow);
+                       ClipCursor (&window_rect);
+               }
 
+               mouseactive = true;
        }
+}
 
-       if (vid_wmodes > 0)
+
+/*
+===========
+IN_DeactivateMouse
+===========
+*/
+void IN_DeactivateMouse (void)
+{
+
+       mouseactivatetoggle = false;
+
+       if (mouseinitialized)
        {
-               M_Print (2*8, 36+0*8, "Fullscreen Modes (WIDTHxHEIGHTxBPP)");
+               if (dinput)
+               {
+                       if (g_pMouse)
+                       {
+                               if (dinput_acquired)
+                               {
+                                       IDirectInputDevice_Unacquire(g_pMouse);
+                                       dinput_acquired = false;
+                               }
+                       }
+               }
+               else
+               {
+                       if (restore_spi)
+                               SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0);
 
-               column = 8;
-               row = 36+2*8;
+                       ClipCursor (NULL);
+                       ReleaseCapture ();
+               }
 
-               for (i=0 ; i<vid_wmodes ; i++)
+               mouseactive = false;
+       }
+}
+
+
+/*
+===========
+IN_InitDInput
+===========
+*/
+qboolean IN_InitDInput (void)
+{
+    HRESULT            hr;
+       DIPROPDWORD     dipdw = {
                {
-                       if (modedescs[i].iscur)
-                               M_PrintWhite (column, row, modedescs[i].desc);
-                       else
-                               M_Print (column, row, modedescs[i].desc);
+                       sizeof(DIPROPDWORD),        // diph.dwSize
+                       sizeof(DIPROPHEADER),       // diph.dwHeaderSize
+                       0,                          // diph.dwObj
+                       DIPH_DEVICE,                // diph.dwHow
+               },
+               DINPUT_BUFFERSIZE,              // dwData
+       };
+
+       if (!hInstDI)
+       {
+               hInstDI = LoadLibrary("dinput.dll");
+               
+               if (hInstDI == NULL)
+               {
+                       Con_SafePrintf ("Couldn't load dinput.dll\n");
+                       return false;
+               }
+       }
 
-                       column += 13*8;
+       if (!pDirectInputCreate)
+       {
+               pDirectInputCreate = (void *)GetProcAddress(hInstDI,"DirectInputCreateA");
 
-                       if ((i % VID_ROW_SIZE) == (VID_ROW_SIZE - 1))
+               if (!pDirectInputCreate)
+               {
+                       Con_SafePrintf ("Couldn't get DI proc addr\n");
+                       return false;
+               }
+       }
+
+// register with DirectInput and get an IDirectInput to play with.
+       hr = iDirectInputCreate(global_hInstance, DIRECTINPUT_VERSION, &g_pdi, NULL);
+
+       if (FAILED(hr))
+       {
+               return false;
+       }
+
+// obtain an interface to the system mouse device.
+       hr = IDirectInput_CreateDevice(g_pdi, &GUID_SysMouse, &g_pMouse, NULL);
+
+       if (FAILED(hr))
+       {
+               Con_SafePrintf ("Couldn't open DI mouse device\n");
+               return false;
+       }
+
+// set the data format to "mouse format".
+       hr = IDirectInputDevice_SetDataFormat(g_pMouse, &df);
+
+       if (FAILED(hr))
+       {
+               Con_SafePrintf ("Couldn't set DI mouse format\n");
+               return false;
+       }
+
+// set the cooperativity level.
+       hr = IDirectInputDevice_SetCooperativeLevel(g_pMouse, mainwindow,
+                       DISCL_EXCLUSIVE | DISCL_FOREGROUND);
+
+       if (FAILED(hr))
+       {
+               Con_SafePrintf ("Couldn't set DI coop level\n");
+               return false;
+       }
+
+
+// set the buffer size to DINPUT_BUFFERSIZE elements.
+// the buffer size is a DWORD property associated with the device
+       hr = IDirectInputDevice_SetProperty(g_pMouse, DIPROP_BUFFERSIZE, &dipdw.diph);
+
+       if (FAILED(hr))
+       {
+               Con_SafePrintf ("Couldn't set DI buffersize\n");
+               return false;
+       }
+
+       return true;
+}
+
+
+/*
+===========
+IN_StartupMouse
+===========
+*/
+void IN_StartupMouse (void)
+{
+       if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) 
+               return; 
+
+       mouseinitialized = true;
+
+       if (COM_CheckParm ("-dinput"))
+       {
+               dinput = IN_InitDInput ();
+
+               if (dinput)
+               {
+                       Con_SafePrintf ("DirectInput initialized\n");
+               }
+               else
+               {
+                       Con_SafePrintf ("DirectInput not initialized\n");
+               }
+       }
+
+       if (!dinput)
+       {
+               mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0);
+
+               if (mouseparmsvalid)
+               {
+                       if ( COM_CheckParm ("-noforcemspd") ) 
+                               newmouseparms[2] = originalmouseparms[2];
+
+                       if ( COM_CheckParm ("-noforcemaccel") ) 
                        {
-                               column = 8;
-                               row += 8;
+                               newmouseparms[0] = originalmouseparms[0];
+                               newmouseparms[1] = originalmouseparms[1];
+                       }
+
+                       if ( COM_CheckParm ("-noforcemparms") ) 
+                       {
+                               newmouseparms[0] = originalmouseparms[0];
+                               newmouseparms[1] = originalmouseparms[1];
+                               newmouseparms[2] = originalmouseparms[2];
                        }
                }
        }
 
-       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");
+       mouse_buttons = 3;
+
+// if a fullscreen video mode was set before the mouse was initialized,
+// set the mouse state appropriately
+       if (mouseactivatetoggle)
+               IN_ActivateMouse ();
 }
 
 
 /*
-================
-VID_MenuKey
-================
+===========
+IN_Init
+===========
 */
-void VID_MenuKey (int key)
+void IN_Init (void)
 {
-       switch (key)
+       // 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)
        {
-       case K_ESCAPE:
-               S_LocalSound ("misc/menu1.wav");
-               M_Menu_Options_f ();
-               break;
+               IDirectInputDevice_Release(g_pMouse);
+               g_pMouse = NULL;
+       }
 
-       default:
-               break;
+    if (g_pdi)
+       {
+               IDirectInput_Release(g_pdi);
+               g_pdi = NULL;
        }
 }
+
+
+/*
+===========
+IN_MouseEvent
+===========
+*/
+void IN_MouseEvent (int mstate)
+{
+       int     i;
+
+       if (mouseactive && !dinput)
+       {
+       // perform button actions
+               for (i=0 ; i<mouse_buttons ; i++)
+               {
+                       if ( (mstate & (1<<i)) &&
+                               !(mouse_oldbuttonstate & (1<<i)) )
+                       {
+                               Key_Event (K_MOUSE1 + i, true);
+                       }
+
+                       if ( !(mstate & (1<<i)) &&
+                               (mouse_oldbuttonstate & (1<<i)) )
+                       {
+                               Key_Event (K_MOUSE1 + i, false);
+                       }
+               }       
+                       
+               mouse_oldbuttonstate = mstate;
+       }
+}
+
+
+/*
+===========
+IN_MouseMove
+===========
+*/
+void IN_MouseMove (usercmd_t *cmd)
+{
+       int                                     i, mx, my;
+       DIDEVICEOBJECTDATA      od;
+       DWORD                           dwElements;
+       HRESULT                         hr;
+
+       if (!mouseactive)
+       {
+               GetCursorPos (&current_pos);
+               ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+               return;
+       }
+
+       if (dinput)
+       {
+               mx = 0;
+               my = 0;
+
+               for (;;)
+               {
+                       dwElements = 1;
+
+                       hr = IDirectInputDevice_GetDeviceData(g_pMouse,
+                                       sizeof(DIDEVICEOBJECTDATA), &od, &dwElements, 0);
+
+                       if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
+                       {
+                               dinput_acquired = true;
+                               IDirectInputDevice_Acquire(g_pMouse);
+                               break;
+                       }
+
+                       /* Unable to read data or no data available */
+                       if (FAILED(hr) || dwElements == 0)
+                               break;
+
+                       /* Look at the element to see what happened */
+
+                       switch (od.dwOfs)
+                       {
+                               case DIMOFS_X:
+                                       mx += od.dwData;
+                                       break;
+
+                               case DIMOFS_Y:
+                                       my += od.dwData;
+                                       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;
+                       }
+               }
+
+       // perform button actions
+               for (i=0 ; i<mouse_buttons ; i++)
+               {
+                       if ( (mstate_di & (1<<i)) &&
+                               !(mouse_oldbuttonstate & (1<<i)) )
+                       {
+                               Key_Event (K_MOUSE1 + i, true);
+                       }
+
+                       if ( !(mstate_di & (1<<i)) &&
+                               (mouse_oldbuttonstate & (1<<i)) )
+                       {
+                               Key_Event (K_MOUSE1 + i, false);
+                       }
+               }
+
+               mouse_oldbuttonstate = mstate_di;
+       }
+       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;
+       }
+
+       IN_Mouse(cmd, mx, my);
+
+       // if the mouse has moved, force it to the center, so there's room to move
+       if (!dinput && (mx || my))
+               SetCursorPos (window_center_x, window_center_y);
+}
+
+
+/*
+===========
+IN_Move
+===========
+*/
+void IN_Move (usercmd_t *cmd)
+{
+       if (vid_activewindow && !vid_hidden)
+       {
+               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);
+               }
+       }
+}
+
+
+/*
+===================
+IN_ClearStates
+===================
+*/
+void IN_ClearStates (void)
+{
+       if (mouseactive)
+       {
+               mx_accum = 0;
+               my_accum = 0;
+               mouse_oldbuttonstate = 0;
+       }
+}
+
+
+/* 
+=============== 
+IN_StartupJoystick 
+=============== 
+*/  
+void IN_StartupJoystick (void) 
+{ 
+       int                     numdevs;
+       JOYCAPS         jc;
+       MMRESULT        mmr;
+       mmr = 0;
+       // assume no joystick
+       joy_avail = false; 
+
+       // abort startup if user requests no joystick
+       if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe")) 
+               return; 
+       // verify joystick driver is present
+       if ((numdevs = joyGetNumDevs ()) == 0)
+       {
+               Con_Printf ("\njoystick not found -- driver not present\n\n");
+               return;
+       }
+
+       // cycle through the joystick ids for the first valid one
+       for (joy_id=0 ; joy_id<numdevs ; joy_id++)
+       {
+               memset (&ji, 0, sizeof(ji));
+               ji.dwSize = sizeof(ji);
+               ji.dwFlags = JOY_RETURNCENTERED;
+
+               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);
+               return;
+       }
+
+       // get the capabilities of the selected joystick
+       // abort startup if command fails
+       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); 
+               return;
+       }
+
+       // save the joystick's number of buttons and POV status
+       joy_numbuttons = jc.wNumButtons;
+       joy_haspov = jc.wCaps & JOYCAPS_HASPOV;
+
+       // old button and POV states default to no buttons pressed
+       joy_oldbuttonstate = joy_oldpovstate = 0;
+
+       // mark the joystick as available and advanced initialization not completed
+       // this is needed as cvars are not available during initialization
+
+       joy_avail = true; 
+       joy_advancedinit = false;
+
+       Con_Printf ("\njoystick detected\n\n"); 
+}
+
+
+/*
+===========
+RawValuePointer
+===========
+*/
+PDWORD RawValuePointer (int axis)
+{
+       switch (axis)
+       {
+       case JOY_AXIS_X:
+               return &ji.dwXpos;
+       case JOY_AXIS_Y:
+               return &ji.dwYpos;
+       case JOY_AXIS_Z:
+               return &ji.dwZpos;
+       case JOY_AXIS_R:
+               return &ji.dwRpos;
+       case JOY_AXIS_U:
+               return &ji.dwUpos;
+       case JOY_AXIS_V:
+               return &ji.dwVpos;
+       }
+       return NULL; // LordHavoc: hush compiler warning
+}
+
+
+/*
+===========
+Joy_AdvancedUpdate_f
+===========
+*/
+void Joy_AdvancedUpdate_f (void)
+{
+
+       // called once by IN_ReadJoystick and by user whenever an update is needed
+       // cvars are now available
+       int     i;
+       DWORD dwTemp;
+
+       // initialize all the maps
+       for (i = 0; i < JOY_MAX_AXES; i++)
+       {
+               dwAxisMap[i] = AxisNada;
+               dwControlMap[i] = JOY_ABSOLUTE_AXIS;
+               pdwRawValue[i] = RawValuePointer(i);
+       }
+
+       if( joy_advanced.integer == 0)
+       {
+               // default joystick initialization
+               // 2 axes only with joystick control
+               dwAxisMap[JOY_AXIS_X] = AxisTurn;
+               // dwControlMap[JOY_AXIS_X] = JOY_ABSOLUTE_AXIS;
+               dwAxisMap[JOY_AXIS_Y] = AxisForward;
+               // dwControlMap[JOY_AXIS_Y] = JOY_ABSOLUTE_AXIS;
+       }
+       else
+       {
+               if (strcmp (joy_name.string, "joystick") != 0)
+               {
+                       // notify user of advanced controller
+                       Con_Printf ("\n%s configured\n\n", joy_name.string);
+               }
+
+               // advanced initialization here
+               // data supplied by user via joy_axisn cvars
+               dwTemp = (DWORD) joy_advaxisx.value;
+               dwAxisMap[JOY_AXIS_X] = dwTemp & 0x0000000f;
+               dwControlMap[JOY_AXIS_X] = dwTemp & JOY_RELATIVE_AXIS;
+               dwTemp = (DWORD) joy_advaxisy.value;
+               dwAxisMap[JOY_AXIS_Y] = dwTemp & 0x0000000f;
+               dwControlMap[JOY_AXIS_Y] = dwTemp & JOY_RELATIVE_AXIS;
+               dwTemp = (DWORD) joy_advaxisz.value;
+               dwAxisMap[JOY_AXIS_Z] = dwTemp & 0x0000000f;
+               dwControlMap[JOY_AXIS_Z] = dwTemp & JOY_RELATIVE_AXIS;
+               dwTemp = (DWORD) joy_advaxisr.value;
+               dwAxisMap[JOY_AXIS_R] = dwTemp & 0x0000000f;
+               dwControlMap[JOY_AXIS_R] = dwTemp & JOY_RELATIVE_AXIS;
+               dwTemp = (DWORD) joy_advaxisu.value;
+               dwAxisMap[JOY_AXIS_U] = dwTemp & 0x0000000f;
+               dwControlMap[JOY_AXIS_U] = dwTemp & JOY_RELATIVE_AXIS;
+               dwTemp = (DWORD) joy_advaxisv.value;
+               dwAxisMap[JOY_AXIS_V] = dwTemp & 0x0000000f;
+               dwControlMap[JOY_AXIS_V] = dwTemp & JOY_RELATIVE_AXIS;
+       }
+
+       // compute the axes to collect from DirectInput
+       joy_flags = JOY_RETURNCENTERED | JOY_RETURNBUTTONS | JOY_RETURNPOV;
+       for (i = 0; i < JOY_MAX_AXES; i++)
+       {
+               if (dwAxisMap[i] != AxisNada)
+               {
+                       joy_flags |= dwAxisFlags[i];
+               }
+       }
+}
+
+
+/*
+===========
+IN_Commands
+===========
+*/
+void IN_Commands (void)
+{
+       int             i, key_index;
+       DWORD   buttonstate, povstate;
+
+       if (!joy_avail)
+       {
+               return;
+       }
+
+       
+       // loop through the joystick buttons
+       // key a joystick event or auxillary event for higher number buttons for each state change
+       buttonstate = ji.dwButtons;
+       for (i=0 ; i < (int) joy_numbuttons ; i++)
+       {
+               if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
+               {
+                       key_index = (i < 4) ? K_JOY1 : K_AUX1;
+                       Key_Event (key_index + i, true);
+               }
+
+               if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
+               {
+                       key_index = (i < 4) ? K_JOY1 : K_AUX1;
+                       Key_Event (key_index + i, false);
+               }
+       }
+       joy_oldbuttonstate = buttonstate;
+
+       if (joy_haspov)
+       {
+               // convert POV information into 4 bits of state information
+               // this avoids any potential problems related to moving from one
+               // direction to another without going through the center position
+               povstate = 0;
+               if(ji.dwPOV != JOY_POVCENTERED)
+               {
+                       if (ji.dwPOV == JOY_POVFORWARD)
+                               povstate |= 0x01;
+                       if (ji.dwPOV == JOY_POVRIGHT)
+                               povstate |= 0x02;
+                       if (ji.dwPOV == JOY_POVBACKWARD)
+                               povstate |= 0x04;
+                       if (ji.dwPOV == JOY_POVLEFT)
+                               povstate |= 0x08;
+               }
+               // determine which bits have changed and key an auxillary event for each change
+               for (i=0 ; i < 4 ; i++)
+               {
+                       if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
+                       {
+                               Key_Event (K_AUX29 + i, true);
+                       }
+
+                       if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
+                       {
+                               Key_Event (K_AUX29 + i, false);
+                       }
+               }
+               joy_oldpovstate = povstate;
+       }
+}
+
+
+/* 
+=============== 
+IN_ReadJoystick
+=============== 
+*/  
+qboolean IN_ReadJoystick (void)
+{
+
+       memset (&ji, 0, sizeof(ji));
+       ji.dwSize = sizeof(ji);
+       ji.dwFlags = joy_flags;
+
+       if (joyGetPosEx (joy_id, &ji) == JOYERR_NOERROR)
+       {
+               // this is a hack -- there is a bug in the Logitech WingMan Warrior DirectInput Driver
+               // rather than having 32768 be the zero point, they have the zero point at 32668
+               // go figure -- anyway, now we get the full resolution out of the device
+               if (joy_wwhack1.integer != 0.0)
+               {
+                       ji.dwUpos += 100;
+               }
+               return true;
+       }
+       else
+       {
+               // read error occurred
+               // turning off the joystick seems too harsh for 1 read error,
+               // but what should be done?
+               return false;
+       }
+}
+
+
+/*
+===========
+IN_JoyMove
+===========
+*/
+void IN_JoyMove (usercmd_t *cmd)
+{
+       float   speed, aspeed;
+       float   fAxisValue, fTemp;
+       int             i, mouselook = (in_mlook.state & 1) || freelook.integer;
+
+       // complete initialization if first time in
+       // this is needed as cvars are not available at initialization time
+       if( joy_advancedinit != true )
+       {
+               Joy_AdvancedUpdate_f();
+               joy_advancedinit = true;
+       }
+
+       // verify joystick is available and that the user wants to use it
+       if (!joy_avail || !in_joystick.integer)
+       {
+               return; 
+       }
+
+       // collect the joystick data, if possible
+       if (IN_ReadJoystick () != true)
+       {
+               return;
+       }
+
+       if (in_speed.state & 1)
+               speed = cl_movespeedkey.value;
+       else
+               speed = 1;
+       // LordHavoc: viewzoom affects sensitivity for sniping
+       aspeed = speed * host_realframetime * cl.viewzoom;
+
+       // 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;
+
+               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)
+                               {               
+                                       // 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 * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
+                                       }
+                                       else
+                                       {
+                                               cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
+                                       }
+                                       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();
+                               }
+                       }
+                       else
+                       {
+                               // user wants forward control to be forward control
+                               if (fabs(fAxisValue) > joy_forwardthreshold.value)
+                               {
+                                       cmd->forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value;
+                               }
+                       }
+                       break;
+
+               case AxisSide:
+                       if (fabs(fAxisValue) > joy_sidethreshold.value)
+                       {
+                               cmd->sidemove += (fAxisValue * joy_sidesensitivity.value) * 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)
+                               {
+                                       cmd->sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value;
+                               }
+                       }
+                       else
+                       {
+                               // user wants turn control to be turn control
+                               if (fabs(fAxisValue) > joy_yawthreshold.value)
+                               {
+                                       if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
+                                       {
+                                               cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * aspeed * cl_yawspeed.value;
+                                       }
+                                       else
+                                       {
+                                               cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * speed * 180.0;
+                                       }
+
+                               }
+                       }
+                       break;
+
+               case AxisLook:
+                       if (mouselook)
+                       {
+                               if (fabs(fAxisValue) > joy_pitchthreshold.value)
+                               {
+                                       // pitch movement detected and pitch movement desired by user
+                                       if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
+                                       {
+                                               cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
+                                       }
+                                       else
+                                       {
+                                               cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * speed * 180.0;
+                                       }
+                                       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;
+
+               default:
+                       break;
+               }
+       }
+}
+