]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_wgl.c
fix mouse in win32, I had forgotten to update a lot of code
[xonotic/darkplaces.git] / vid_wgl.c
index 7f2247c53c5c767e25d63779769305cdee8dfeaa..9251b84b44116b5b31e2710f561d7c5e95280a43 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.
 
@@ -26,12 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define MAX_MODE_LIST  30
 #define VID_ROW_SIZE   3
-#define WARP_WIDTH             320
-#define WARP_HEIGHT            200
 #define MAXWIDTH               10000
 #define MAXHEIGHT              10000
-#define BASEWIDTH              320
-#define BASEHEIGHT             200
 
 #define MODE_WINDOWED                  0
 #define NO_MODE                                        (MODE_WINDOWED - 1)
@@ -61,52 +57,42 @@ lmode_t     lowresmodes[] = {
        {512, 384},
 };
 
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
+qboolean scr_skipupdate;
 
-qboolean               DDActive;
-qboolean               scr_skipupdate;
+static vmode_t modelist[MAX_MODE_LIST];
+static int nummodes;
+static vmode_t badmode;
 
-static vmode_t modelist[MAX_MODE_LIST];
-static int             nummodes;
-static vmode_t *pcurrentmode;
-static vmode_t badmode;
-
-static DEVMODE gdevmode;
-static qboolean        vid_initialized = false;
-static qboolean        windowed, leavecurrentmode;
+static DEVMODE gdevmode;
+static qboolean vid_initialized = false;
+static qboolean windowed, leavecurrentmode;
 static qboolean vid_canalttab = 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;
+static int vid_usingmouse;
+extern qboolean mouseactive;  // from in_win.c
+static HICON hIcon;
 
-HWND   mainwindow, dibwindow;
+int DIBWidth, DIBHeight;
+RECT WindowRect;
+DWORD WindowStyle, ExWindowStyle;
 
-int                    vid_modenum = NO_MODE;
-int                    vid_realmode;
-int                    vid_default = MODE_WINDOWED;
-static int     windowed_default;
-unsigned char  vid_curpal[256*3];
+HWND mainwindow;
 
-HGLRC  baseRC;
-HDC            maindc;
+int vid_modenum = NO_MODE;
+int vid_realmode;
+int vid_default = MODE_WINDOWED;
+static int windowed_default;
+unsigned char vid_curpal[256*3];
 
-glvert_t glv;
+HGLRC baseRC;
+HDC maindc;
 
 HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
 
-viddef_t       vid;                            // global video state
+// global video state
+viddef_t vid;
 
-float          gldepthmin, gldepthmax;
-
-modestate_t    modestate = MS_UNINIT;
+modestate_t modestate = MS_UNINIT;
 
 void VID_MenuDraw (void);
 void VID_MenuKey (int key);
@@ -116,63 +102,17 @@ void AppActivate(BOOL fActive, BOOL minimize);
 char *VID_GetModeDescription (int mode);
 void ClearAllStates (void);
 void VID_UpdateWindowStatus (void);
-void GL_Init (void);
-
-// LordHavoc: ARB multitexture support
-int gl_mtex_enum = 0;
-
-qboolean is8bit = false;
-qboolean isPermedia = false;
-qboolean isATI = false; // LordHavoc: special differences for ATI's broken drivers
-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;
 
 //====================================
 
-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         vid_wait = {"vid_wait","0"};
-cvar_t         vid_nopageflip = {"vid_nopageflip","0", true};
-cvar_t         _vid_wait_override = {"_vid_wait_override", "0", true};
-cvar_t         vid_config_x = {"vid_config_x","800", true};
-cvar_t         vid_config_y = {"vid_config_y","600", true};
-cvar_t         vid_stretch_by_2 = {"vid_stretch_by_2","1", 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;
+int window_center_x, window_center_y, window_x, window_y, window_width, window_height;
+RECT window_rect;
 
 // direct draw software compatability stuff
 
-void VID_HandlePause (qboolean pause)
-{
-}
-
-void VID_ForceLockState (int lk)
-{
-}
-
-void VID_LockBuffer (void)
-{
-}
-
-void VID_UnlockBuffer (void)
-{
-}
-
-int VID_ForceUnlockedAndReturnState (void)
-{
-       return 0;
-}
-
 void CenterWindow(HWND hWndCenter, int width, int height, BOOL lefttopjustify)
 {
-    int     CenterX, CenterY;
+       int CenterX, CenterY;
 
        CenterX = (GetSystemMetrics(SM_CXSCREEN) - width) / 2;
        CenterY = (GetSystemMetrics(SM_CYSCREEN) - height) / 2;
@@ -186,8 +126,8 @@ void CenterWindow(HWND hWndCenter, int width, int height, BOOL lefttopjustify)
 
 qboolean VID_SetWindowedMode (int modenum)
 {
-       int                             lastmodestate, width, height;
-       RECT                    rect;
+       int lastmodestate, width, height;
+       RECT rect;
 
        lastmodestate = modestate;
 
@@ -199,71 +139,36 @@ qboolean VID_SetWindowedMode (int modenum)
        DIBWidth = modelist[modenum].width;
        DIBHeight = modelist[modenum].height;
 
-       WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU |
-                                 WS_MINIMIZEBOX;
+       WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
        ExWindowStyle = 0;
 
        rect = WindowRect;
-       AdjustWindowRectEx(&rect, WindowStyle, FALSE, 0);
+       AdjustWindowRectEx(&rect, WindowStyle, false, 0);
 
        width = rect.right - rect.left;
        height = rect.bottom - rect.top;
 
        // Create the DIB window
-       dibwindow = CreateWindowEx (
-                ExWindowStyle,
-#ifdef NEHAHRA
-                "DPNehahraQuake",
-                "DPNehahraGLQuake",
-#else
-                "DarkPlacesQuake",
-                "DarkPlacesGLQuake",
-#endif
-                WindowStyle,
-                rect.left, rect.top,
-                width,
-                height,
-                NULL,
-                NULL,
-                global_hInstance,
-                NULL);
-
-       if (!dibwindow)
+       mainwindow = CreateWindowEx (ExWindowStyle, gamename, gamename, 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(dibwindow, WindowRect.right - WindowRect.left,
-                                WindowRect.bottom - WindowRect.top, false);
+       CenterWindow(mainwindow, WindowRect.right - WindowRect.left, WindowRect.bottom - WindowRect.top, false);
 
-       ShowWindow (dibwindow, SW_SHOWDEFAULT);
-       UpdateWindow (dibwindow);
+       ShowWindow (mainwindow, SW_SHOWDEFAULT);
+       UpdateWindow (mainwindow);
 
        modestate = MS_WINDOWED;
 
-       // LordHavoc: using GDI functions on an OpenGL window?  bad idea
-       /*
-// because we have set the background brush for the window to NULL
-// (to avoid flickering when re-sizing the window on the desktop),
-// we clear the window to black when created, otherwise it will be
-// empty while Quake starts up.
-       hdc = GetDC(dibwindow);
-       PatBlt(hdc,0,0,WindowRect.right,WindowRect.bottom,BLACKNESS);
-       ReleaseDC(dibwindow, hdc);
-       */
-
        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;
-
-       vid.numpages = 2;
-
-       mainwindow = dibwindow;
 
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)TRUE, (LPARAM)hIcon);
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)FALSE, (LPARAM)hIcon);
+       SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
+       SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
 
        return true;
 }
@@ -271,15 +176,14 @@ qboolean VID_SetWindowedMode (int modenum)
 
 qboolean VID_SetFullDIBMode (int modenum)
 {
-       int                             lastmodestate, width, height;
-       RECT                    rect;
+       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.dmPelsWidth = modelist[modenum].width << modelist[modenum].halfscreen;
                gdevmode.dmPelsHeight = modelist[modenum].height;
                gdevmode.dmSize = sizeof (gdevmode);
 
@@ -302,85 +206,44 @@ qboolean VID_SetFullDIBMode (int modenum)
        ExWindowStyle = 0;
 
        rect = WindowRect;
-       AdjustWindowRectEx(&rect, WindowStyle, FALSE, 0);
+       AdjustWindowRectEx(&rect, WindowStyle, false, 0);
 
        width = rect.right - rect.left;
        height = rect.bottom - rect.top;
 
        // Create the DIB window
-       dibwindow = CreateWindowEx (
-                ExWindowStyle,
-#ifdef NEHAHRA
-                "DPNehahraQuake",
-                "DPNehahraGLQuake",
-#else
-                "DarkPlacesQuake",
-                "DarkPlacesGLQuake",
-#endif
-                WindowStyle,
-                rect.left, rect.top,
-                width,
-                height,
-                NULL,
-                NULL,
-                global_hInstance,
-                NULL);
-
-       if (!dibwindow)
-               Sys_Error ("Couldn't create DIB window");
+       mainwindow = CreateWindowEx (ExWindowStyle, gamename, gamename, WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
 
-       ShowWindow (dibwindow, SW_SHOWDEFAULT);
-       UpdateWindow (dibwindow);
+       if (!mainwindow)
+               Sys_Error ("Couldn't create DIB window");
 
-       // LordHavoc: using GDI functions on an OpenGL window?  bad idea
-       /*
-       // Because we have set the background brush for the window to NULL
-       // (to avoid flickering when re-sizing the window on the desktop), we
-       // clear the window to black when created, otherwise it will be
-       // empty while Quake starts up.
-       hdc = GetDC(dibwindow);
-       PatBlt(hdc,0,0,WindowRect.right,WindowRect.bottom,BLACKNESS);
-       ReleaseDC(dibwindow, hdc);
-       */
+       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;
-
-       vid.numpages = 2;
 
 // needed because we're not getting WM_MOVE messages fullscreen on NT
        window_x = 0;
        window_y = 0;
 
-       mainwindow = dibwindow;
-
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)TRUE, (LPARAM)hIcon);
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)FALSE, (LPARAM)hIcon);
+       SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
+       SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
 
        return true;
 }
 
 
-int VID_SetMode (int modenum, unsigned char *palette)
+int VID_SetMode (int modenum)
 {
-       int                             original_mode, temp;
-       qboolean                stat;
-    MSG                                msg;
+       int original_mode;
+       qboolean stat = 0;
+       MSG msg;
 
-       if ((windowed && (modenum != 0)) ||
-               (!windowed && (modenum < 1)) ||
-               (!windowed && (modenum >= nummodes)))
-       {
+       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 ();
 
@@ -391,42 +254,20 @@ int VID_SetMode (int modenum, unsigned char *palette)
 
        // 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);
-               }
-       }
+               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
@@ -435,21 +276,18 @@ int VID_SetMode (int modenum, unsigned char *palette)
 // 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_SetPalette (palette);
        vid_modenum = modenum;
        Cvar_SetValue ("vid_mode", (float)vid_modenum);
 
        while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
        {
-       TranslateMessage (&msg);
-       DispatchMessage (&msg);
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
        }
 
        Sleep (100);
 
-       SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0,
-                                 SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW |
-                                 SWP_NOCOPYBITS);
+       SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOCOPYBITS);
 
        SetForegroundWindow (mainwindow);
 
@@ -459,10 +297,6 @@ int VID_SetMode (int modenum, unsigned char *palette)
        if (!msg_suppress_1)
                Con_SafePrintf ("Video mode %s initialized.\n", VID_GetModeDescription (vid_modenum));
 
-       VID_SetPalette (palette);
-
-       vid.recalc_refdef = 1;
-
        return true;
 }
 
@@ -474,7 +308,6 @@ VID_UpdateWindowStatus
 */
 void VID_UpdateWindowStatus (void)
 {
-
        window_rect.left = window_x;
        window_rect.top = window_y;
        window_rect.right = window_x + window_width;
@@ -488,177 +321,52 @@ void VID_UpdateWindowStatus (void)
 
 //====================================
 
-void CheckVertexArrays (void)
-{
-       if (COM_CheckParm("-novertex"))
-       {
-               Con_Printf("...vertex array support disabled\n");
-               return;
-       }
-       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 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_Init
-===============
-*/
-extern char *QSG_EXTENSIONS;
-void GL_Init (void)
-{
-       gl_vendor = glGetString (GL_VENDOR);
-       Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
-       gl_renderer = glGetString (GL_RENDERER);
-       Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
-       gl_version = glGetString (GL_VERSION);
-       Con_Printf ("GL_VERSION: %s\n", gl_version);
-       gl_extensions = glGetString (GL_EXTENSIONS);
-       Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-
-//     Con_Printf ("%s %s\n", gl_renderer, gl_version);
-
-    if (strnicmp(gl_renderer,"Permedia",8)==0)
-         isPermedia = true;
-
-       // LordHavoc: special differences for ATI (broken 8bit color when also using 32bit? weird!)
-    if (strnicmp(gl_vendor,"ATI",3)==0)
-       {
-               isATI = true;
-               if (strnicmp(gl_renderer,"Rage Pro",8)==0)
-                       isRagePro = true;
-       }
-       if (strnicmp(gl_renderer,"Matrox G200 Direct3D",20)==0) // a D3D driver for GL? sigh...
-               isG200 = true;
-
-       CheckMultiTexture ();
-       CheckVertexArrays ();
-
-       // LordHavoc: report supported extensions
-       Con_Printf ("\nQSG extensions: %s\n", QSG_EXTENSIONS);
-
-       // LordHavoc: set up state
-//     glEnable(GL_DEPTH_TEST);
-//     glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-//     glShadeModel(GL_SMOOTH);
-//     glEnable(GL_TEXTURE_2D);
-       glAlphaFunc(GL_GREATER, 0.5);
-//     if (isRagePro || isG200)
-//     {
-//             glEnable(GL_ALPHA_TEST);
-//             glAlphaFunc(GL_GREATER, 0.5);
-//     }
-//     else
-//             glDisable(GL_ALPHA_TEST);
-//     glDepthMask(1);
-//     glDisable(GL_DITHER); // LordHavoc: disable dithering
-//     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//     glEnable(GL_BLEND);
-
-//     glClearColor (0,0,0,0); // LordHavoc: changed from red to black
-       glCullFace(GL_FRONT);
-
-//     glAlphaFunc(GL_GREATER, 0.666);
-}
-
 /*
 =================
-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)
 {
-//     extern cvar_t gl_clear;
-
        *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);
 }
 
 
-void GL_EndRendering (void)
+void VID_Finish (void)
 {
-       if (!scr_skipupdate)
+       int vid_usemouse;
+       if (r_render.integer && !scr_skipupdate)
+       {
+               qglFinish();
                SwapBuffers(maindc);
+       }
 
 // handle the mouse state when windowed if that's changed
-       if (modestate == MS_WINDOWED)
+       vid_usemouse = false;
+       if (vid_mouse.integer && key_dest == key_game)
+               vid_usemouse = true;
+       if (modestate == MS_FULLDIB)
+               vid_usemouse = true;
+       if (!vid_activewindow)
+               vid_usemouse = false;
+       if (vid_usemouse)
        {
-               if (!_windowed_mouse.value)
+               if (!vid_usingmouse)
                {
-                       if (windowed_mouse)
-                       {
-                               IN_DeactivateMouse ();
-                               IN_ShowMouse ();
-                               windowed_mouse = false;
-                       }
+                       vid_usingmouse = true;
+                       IN_ActivateMouse ();
+                       IN_HideMouse();
                }
-               else
+       }
+       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 = false;
+                       IN_DeactivateMouse ();
+                       IN_ShowMouse();
                }
        }
 }
@@ -668,11 +376,12 @@ void VID_SetDefaultMode (void)
        IN_DeactivateMouse ();
 }
 
+void VID_RestoreSystemGamma(void);
 
-void   VID_Shutdown (void)
+void VID_Shutdown (void)
 {
-       HGLRC hRC;
-       HDC       hDC;
+       HGLRC hRC;
+       HDC hDC;
        int i;
        GLuint temp[8192];
 
@@ -680,28 +389,33 @@ void      VID_Shutdown (void)
        {
                vid_canalttab = false;
                hRC = wglGetCurrentContext();
-       hDC = wglGetCurrentDC();
+               hDC = wglGetCurrentDC();
 
-       wglMakeCurrent(NULL, NULL);
+               wglMakeCurrent(NULL, NULL);
 
                // LordHavoc: free textures before closing (may help NVIDIA)
-               for (i = 0;i < 8192;i++) temp[i] = i;
-               glDeleteTextures(8192, temp);
+               for (i = 0;i < 8192;i++)
+                       temp[i] = i+1;
+               qglDeleteTextures(8192, temp);
 
-       if (hRC)
-           wglDeleteContext(hRC);
+               if (hRC)
+                       wglDeleteContext(hRC);
 
-               if (hDC && dibwindow)
-                       ReleaseDC(dibwindow, hDC);
+               if (hDC && mainwindow)
+                       ReleaseDC(mainwindow, hDC);
 
                if (modestate == MS_FULLDIB)
                        ChangeDisplaySettings (NULL, 0);
 
-               if (maindc && dibwindow)
-                       ReleaseDC (dibwindow, maindc);
+               if (maindc && mainwindow)
+                       ReleaseDC (mainwindow, maindc);
 
                AppActivate(false, false);
+
+               VID_RestoreSystemGamma();
        }
+
+       GL_CloseLibrary();
 }
 
 
@@ -710,7 +424,7 @@ void        VID_Shutdown (void)
 
 BOOL bSetupPixelFormat(HDC hDC)
 {
-    static PIXELFORMATDESCRIPTOR pfd = {
+       static PIXELFORMATDESCRIPTOR pfd = {
        sizeof(PIXELFORMATDESCRIPTOR),  // size of this pfd
        1,                              // version number
        PFD_DRAW_TO_WINDOW              // support window
@@ -723,75 +437,44 @@ BOOL bSetupPixelFormat(HDC hDC)
        0,                              // shift bit ignored
        0,                              // no accumulation buffer
        0, 0, 0, 0,                     // accum bits ignored
-       32,                             // 32-bit z-buffer      
+       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;
+       };
+       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] = 
-                                       { 
-//  0           1       2       3       4       5       6       7 
-//  8           9       A       B       C       D       E       F 
-       0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6', 
-       '7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9, // 0 
-       'q',    'w',    'e',    'r',    't',    'y',    'u',    'i', 
-       'o',    'p',    '[',    ']',    13 ,    K_CTRL,'a',  's',      // 1 
-       'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';', 
-       '\'' ,    '`',    K_SHIFT,'\\',  'z',    'x',    'c',    'v',      // 2 
-       'b',    'n',    'm',    ',',    '.',    '/',    K_SHIFT,'*', 
-       K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-       K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE  ,    0  , K_HOME, 
-       K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4 
-       K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-       K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
-       0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
-       0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 6 
-       0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
-       0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0         // 7 
-                                       }; 
-
-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 
-                                       }; 
+qbyte scantokey[128] =
+{
+//     0           1      2     3     4     5       6       7      8         9      A       B           C     D            E           F
+       0          ,27    ,'1'  ,'2'  ,'3'  ,'4'    ,'5'    ,'6'   ,'7'      ,'8'   ,'9'    ,'0'        ,'-'  ,'='         ,K_BACKSPACE,9     , // 0
+       'q'        ,'w'   ,'e'  ,'r'  ,'t'  ,'y'    ,'u'    ,'i'   ,'o'      ,'p'   ,'['    ,']'        ,13   ,K_CTRL      ,'a'        ,'s'   , // 1
+       'd'        ,'f'   ,'g'  ,'h'  ,'j'  ,'k'    ,'l'    ,';'   ,'\''     ,'`'   ,K_SHIFT,'\\'       ,'z'  ,'x'         ,'c'        ,'v'   , // 2
+       'b'        ,'n'   ,'m'  ,','  ,'.'  ,'/'    ,K_SHIFT,'*'   ,K_ALT    ,' '   ,0      ,K_F1       ,K_F2 ,K_F3        ,K_F4       ,K_F5  , // 3
+       K_F6       ,K_F7  ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0      ,K_HOME,K_UPARROW,K_PGUP,'-'    ,K_LEFTARROW,'5'  ,K_RIGHTARROW,'+'        ,K_END , // 4
+       K_DOWNARROW,K_PGDN,K_INS,K_DEL,0    ,0      ,0      ,K_F11 ,K_F12    ,0     ,0      ,0          ,0    ,0           ,0          ,0     , // 5
+       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0     , // 6
+       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0       // 7
+};
 
 
 /*
@@ -801,7 +484,7 @@ MapKey
 Map from windows to quake keynums
 =======
 */
-int MapKey (int key)
+int MapKey (int key, int virtualkey)
 {
        key = (key>>16)&255;
        if (key > 127)
@@ -827,7 +510,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++)
        {
@@ -838,6 +521,9 @@ void ClearAllStates (void)
        IN_ClearStates ();
 }
 
+void VID_RestoreGameGamma(void);
+extern qboolean host_loopactive;
+
 void AppActivate(BOOL fActive, BOOL minimize)
 /****************************************************************************
 *
@@ -852,16 +538,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;
@@ -871,58 +557,48 @@ void AppActivate(BOOL fActive, BOOL minimize)
        {
                if (modestate == MS_FULLDIB)
                {
-                       IN_ActivateMouse ();
-                       IN_HideMouse ();
-                       if (vid_canalttab && vid_wassuspended) {
+                       if (vid_canalttab && vid_wassuspended)
+                       {
                                vid_wassuspended = false;
                                ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN);
                                ShowWindow(mainwindow, SW_SHOWNORMAL);
                        }
+
+                       // LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers
+                       MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
                }
-               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)
+               vid_usingmouse = false;
+               IN_DeactivateMouse ();
+               IN_ShowMouse ();
+               if (modestate == MS_FULLDIB && vid_canalttab)
                {
-                       IN_DeactivateMouse ();
-                       IN_ShowMouse ();
-                       if (vid_canalttab) { 
-                               ChangeDisplaySettings (NULL, 0);
-                               vid_wassuspended = true;
-                       }
-               }
-               else if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
-               {
-                       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)
                                ShowWindow(mainwindow, SW_SHOWMINNOACTIVE);
@@ -939,12 +615,12 @@ LONG WINAPI MainWndProc (
 
                case WM_KEYDOWN:
                case WM_SYSKEYDOWN:
-                       Key_Event (MapKey(lParam), true);
+                       Key_Event (MapKey(lParam, wParam), true);
                        break;
-                       
+
                case WM_KEYUP:
                case WM_SYSKEYUP:
-                       Key_Event (MapKey(lParam), false);
+                       Key_Event (MapKey(lParam, wParam), false);
                        break;
 
                case WM_SYSCHAR:
@@ -978,7 +654,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);
@@ -988,17 +664,14 @@ LONG WINAPI MainWndProc (
                        }
                        break;
 
-       case WM_SIZE:
-            break;
+               case WM_SIZE:
+                       break;
 
-           case WM_CLOSE:
-                       if (MessageBox (mainwindow, "Are you sure you want to quit?", "Confirm Exit",
-                                               MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION) == IDYES)
-                       {
+               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);
@@ -1010,27 +683,27 @@ LONG WINAPI MainWndProc (
 
                        break;
 
-           case WM_DESTROY:
-        {
-                       if (dibwindow)
-                               DestroyWindow (dibwindow);
+               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;
 }
 
 
@@ -1044,7 +717,7 @@ int VID_NumModes (void)
        return nummodes;
 }
 
-       
+
 /*
 =================
 VID_GetModePtr
@@ -1081,9 +754,7 @@ char *VID_GetModeDescription (int mode)
        }
        else
        {
-               sprintf (temp, "Desktop resolution (%dx%d)",
-                                modelist[MODE_FULLSCREEN_DEFAULT].width,
-                                modelist[MODE_FULLSCREEN_DEFAULT].height);
+               sprintf (temp, "Desktop resolution (%dx%d)", modelist[MODE_FULLSCREEN_DEFAULT].width, modelist[MODE_FULLSCREEN_DEFAULT].height);
                pinfo = temp;
        }
 
@@ -1105,15 +776,9 @@ char *VID_GetExtModeDescription (int 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);
-               }
+                       sprintf (pinfo, "Desktop resolution (%dx%d)", modelist[MODE_FULLSCREEN_DEFAULT].width, modelist[MODE_FULLSCREEN_DEFAULT].height);
        }
        else
        {
@@ -1145,7 +810,6 @@ VID_NumModes_f
 */
 void VID_NumModes_f (void)
 {
-
        if (nummodes == 1)
                Con_Printf ("%d video mode is available\n", nummodes);
        else
@@ -1161,7 +825,7 @@ VID_DescribeMode_f
 void VID_DescribeMode_f (void)
 {
        int             t, modenum;
-       
+
        modenum = atoi (Cmd_Argv(1));
 
        t = leavecurrentmode;
@@ -1199,58 +863,68 @@ void VID_DescribeModes_f (void)
        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);
+       // 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;
-#ifdef NEHAHRA
-    wc.lpszClassName = "DPNehahraQuake";
-#else
-    wc.lpszClassName = "DarkPlacesQuake";
-#endif
-
-    if (!RegisterClass (&wc) )
-               Sys_Error ("Couldn't register window class");
+       wc.lpszMenuName  = 0;
+       wc.lpszClassName = gamename;
 
-       modelist[0].type = MS_WINDOWED;
+       if (!RegisterClass (&wc) )
+               Sys_Error ("Couldn't register window class");
 
        if (COM_CheckParm("-width"))
-               modelist[0].width = atoi(com_argv[COM_CheckParm("-width")+1]);
+               w = atoi(com_argv[COM_CheckParm("-width")+1]);
        else
-               modelist[0].width = 640;
+               w = 640;
 
-       if (modelist[0].width < 320)
-               modelist[0].width = 320;
+       if (w < 320)
+               w = 320;
 
        if (COM_CheckParm("-height"))
-               modelist[0].height= atoi(com_argv[COM_CheckParm("-height")+1]);
+               = atoi(com_argv[COM_CheckParm("-height")+1]);
        else
-               modelist[0].height = modelist[0].width * 240/320;
-
-       if (modelist[0].height < 240)
-               modelist[0].height = 240;
+               h = w * 240/320;
 
-       sprintf (modelist[0].modedesc, "%dx%d",
-                        modelist[0].width, modelist[0].height);
+       if (h < 240)
+               h = 240;
 
-       modelist[0].modenum = MODE_WINDOWED;
-       modelist[0].dib = 1;
-       modelist[0].fullscreen = 0;
-       modelist[0].halfscreen = 0;
-       modelist[0].bpp = 0;
-
-       nummodes = 1;
+       VID_AddMode(MS_WINDOWED, w, h, 0, 0, 1, 0, 0);
 }
 
 
@@ -1262,8 +936,12 @@ VID_InitFullDIB
 void VID_InitFullDIB (HINSTANCE hInstance)
 {
        DEVMODE devmode;
-       int             i, modenum, originalnummodes, existingmode, numlowresmodes;
-       int             j, bpp, done;
+       int             modenum;
+       int             originalnummodes;
+       int             numlowresmodes;
+       int             j;
+       int             bpp;
+       int             done;
        BOOL    stat;
 
 // enumerate >8 bpp modes
@@ -1274,65 +952,24 @@ void VID_InitFullDIB (HINSTANCE hInstance)
        {
                stat = EnumDisplaySettings (NULL, modenum, &devmode);
 
-               if ((devmode.dmBitsPerPel >= 15) &&
-                       (devmode.dmPelsWidth <= MAXWIDTH) &&
-                       (devmode.dmPelsHeight <= MAXHEIGHT) &&
-                       (nummodes < MAX_MODE_LIST))
+               if ((devmode.dmBitsPerPel >= 15) && (devmode.dmPelsWidth <= MAXWIDTH) && (devmode.dmPelsHeight <= MAXHEIGHT) && (nummodes < MAX_MODE_LIST))
                {
-                       devmode.dmFields = DM_BITSPERPEL |
-                                                          DM_PELSWIDTH |
-                                                          DM_PELSHEIGHT;
+                       devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
 
-                       if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-                                       DISP_CHANGE_SUCCESSFUL)
+                       if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL)
                        {
-                               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++;
-                               }
+                               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);
                        }
                }
 
                modenum++;
-       } while (stat);
+       }
+       while (stat);
 
 // see if there are any low-res modes that aren't being reported
        numlowresmodes = sizeof(lowresmodes) / sizeof(lowresmodes[0]);
@@ -1348,37 +985,8 @@ void VID_InitFullDIB (HINSTANCE hInstance)
                        devmode.dmPelsHeight = lowresmodes[j].height;
                        devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
 
-                       if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-                                       DISP_CHANGE_SUCCESSFUL)
-                       {
-                               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++;
-                               }
-                       }
+                       if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL)
+                               VID_AddMode(MS_FULLDIB, devmode.dmPelsWidth, devmode.dmPelsHeight, 0, 0, 1, 1, devmode.dmBitsPerPel);
                }
                switch (bpp)
                {
@@ -1394,82 +1002,80 @@ void VID_InitFullDIB (HINSTANCE hInstance)
                                done = 1;
                                break;
                }
-       } while (!done);
+       }
+       while (!done);
 
        if (nummodes == originalnummodes)
                Con_SafePrintf ("No fullscreen DIB modes found\n");
 }
 
-qboolean VID_Is8bit()
+//static int grabsysgamma = true;
+WORD systemgammaramps[3][256], currentgammaramps[3][256];
+
+int VID_SetGamma(float prescale, float gamma, float scale, float base)
 {
-       return is8bit;
+       int i;
+       HDC hdc;
+       hdc = GetDC (NULL);
+
+       BuildGammaTable16(prescale, gamma, scale, base, &currentgammaramps[0][0]);
+       for (i = 0;i < 256;i++)
+               currentgammaramps[1][i] = currentgammaramps[2][i] = currentgammaramps[0][i];
+
+       i = SetDeviceGammaRamp(hdc, &currentgammaramps[0][0]);
+
+       ReleaseDC (NULL, hdc);
+       return i; // return success or failure
 }
 
-#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB
+void VID_RestoreGameGamma(void)
+{
+       VID_UpdateGamma(true);
+}
 
-void VID_Init8bitPalette() 
+void VID_GetSystemGamma(void)
 {
-       // Check for 8bit Extensions and initialize them.
-       int i;
-       char thePalette[256*3];
-       char *oldPalette, *newPalette;
-       // LordHavoc: 8bit texture support broke many things...  it now must be specifically stated on the commandline (-no8bit became -8bit)
-    if (!COM_CheckParm("-8bit"))
-               return;
-    if (strstr(gl_extensions, "GL_EXT_shared_texture_palette"))
-               return;
-    if (!(glColorTableEXT = (void *)wglGetProcAddress("glColorTableEXT")))
-               return;
+       HDC hdc;
+       hdc = GetDC (NULL);
 
-       Con_SafePrintf("8-bit GL extensions enabled.\n");
-    glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-       oldPalette = (char *) d_8to24table;
-       newPalette = thePalette;
-       for (i=0;i<256;i++)
-       {
-               *newPalette++ = *oldPalette++;
-               *newPalette++ = *oldPalette++;
-               *newPalette++ = *oldPalette++;
-               oldPalette++;
-       }
-       glColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
-       is8bit = TRUE;
+       GetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
+
+       ReleaseDC (NULL, hdc);
 }
 
-extern void Check_Gamma (unsigned char *pal);
-void VID_Setup15to8Palette ();
+void VID_RestoreSystemGamma(void)
+{
+       HDC hdc;
+       hdc = GetDC (NULL);
+
+       SetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
+
+       ReleaseDC (NULL, hdc);
+}
 
 /*
 ===================
 VID_Init
 ===================
 */
-void   VID_Init (unsigned char *palette)
+void VID_Init (void)
 {
-       int             i, existingmode;
-       int             basenummodes, width, height, bpp, findbpp, done;
-//     char    gldir[MAX_OSPATH];
-       HDC             hdc;
-       DEVMODE devmode;
+       int i;
+       int basenummodes, width, height = 0, bpp, findbpp, done;
+       HDC hdc;
+       DEVMODE devmode;
 
-       memset(&devmode, 0, sizeof(devmode));
+       GL_OpenLibrary();
 
-       Cvar_RegisterVariable (&vid_mode);
-       Cvar_RegisterVariable (&vid_wait);
-       Cvar_RegisterVariable (&vid_nopageflip);
-       Cvar_RegisterVariable (&_vid_wait_override);
-       Cvar_RegisterVariable (&_vid_default_mode);
-       Cvar_RegisterVariable (&_vid_default_mode_win);
-       Cvar_RegisterVariable (&vid_config_x);
-       Cvar_RegisterVariable (&vid_config_y);
-       Cvar_RegisterVariable (&vid_stretch_by_2);
-       Cvar_RegisterVariable (&_windowed_mouse);
+       memset(&devmode, 0, sizeof(devmode));
 
        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);
 
+       VID_GetSystemGamma();
+
        hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
 
        InitCommonControls();
@@ -1484,9 +1090,7 @@ void      VID_Init (unsigned char *palette)
                hdc = GetDC (NULL);
 
                if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
-               {
                        Sys_Error ("Can't run in non-RGB mode");
-               }
 
                ReleaseDC (NULL, hdc);
 
@@ -1502,30 +1106,22 @@ void    VID_Init (unsigned char *palette)
                windowed = false;
 
                if (COM_CheckParm("-mode"))
-               {
                        vid_default = atoi(com_argv[COM_CheckParm("-mode")+1]);
-               }
                else
                {
                        if (COM_CheckParm("-current"))
                        {
-                               modelist[MODE_FULLSCREEN_DEFAULT].width =
-                                               GetSystemMetrics (SM_CXSCREEN);
-                               modelist[MODE_FULLSCREEN_DEFAULT].height =
-                                               GetSystemMetrics (SM_CYSCREEN);
+                               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;
-                               }
 
                                if (COM_CheckParm("-bpp"))
                                {
@@ -1543,35 +1139,7 @@ void     VID_Init (unsigned char *palette)
 
                        // if they want to force it, add the specified mode to the list
                                if (COM_CheckParm("-force") && (nummodes < MAX_MODE_LIST))
-                               {
-                                       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 (!existingmode)
-                                       {
-                                               nummodes++;
-                                       }
-                               }
+                                       VID_AddMode(MS_FULLDIB, width, height, 0, 0, 1, 1, bpp);
 
                                done = 0;
 
@@ -1583,9 +1151,7 @@ void      VID_Init (unsigned char *palette)
 
                                                for (i=1, vid_default=0 ; i<nummodes ; i++)
                                                {
-                                                       if ((modelist[i].width == width) &&
-                                                               (modelist[i].height == height) &&
-                                                               (modelist[i].bpp == bpp))
+                                                       if ((modelist[i].width == width) && (modelist[i].height == height) && (modelist[i].bpp == bpp))
                                                        {
                                                                vid_default = i;
                                                                done = 1;
@@ -1612,32 +1178,20 @@ void    VID_Init (unsigned char *palette)
                                                {
                                                        switch (bpp)
                                                        {
-                                                       case 15:
-                                                               bpp = 16;
-                                                               break;
-                                                       case 16:
-                                                               bpp = 32;
-                                                               break;
-                                                       case 32:
-                                                               bpp = 24;
-                                                               break;
-                                                       case 24:
-                                                               done = 1;
-                                                               break;
+                                                       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);
 
                                if (!vid_default)
-                               {
                                        Sys_Error ("Specified video mode not available");
-                               }
                        }
                }
        }
@@ -1662,45 +1216,37 @@ void    VID_Init (unsigned char *palette)
        if (vid.conheight < 200)
                vid.conheight = 200;
 
-       vid.maxwarpwidth = WARP_WIDTH;
-       vid.maxwarpheight = WARP_HEIGHT;
-       vid.colormap = host_colormap;
-       vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-
-       DestroyWindow (hwnd_dialog);
+       VID_SetMode (vid_default);
 
-       VID_SetPalette (palette);
-
-       Check_Gamma(palette);
-
-       VID_SetMode (vid_default, palette);
-
-    maindc = GetDC(mainwindow);
+       maindc = GetDC(mainwindow);
        bSetupPixelFormat(maindc);
 
-    baseRC = wglCreateContext( maindc );
+       baseRC = wglCreateContext( maindc );
        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 ))
+       if (!wglMakeCurrent( maindc, baseRC ))
                Sys_Error ("wglMakeCurrent failed");
 
        GL_Init ();
 
-//     sprintf (gldir, "%s/glquake", com_gamedir);
-//     Sys_mkdir (gldir);
+       // LordHavoc: special differences for ATI (broken 8bit color when also using 32bit? weird!)
+       if (strncasecmp(gl_vendor,"ATI",3)==0)
+       {
+               if (strncasecmp(gl_renderer,"Rage Pro",8)==0)
+                       isRagePro = true;
+       }
+       if (strncasecmp(gl_renderer,"Matrox G200 Direct3D",20)==0) // a D3D driver for GL? sigh...
+               isG200 = true;
 
        vid_realmode = vid_modenum;
 
-       VID_Init8bitPalette();
-
-       if (is8bit) // LordHavoc: avoid calculating 15to8 table if it won't be used
-               VID_Setup15to8Palette ();
-
        vid_menudrawfn = VID_MenuDraw;
        vid_menukeyfn = VID_MenuKey;
 
        strcpy (badmode.modedesc, "Bad mode");
        vid_canalttab = true;
+
+       vid_hidden = false;
 }
 
 
@@ -1709,26 +1255,25 @@ void    VID_Init (unsigned char *palette)
 //========================================================
 
 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_DrawTransPic (int x, int y, qpic_t *pic);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
+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_line, vid_wmodes;
+static int vid_wmodes;
 
 typedef struct
 {
-       int             modenum;
-       char    *desc;
-       int             iscur;
+       int modenum;
+       char *desc;
+       int iscur;
 } modedesc_t;
 
 #define MAX_COLUMN_SIZE                9
 #define MODE_AREA_HEIGHT       (MAX_COLUMN_SIZE + 2)
 #define MAX_MODEDESCS          (MAX_COLUMN_SIZE*3)
 
-static modedesc_t      modedescs[MAX_MODEDESCS];
+static modedesc_t modedescs[MAX_MODEDESCS];
 
 /*
 ================
@@ -1737,17 +1282,17 @@ VID_MenuDraw
 */
 void VID_MenuDraw (void)
 {
-       qpic_t          *p;
-       char            *ptr;
-       int                     lnummodes, i, k, column, row;
-       vmode_t         *pv;
+       cachepic_t *p;
+       char *ptr;
+       int lnummodes, i, k, column, row;
+       vmode_t *pv;
 
        p = Draw_CachePic ("gfx/vidmodes.lmp");
-       M_DrawPic ( (320-p->width)/2, 4, p);
+       M_DrawPic ( (320-p->width)/2, 4, "gfx/vidmodes.lmp");
 
        vid_wmodes = 0;
        lnummodes = VID_NumModes ();
-       
+
        for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
        {
                ptr = VID_GetModeDescription (i);
@@ -1790,14 +1335,10 @@ void VID_MenuDraw (void)
                }
        }
 
-       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");
+       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");
 }
 
 
@@ -1819,3 +1360,4 @@ void VID_MenuKey (int key)
                break;
        }
 }
+