cleaned up vid_glx.c somewhat, it can now quit properly when the close button is...

added vid_hidden (iconified or otherwise disabled window - don't render anything) and vid_activewindow (not the active window, don't hog CPU power) to vid_* files

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2167 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index d66550984709680c57e980f1c577e7537b01adee..4d88c529f8a46f3a22ddddaffe318e688347b246 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -930,7 +930,7 @@ void CL_SetupScreenSize(void)
 
 void CL_UpdateScreen(void)
 {
-       if (!scr_initialized || !con_initialized)
+       if (!scr_initialized || !con_initialized || vid_hidden)
                return;                         // not initialized yet
 
        if (cl_avidemo.integer)

diff --git a/host.c b/host.c
index c6ffa4aa8a472eabc7e9c0a4686b6b02b366aafb..d7be378fee52e108b4cd8b270079098e5d14bf51 100644 (file)
--- a/host.c
+++ b/host.c
@@ -358,7 +358,7 @@ void Host_ClientCommands (char *fmt, ...)
        va_start (argptr,fmt);
        vsprintf (string, fmt,argptr);
        va_end (argptr);
-       
+
        MSG_WriteByte (&host_client->message, svc_stufftext);
        MSG_WriteString (&host_client->message, string);
 }
@@ -548,8 +548,9 @@ qboolean Host_FilterTime (double time)
        }
        else if (!cls.timedemo)
        {
+               // default to sys_ticrate (server framerate - presumably low) unless we're the active window and either connected to a server or playing a video
                timecap = sys_ticrate.value;
-               if (cls.state == ca_connected)
+               if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying))
                        timecap = 1.0 / host_maxfps.value;
 
                if ((realtime - oldrealtime) < timecap)

diff --git a/vid.h b/vid.h
index 5b078578ecd8e1278b12ee99ac0a994ea57052a9..2ab444355bde42bead28d3cbb136745526e85078 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -25,19 +25,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef struct
 {
        // these are set with VID_GetWindowSize and can change from frame to frame
-       int             realx;
-       int             realy;
-       int             realwidth;
-       int             realheight;
+       int realx;
+       int realy;
+       int realwidth;
+       int realheight;
 
-       int             conwidth;
-       int             conheight;
+       int conwidth;
+       int conheight;
 } viddef_t;
 
-extern viddef_t        vid;                            // global video state
+// global video state
+extern viddef_t vid;
 extern void (*vid_menudrawfn)(void);
 extern void (*vid_menukeyfn)(int key);
 
+extern int vid_hidden;
+extern int vid_activewindow;
+
 extern cvar_t vid_mode;
 extern cvar_t vid_mouse;
 extern cvar_t vid_fullscreen;
@@ -48,17 +52,18 @@ void GL_Init (void);
 
 void VID_CheckExtensions(void);
 
-void   VID_Init (void);
+void VID_Init (void);
 // Called at startup
 
-void   VID_Shutdown (void);
+void VID_Shutdown (void);
 // Called at shutdown
 
 int VID_SetMode (int modenum);
 // sets the mode; only used by the Quake engine for resetting to mode 0 (the
 // base mode) on memory allocation failures
 
-// sets hardware gamma correction, returns false if the device does not support gamma control
+// sets hardware gamma correction, returns false if the device does not
+// support gamma control
 int VID_SetGamma (float prescale, float gamma, float scale, float base);
 
 void VID_GetWindowSize (int *x, int *y, int *width, int *height);

diff --git a/vid_3dfxsvga.c b/vid_3dfxsvga.c
index 727424907c3ee473839f5ec510e381cea6ca4177..9ecca04be34aa78f45fe605fb3f8492d56215405 100644 (file)
--- a/vid_3dfxsvga.c
+++ b/vid_3dfxsvga.c
@@ -287,6 +287,8 @@ void VID_Init(void)
 
        VID_SetupDithering(); // 3DFX specific
 
+       vid_hidden = false;
+
        Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
 }
 

diff --git a/vid_glx.c b/vid_glx.c
index 6445cbac8c6221825b22bdf67d356d7181254da5..22a7b6747c0ba2d64566bc710983b5ab75cd90ef 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -43,6 +43,8 @@ static int scrnum;
 static Window win;
 static GLXContext ctx = NULL;
 
+Atom wm_delete_window_atom;
+
 #define KEY_MASK (KeyPressMask | KeyReleaseMask)
 #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
                    PointerMotionMask | ButtonMotionMask )
@@ -278,11 +280,17 @@ static void HandleEvents(void)
                switch (event.type)
                {
                case KeyPress:
+                       // key pressed
+                       Key_Event(XLateKey(&event.xkey), true);
+                       break;
+
                case KeyRelease:
-                       Key_Event(XLateKey(&event.xkey), event.type == KeyPress);
+                       // key released
+                       Key_Event(XLateKey(&event.xkey), false);
                        break;
 
                case MotionNotify:
+                       // mouse moved
                        if (usingmouse)
                        {
                                if (vid_dga.integer == 1)
@@ -292,7 +300,7 @@ static void HandleEvents(void)
                                }
                                else
                                {
-                                       
+
                                        if (!event.xmotion.send_event)
                                        {
                                                mouse_x += event.xmotion.x - p_mouse_x;
@@ -309,6 +317,7 @@ static void HandleEvents(void)
                        break;
 
                case ButtonPress:
+                       // mouse button pressed
                        switch(event.xbutton.button)
                        {
                        case 1:
@@ -333,6 +342,7 @@ static void HandleEvents(void)
                        break;
 
                case ButtonRelease:
+                       // mouse button released
                        switch(event.xbutton.button)
                        {
                        case 1:
@@ -356,15 +366,46 @@ static void HandleEvents(void)
                        }
                        break;
 
-               case CreateNotify :
+               case CreateNotify:
+                       // window created
                        win_x = event.xcreatewindow.x;
                        win_y = event.xcreatewindow.y;
                        break;
 
-               case ConfigureNotify :
+               case ConfigureNotify:
+                       // window changed size/location
                        win_x = event.xconfigure.x;
                        win_y = event.xconfigure.y;
                        break;
+               case DestroyNotify:
+                       // window has been destroyed
+                       Sys_Quit();
+                       break;
+               case ClientMessage:
+                       // window manager messages
+                       if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom))
+                               Sys_Quit();
+                       break;
+               case MapNotify:
+                       // window restored
+                       vid_hidden = false;
+                       break;
+               case UnmapNotify:
+                       // window iconified/rolledup/whatever
+                       vid_hidden = true;
+                       break;
+               case FocusIn:
+                       // window is now the input focus
+                       break;
+               case FocusOut:
+                       // window is no longer the input focus
+                       break;
+               case EnterNotify:
+                       // mouse entered window
+                       break;
+               case LeaveNotify:
+                       // mouse left window
+                       break;
                }
        }
 
@@ -740,6 +781,11 @@ void VID_Init(void)
        XStoreName(vidx11_display, win, gamename);
        XMapWindow(vidx11_display, win);
 
+       // LordHavoc: making the close button on a window do the right thing
+       // seems to involve this mess, sigh...
+       wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false);
+       XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1);
+
        if (vidmode_active)
        {
                XMoveWindow(vidx11_display, win, 0, 0);
@@ -766,6 +812,8 @@ void VID_Init(void)
 
        InitSig(); // trap evil signals
 
+       vid_hidden = false;
+
        GL_Init();
 
        Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);

diff --git a/vid_shared.c b/vid_shared.c
index ec0e052c90cd96bfa799abb759181c0aa8729f23..780cdbdda6a37439664e94e186ad1a437530a455 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -12,6 +12,12 @@ int gl_combine_extension = false;
 // LordHavoc: GL_EXT_compiled_vertex_array support
 int gl_supportslockarrays = false;
 
+// LordHavoc: if window is hidden, don't update screen
+int vid_hidden = false;
+// LordHavoc: if window is not the active window, don't hog as much CPU time,
+// let go of the mouse, turn off sound, and restore system gamma ramps...
+int vid_activewindow = true;
+
 cvar_t vid_mode = {0, "vid_mode", "0"};
 cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"};
 cvar_t vid_fullscreen = {0, "vid_fullscreen", "1"};

diff --git a/vid_wgl.c b/vid_wgl.c
index 26082196f2e59e8c9778982f444dc7721d10a06a..12de0903703f94fbe565f7872ee557ef85cca23d 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.
 
@@ -62,41 +62,42 @@ 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 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);
@@ -109,14 +110,14 @@ void VID_UpdateWindowStatus (void);
 
 //====================================
 
-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;
@@ -130,8 +131,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;
 
@@ -180,15 +181,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);
 
@@ -243,9 +243,9 @@ qboolean VID_SetFullDIBMode (int modenum)
 
 int VID_SetMode (int modenum)
 {
-       int                             original_mode;
-       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");
@@ -286,8 +286,8 @@ int VID_SetMode (int modenum)
 
        while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
        {
-       TranslateMessage (&msg);
-       DispatchMessage (&msg);
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
        }
 
        Sleep (100);
@@ -313,7 +313,6 @@ VID_UpdateWindowStatus
 */
 void VID_UpdateWindowStatus (void)
 {
-
        window_rect.left = window_x;
        window_rect.top = window_y;
        window_rect.right = window_x + window_width;
@@ -342,7 +341,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();
@@ -350,27 +349,27 @@ void VID_Finish (void)
        }
 
 // handle the mouse state when windowed if that's changed
-       usemouse = false;
+       vid_usemouse = false;
        if (vid_mouse.integer && key_dest == key_game)
-               usemouse = true;
+               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();
                }
@@ -384,10 +383,10 @@ 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];
 
@@ -395,17 +394,17 @@ 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+1;
                qglDeleteTextures(8192, temp);
 
-       if (hRC)
-           wglDeleteContext(hRC);
+               if (hRC)
+                       wglDeleteContext(hRC);
 
                if (hDC && mainwindow)
                        ReleaseDC(mainwindow, hDC);
@@ -428,7 +427,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
@@ -441,28 +440,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;
 }
 
 
@@ -514,7 +513,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++)
        {
@@ -542,16 +541,16 @@ void AppActivate(BOOL fActive, BOOL minimize)
 {
        static BOOL     sound_active;
 
-       ActiveApp = fActive;
+       vid_activewindow = fActive;
        Minimized = 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;
@@ -577,11 +576,11 @@ void AppActivate(BOOL fActive, BOOL minimize)
 
        if (!fActive)
        {
-               usingmouse = false;
+               vid_usingmouse = false;
                IN_DeactivateMouse ();
                IN_ShowMouse ();
                if (modestate == MS_FULLDIB && vid_canalttab)
-               { 
+               {
                        ChangeDisplaySettings (NULL, 0);
                        vid_wassuspended = true;
                }
@@ -594,15 +593,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);
@@ -621,7 +620,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);
@@ -658,7 +657,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);
@@ -668,14 +667,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);
@@ -687,27 +686,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;
 }
 
 
@@ -721,7 +720,7 @@ int VID_NumModes (void)
        return nummodes;
 }
 
-       
+
 /*
 =================
 VID_GetModePtr
@@ -829,7 +828,7 @@ VID_DescribeMode_f
 void VID_DescribeMode_f (void)
 {
        int             t, modenum;
-       
+
        modenum = atoi (Cmd_Argv(1));
 
        t = leavecurrentmode;
@@ -898,18 +897,18 @@ 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");
 
        if (COM_CheckParm("-width"))
@@ -1062,12 +1061,12 @@ void VID_RestoreSystemGamma(void)
 VID_Init
 ===================
 */
-void   VID_Init (void)
+void VID_Init (void)
 {
-       int             i;
-       int             basenummodes, width, height = 0, bpp, findbpp, done;
-       HDC             hdc;
-       DEVMODE devmode;
+       int i;
+       int basenummodes, width, height = 0, bpp, findbpp, done;
+       HDC hdc;
+       DEVMODE devmode;
 
        memset(&devmode, 0, sizeof(devmode));
 
@@ -1247,6 +1246,8 @@ void      VID_Init (void)
 
        strcpy (badmode.modedesc, "Bad mode");
        vid_canalttab = true;
+
+       vid_hidden = false;
 }
 
 
@@ -1260,20 +1261,20 @@ 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];
 
 /*
 ================