]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_wgl.c
got rid of gl_mesh_drawmode, now only gl_mesh_drawrangeelements remains, this got...
[xonotic/darkplaces.git] / vid_wgl.c
index d8ca7651cb8f6f0265066f31c91ba47fe0c05ad8..f5e2b38d8586caa1fa386dd3436d1fe1b9568356 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,6 +24,44 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "resource.h"
 #include <commctrl.h>
 
+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);
+PROC (WINAPI *qwglGetProcAddress)(LPCSTR);
+BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC);
+BOOL (WINAPI *qwglSwapIntervalEXT)(int interval);
+const char *(WINAPI *wglGetExtensionsStringARB)(HDC hdc);
+
+static gl_extensionfunctionlist_t getextensionsstringfuncs[] =
+{
+       {"wglGetExtensionsString", (void **) &qwglGetExtensionsString},
+       {NULL, NULL}
+};
+
+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},
+       {NULL, NULL}
+};
+
+static gl_extensionfunctionlist_t wglswapintervalfuncs[] =
+{
+       {"wglSwapIntervalEXT", (void **) &qwglSwapIntervalEXT},
+       {NULL, NULL}
+};
+
 #define MAX_MODE_LIST  30
 #define VID_ROW_SIZE   3
 #define MAXWIDTH               10000
@@ -41,7 +79,6 @@ typedef struct {
        int                     dib;
        int                     fullscreen;
        int                     bpp;
-       int                     halfscreen;
        char            modedesc[17];
 } vmode_t;
 
@@ -57,47 +94,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               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             usingmouse;
-extern qboolean        mouseactive;  // from in_win.c
-static HICON   hIcon;
+static int vid_usingmouse;
+extern qboolean mouseactive;  // from in_win.c
+static HICON hIcon;
 
-int                    DIBWidth, DIBHeight;
-RECT           WindowRect;
-DWORD          WindowStyle, ExWindowStyle;
+int DIBWidth, DIBHeight;
+RECT WindowRect;
+DWORD WindowStyle, ExWindowStyle;
 
-HWND   mainwindow;
+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];
+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;
+HGLRC baseRC;
+HDC maindc;
 
 HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
 
-viddef_t       vid;                            // global video state
+// global video state
+viddef_t vid;
 
-modestate_t    modestate = MS_UNINIT;
+modestate_t modestate = MS_UNINIT;
 
 void VID_MenuDraw (void);
 void VID_MenuKey (int key);
@@ -110,19 +142,14 @@ void VID_UpdateWindowStatus (void);
 
 //====================================
 
-// 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};
-
-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 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;
@@ -136,8 +163,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;
 
@@ -172,11 +199,6 @@ qboolean VID_SetWindowedMode (int modenum)
 
        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;
-
        SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
        SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
 
@@ -186,15 +208,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;
                gdevmode.dmPelsHeight = modelist[modenum].height;
                gdevmode.dmSize = sizeof (gdevmode);
 
@@ -231,11 +252,6 @@ qboolean VID_SetFullDIBMode (int modenum)
        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;
-
 // needed because we're not getting WM_MOVE messages fullscreen on NT
        window_x = 0;
        window_y = 0;
@@ -249,18 +265,13 @@ qboolean VID_SetFullDIBMode (int modenum)
 
 int VID_SetMode (int modenum)
 {
-       int                             original_mode;
-       //int                           temp;
-       qboolean                stat = 0;
-    MSG                                msg;
+       int original_mode;
+       qboolean stat = 0;
+       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)
@@ -270,30 +281,9 @@ int VID_SetMode (int modenum)
 
        // Set either the fullscreen or windowed mode
        if (modelist[modenum].type == MS_WINDOWED)
-       {
-//             if (vid_mouse.integer && key_dest == key_game)
-//             {
-//                     stat = VID_SetWindowedMode(modenum);
-//                     usingmouse = true;
-//                     IN_ActivateMouse ();
-//                     IN_HideMouse ();
-//             }
-//             else
-//             {
-//                     usingmouse = false;
-//                     IN_DeactivateMouse ();
-//                     IN_ShowMouse ();
-//                     stat = VID_SetWindowedMode(modenum);
-//             }
                stat = VID_SetWindowedMode(modenum);
-       }
        else if (modelist[modenum].type == MS_FULLDIB)
-       {
                stat = VID_SetFullDIBMode(modenum);
-//             usingmouse = true;
-//             IN_ActivateMouse ();
-//             IN_HideMouse ();
-       }
        else
                Sys_Error ("VID_SetMode: Bad mode type in modelist");
 
@@ -302,7 +292,6 @@ int VID_SetMode (int modenum)
        VID_UpdateWindowStatus ();
 
        CDAudio_Resume ();
-//     scr_disabled_for_loading = temp;
 
        if (!stat)
                Sys_Error ("Couldn't set video mode");
@@ -319,8 +308,8 @@ int VID_SetMode (int modenum)
 
        while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
        {
-       TranslateMessage (&msg);
-       DispatchMessage (&msg);
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
        }
 
        Sleep (100);
@@ -335,8 +324,6 @@ int VID_SetMode (int modenum)
        if (!msg_suppress_1)
                Con_SafePrintf ("Video mode %s initialized.\n", VID_GetModeDescription (vid_modenum));
 
-//     vid.recalc_refdef = 1;
-
        return true;
 }
 
@@ -348,7 +335,6 @@ VID_UpdateWindowStatus
 */
 void VID_UpdateWindowStatus (void)
 {
-
        window_rect.left = window_x;
        window_rect.top = window_y;
        window_rect.right = window_x + window_width;
@@ -377,7 +363,7 @@ void VID_GetWindowSize (int *x, int *y, int *width, int *height)
 
 void VID_Finish (void)
 {
-       int usemouse;
+       int vid_usemouse;
        if (r_render.integer && !scr_skipupdate)
        {
                qglFinish();
@@ -385,27 +371,27 @@ void VID_Finish (void)
        }
 
 // handle the mouse state when windowed if that's changed
-       usemouse = false;
-       if (vid_mouse.integer && key_dest == key_game)
-               usemouse = true;
+       vid_usemouse = false;
+       if (vid_mouse.integer && !key_consoleactive)
+               vid_usemouse = true;
        if (modestate == MS_FULLDIB)
-               usemouse = true;
-       if (!ActiveApp)
-               usemouse = false;
-       if (usemouse)
+               vid_usemouse = true;
+       if (!vid_activewindow)
+               vid_usemouse = false;
+       if (vid_usemouse)
        {
-               if (!usingmouse)
+               if (!vid_usingmouse)
                {
-                       usingmouse = true;
+                       vid_usingmouse = true;
                        IN_ActivateMouse ();
                        IN_HideMouse();
                }
        }
        else
        {
-               if (usingmouse)
+               if (vid_usingmouse)
                {
-                       usingmouse = false;
+                       vid_usingmouse = false;
                        IN_DeactivateMouse ();
                        IN_ShowMouse();
                }
@@ -419,28 +405,31 @@ void VID_SetDefaultMode (void)
 
 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];
 
        if (vid_initialized)
        {
                vid_canalttab = false;
-               hRC = wglGetCurrentContext();
-       hDC = wglGetCurrentDC();
+               hRC = qwglGetCurrentContext();
+               hDC = qwglGetCurrentDC();
 
-       wglMakeCurrent(NULL, NULL);
+               qwglMakeCurrent(NULL, NULL);
 
                // LordHavoc: free textures before closing (may help NVIDIA)
                for (i = 0;i < 8192;i++)
                        temp[i] = i+1;
                qglDeleteTextures(8192, temp);
 
-       if (hRC)
-           wglDeleteContext(hRC);
+               if (hRC)
+                       qwglDeleteContext(hRC);
+
+               // close the library before we get rid of the window
+               GL_CloseLibrary();
 
                if (hDC && mainwindow)
                        ReleaseDC(mainwindow, hDC);
@@ -463,7 +452,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
@@ -476,28 +465,28 @@ 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;
 }
 
 
@@ -515,20 +504,6 @@ qbyte scantokey[128] =
        0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0       // 7
 };
 
-/*
-qbyte 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 
-}; 
-*/
 
 /*
 =======
@@ -544,8 +519,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];
 }
 
@@ -565,7 +538,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++)
        {
@@ -593,16 +566,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;
@@ -612,9 +585,6 @@ void AppActivate(BOOL fActive, BOOL minimize)
        {
                if (modestate == MS_FULLDIB)
                {
-//                     usingmouse = true;
-//                     IN_ActivateMouse ();
-//                     IN_HideMouse ();
                        if (vid_canalttab && vid_wassuspended)
                        {
                                vid_wassuspended = false;
@@ -625,38 +595,20 @@ 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) && vid_mouse.integer && key_dest == key_game)
-//             {
-//                     usingmouse = true;
-//                     IN_ActivateMouse ();
-//                     IN_HideMouse ();
-//             }
                if (host_loopactive)
                        VID_RestoreGameGamma();
        }
 
        if (!fActive)
        {
-               usingmouse = false;
+               vid_usingmouse = false;
                IN_DeactivateMouse ();
                IN_ShowMouse ();
-               if (modestate == MS_FULLDIB)
+               if (modestate == MS_FULLDIB && vid_canalttab)
                {
-//                     usingmouse = false;
-//                     IN_DeactivateMouse ();
-//                     IN_ShowMouse ();
-                       if (vid_canalttab)
-                       { 
-                               ChangeDisplaySettings (NULL, 0);
-                               vid_wassuspended = true;
-                       }
+                       ChangeDisplaySettings (NULL, 0);
+                       vid_wassuspended = true;
                }
-//             else if ((modestate == MS_WINDOWED) && vid_mouse.integer)
-//             {
-//                     usingmouse = false;
-//                     IN_DeactivateMouse ();
-//                     IN_ShowMouse ();
-//             }
                VID_RestoreSystemGamma();
        }
 }
@@ -666,15 +618,15 @@ 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    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);
@@ -693,7 +645,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                case WM_SYSKEYDOWN:
                        Key_Event (MapKey(lParam, wParam), true);
                        break;
-                       
+
                case WM_KEYUP:
                case WM_SYSKEYUP:
                        Key_Event (MapKey(lParam, wParam), false);
@@ -730,7 +682,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                // 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);
@@ -740,14 +692,14 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                        }
                        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);
@@ -759,27 +711,27 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 
                        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;
 }
 
 
@@ -793,7 +745,7 @@ int VID_NumModes (void)
        return nummodes;
 }
 
-       
+
 /*
 =================
 VID_GetModePtr
@@ -886,7 +838,6 @@ VID_NumModes_f
 */
 void VID_NumModes_f (void)
 {
-
        if (nummodes == 1)
                Con_Printf ("%d video mode is available\n", nummodes);
        else
@@ -902,7 +853,7 @@ VID_DescribeMode_f
 void VID_DescribeMode_f (void)
 {
        int             t, modenum;
-       
+
        modenum = atoi (Cmd_Argv(1));
 
        t = leavecurrentmode;
@@ -940,7 +891,7 @@ 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)
+void VID_AddMode(int type, int width, int height, int modenum, int dib, int fullscreen, int bpp)
 {
        int i;
        if (nummodes >= MAX_MODE_LIST)
@@ -949,7 +900,6 @@ void VID_AddMode(int type, int width, int height, int modenum, int halfscreen, i
        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;
@@ -971,49 +921,20 @@ void VID_InitDIB (HINSTANCE hInstance)
        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.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 = gamename;
+       wc.lpszMenuName  = 0;
+       wc.lpszClassName = gamename;
 
-    if (!RegisterClass (&wc) )
+       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;
-
-       if (modelist[0].width < 320)
-               modelist[0].width = 320;
-
-       if (COM_CheckParm("-height"))
-               modelist[0].height= 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;
-
-       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;
-
-       nummodes = 1;
-       */
        if (COM_CheckParm("-width"))
                w = atoi(com_argv[COM_CheckParm("-width")+1]);
        else
@@ -1030,7 +951,7 @@ void VID_InitDIB (HINSTANCE hInstance)
        if (h < 240)
                h = 240;
 
-       VID_AddMode(MS_WINDOWED, w, h, 0, 0, 1, 0, 0);
+       VID_AddMode(MS_WINDOWED, w, h, 0, 1, 0, 0);
 }
 
 
@@ -1042,10 +963,8 @@ VID_InitFullDIB
 void VID_InitFullDIB (HINSTANCE hInstance)
 {
        DEVMODE devmode;
-//     int             i;
        int             modenum;
        int             originalnummodes;
-//     int             existingmode;
        int             numlowresmodes;
        int             j;
        int             bpp;
@@ -1072,41 +991,6 @@ void VID_InitFullDIB (HINSTANCE hInstance)
                                        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++;
-                               */
                        }
                }
 
@@ -1130,31 +1014,6 @@ void VID_InitFullDIB (HINSTANCE hInstance)
 
                        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)
                {
@@ -1221,255 +1080,30 @@ void VID_RestoreSystemGamma(void)
        ReleaseDC (NULL, hdc);
 }
 
-/*
-===================
-VID_Init
-===================
-*/
-void   VID_Init (void)
-{
-       int             i;
-//     int             existingmode;
-       int             basenummodes, width, height = 0, bpp, findbpp, done;
-       HDC             hdc;
-       DEVMODE devmode;
-
-       memset(&devmode, 0, sizeof(devmode));
-
-//     Cvar_RegisterVariable (&_vid_default_mode);
-//     Cvar_RegisterVariable (&_vid_default_mode_win);
-
-       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();
-
-       VID_InitDIB (global_hInstance);
-       basenummodes = nummodes = 1;
-
-       VID_InitFullDIB (global_hInstance);
-
-       if (COM_CheckParm("-window"))
-       {
-               hdc = GetDC (NULL);
-
-               if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
-                       Sys_Error ("Can't run in non-RGB mode");
-
-               ReleaseDC (NULL, hdc);
-
-               windowed = true;
-
-               vid_default = MODE_WINDOWED;
-       }
-       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
-               {
-                       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;
-
-                               if (COM_CheckParm("-bpp"))
-                               {
-                                       bpp = atoi(com_argv[COM_CheckParm("-bpp")+1]);
-                                       findbpp = 0;
-                               }
-                               else
-                               {
-                                       bpp = 15;
-                                       findbpp = 1;
-                               }
-
-                               if (COM_CheckParm("-height"))
-                                       height = atoi(com_argv[COM_CheckParm("-height")+1]);
-
-                       // 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 (!existingmode)
-                                               nummodes++;
-                               }
-                               */
-
-                               done = 0;
-
-                               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;
-                                                       }
-                                               }
-                                       }
-
-                                       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);
-
-                               if (!vid_default)
-                                       Sys_Error ("Specified video mode not available");
-                       }
-               }
-       }
-
-       vid_initialized = true;
-
-       if ((i = COM_CheckParm("-conwidth")) != 0)
-               vid.conwidth = atoi(com_argv[i+1]);
-       else
-               vid.conwidth = 640;
-
-       vid.conwidth &= 0xfff8; // make it a multiple of eight
-
-       if (vid.conwidth < 320)
-               vid.conwidth = 320;
-
-       // pick a conheight that matches with correct aspect
-       vid.conheight = vid.conwidth*3 / 4;
-
-       if ((i = COM_CheckParm("-conheight")) != 0)
-               vid.conheight = atoi(com_argv[i+1]);
-       if (vid.conheight < 200)
-               vid.conheight = 200;
-
-       VID_SetMode (vid_default);
-
-       maindc = GetDC(mainwindow);
-       bSetupPixelFormat(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 ))
-               Sys_Error ("wglMakeCurrent failed");
-
-       GL_Init ();
-
-       // 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;
-
-//     sprintf (gldir, "%s/glquake", com_gamedir);
-//     Sys_mkdir (gldir);
-
-       vid_realmode = vid_modenum;
-
-       vid_menudrawfn = VID_MenuDraw;
-       vid_menukeyfn = VID_MenuKey;
-
-       strcpy (badmode.modedesc, "Bad mode");
-       vid_canalttab = true;
-}
-
-
 //========================================================
 // Video menu stuff
 //========================================================
 
 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, char *picname);
+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;
+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];
 
 /*
 ================
@@ -1556,3 +1190,160 @@ void VID_MenuKey (int key)
                break;
        }
 }
+
+static HINSTANCE gldll;
+
+int GL_OpenLibrary(const char *name)
+{
+       Con_Printf("Loading GL driver %s\n", name);
+       GL_CloseLibrary();
+       if (!(gldll = LoadLibrary(name)))
+       {
+               Con_Printf("Unable to LoadLibrary %s\n", name);
+               return false;
+       }
+       strcpy(gl_driver, name);
+       return true;
+}
+
+void GL_CloseLibrary(void)
+{
+       FreeLibrary(gldll);
+       gldll = 0;
+       gl_driver[0] = 0;
+       qwglGetProcAddress = NULL;
+       gl_extensions = "";
+       gl_platform = "";
+       gl_platformextensions = "";
+}
+
+void *GL_GetProcAddress(const char *name)
+{
+       void *p = NULL;
+       if (qwglGetProcAddress != NULL)
+               p = (void *) qwglGetProcAddress(name);
+       if (p == NULL)
+               p = (void *) GetProcAddress(gldll, name);
+       return p;
+}
+/*
+===================
+VID_Init
+===================
+*/
+void VID_Init (int fullscreen, int width, int height)
+{
+       int i;
+       int basenummodes, bpp, findbpp, done;
+       HDC hdc;
+       DEVMODE devmode;
+
+       if (!GL_OpenLibrary("opengl32.dll"))
+               Sys_Error("Unable to load GL driver\n");
+
+       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();
+
+       VID_InitDIB (global_hInstance);
+       basenummodes = nummodes = 1;
+
+       VID_InitFullDIB (global_hInstance);
+
+       if (!fullscreen)
+       {
+               hdc = GetDC (NULL);
+
+               if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
+                       Sys_Error ("Can't run in non-RGB mode");
+
+               ReleaseDC (NULL, hdc);
+
+               windowed = true;
+
+               vid_default = MODE_WINDOWED;
+       }
+       else
+       {
+               if (nummodes == 1)
+                       Sys_Error ("No RGB fullscreen modes available");
+
+               windowed = false;
+
+               done = 0;
+
+               bestmode = -1;
+               bestrating = 1000000000;
+               for (i = 0;i < nummodes;i++)
+               {
+                       rating = VID_CompareMode(fullscreen, width, height, bpp, modelist[i].fullscreen, modelist[i].width, modelist[i].height, modelist[i].bpp);
+                       if (bestrating > rating)
+                       {
+                               bestrating = rating;
+                               bestmode = i;
+                       }
+               }
+
+               if (bestmode < 0)
+                       Sys_Error ("Specified video mode not available");
+       }
+
+       vid_initialized = true;
+
+       VID_SetMode (vid_default);
+
+       maindc = GetDC(mainwindow);
+       bSetupPixelFormat(maindc);
+
+       if (!gl_checkextension("wgl", wglfuncs, NULL, false))
+               Sys_Error("wgl functions not found\n");
+
+       baseRC = qwglCreateContext( 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 (!qwglMakeCurrent( maindc, baseRC ))
+               Sys_Error ("wglMakeCurrent failed");
+
+       gl_renderer = qglGetString(GL_RENDERER);
+       gl_vendor = qglGetString(GL_VENDOR);
+       gl_version = qglGetString(GL_VERSION);
+       gl_extensions = qglGetString(GL_EXTENSIONS);
+       gl_platformname = "WGL";
+       gl_platformextensions = "";
+
+       if (gl_checkextension("WGL_ARB_extensions_string", extensionsstringfuncs, NULL, false))
+               gl_platformextensions = qwglGetExtensionsStringARB(maindc);
+
+       gl_videosyncavailable = gl_checkextension("WGL_EXT_swap_control", wglswapintervalfuncs, NULL, false);
+
+       GL_Init ();
+
+       // 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_menudrawfn = VID_MenuDraw;
+       vid_menukeyfn = VID_MenuKey;
+
+       strcpy (badmode.modedesc, "Bad mode");
+       vid_canalttab = true;
+
+       vid_hidden = false;
+}
+