Fixed some errors in the vid_vsync code.

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 30a08e84e0d4dda965490b3ec2af1e0aed558f73..d95526757ee2e0a18d300dd03271ef0aa14b8b8f 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -305,9 +305,20 @@ void VID_Finish (void)
 {
        HDC hdc;
        int vid_usemouse;
+       static int      old_vsync       = -1;
+
+       if (old_vsync != vid_vsync.integer)
+       {
+               old_vsync = bound(0, vid_vsync.integer, 1);
+               Cvar_SetValueQuick(&vid_vsync, old_vsync);
+               if (gl_videosyncavailable)
+                       qwglSwapIntervalEXT (old_vsync);
+       }
+
        if (r_render.integer && !scr_skipupdate)
        {
-               qglFinish();
+               if (r_speeds.integer || gl_finish.integer)
+                       qglFinish();
                hdc = GetDC(mainwindow);
                SwapBuffers(hdc);
                ReleaseDC(mainwindow, hdc);
@@ -507,6 +518,24 @@ void AppActivate(BOOL fActive, BOOL minimize)
        }
 }
 
+//TODO: move it around in vid_wgl.c since I dont think this is the right position
+void Sys_SendKeyEvents (void)
+{
+       MSG msg;
+
+       while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+       {
+       // we always update if there are any event, even if we're paused
+               scr_skipupdate = 0;
+
+               if (!GetMessage (&msg, NULL, 0, 0))
+                       Sys_Quit ();
+
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
+       }
+}
+
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* main window procedure */
@@ -821,13 +850,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
                if (i & RC_PALETTE)
                {
                        VID_Shutdown();
-                       Con_Printf ("Can't run in non-RGB mode\n");
+                       Con_Print("Can't run in non-RGB mode\n");
                        return false;
                }
                if (bpp > depth)
                {
                        VID_Shutdown();
-                       Con_Printf ("A higher desktop depth is required to run this video mode\n");
+                       Con_Print("A higher desktop depth is required to run this video mode\n");
                        return false;
                }
 
@@ -924,7 +953,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        if (!GL_CheckExtension("wgl", wglfuncs, NULL, false))
        {
                VID_Shutdown();
-               Con_Printf("wgl functions not found\n");
+               Con_Print("wgl functions not found\n");
                return false;
        }
 
@@ -932,7 +961,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        if (!baseRC)
        {
                VID_Shutdown();
-               Con_Printf("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n");
+               Con_Print("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n");
                return false;
        }
        if (!qwglMakeCurrent(hdc, baseRC))
@@ -947,7 +976,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        if (qglGetString == NULL)
        {
                VID_Shutdown();
-               Con_Printf("glGetString not found\n");
+               Con_Print("glGetString not found\n");
                return false;
        }
        gl_renderer = qglGetString(GL_RENDERER);
@@ -957,6 +986,8 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        gl_platform = "WGL";
        gl_platformextensions = "";
 
+       gl_videosyncavailable = false;
+
        if (qwglGetExtensionsStringARB)
                gl_platformextensions = qwglGetExtensionsStringARB(hdc);
 
@@ -1159,7 +1190,7 @@ qboolean IN_InitDInput (void)
 
                if (hInstDI == NULL)
                {
-                       Con_SafePrintf ("Couldn't load dinput.dll\n");
+                       Con_SafePrint("Couldn't load dinput.dll\n");
                        return false;
                }
        }
@@ -1170,7 +1201,7 @@ qboolean IN_InitDInput (void)
 
                if (!pDirectInputCreate)
                {
-                       Con_SafePrintf ("Couldn't get DI proc addr\n");
+                       Con_SafePrint("Couldn't get DI proc addr\n");
                        return false;
                }
        }
@@ -1188,7 +1219,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't open DI mouse device\n");
+               Con_SafePrint("Couldn't open DI mouse device\n");
                return false;
        }
 
@@ -1197,7 +1228,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't set DI mouse format\n");
+               Con_SafePrint("Couldn't set DI mouse format\n");
                return false;
        }
 
@@ -1207,7 +1238,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't set DI coop level\n");
+               Con_SafePrint("Couldn't set DI coop level\n");
                return false;
        }
 
@@ -1218,7 +1249,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't set DI buffersize\n");
+               Con_SafePrint("Couldn't set DI buffersize\n");
                return false;
        }
 
@@ -1244,11 +1275,11 @@ void IN_StartupMouse (void)
 
                if (dinput)
                {
-                       Con_SafePrintf ("DirectInput initialized\n");
+                       Con_SafePrint("DirectInput initialized\n");
                }
                else
                {
-                       Con_SafePrintf ("DirectInput not initialized\n");
+                       Con_SafePrint("DirectInput not initialized\n");
                }
        }
 
@@ -1333,7 +1364,7 @@ void IN_MouseMove (usercmd_t *cmd)
        {
                GetCursorPos (&current_pos);
                //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
-               in_mouse_x = in_mouse_y = 0;
+               IN_Mouse( cmd, 0, 0 );
                return;
        }
 
@@ -1506,7 +1537,7 @@ void IN_StartupJoystick (void)
        // verify joystick driver is present
        if ((numdevs = joyGetNumDevs ()) == 0)
        {
-               Con_Printf ("\njoystick not found -- driver not present\n\n");
+               Con_Print("\njoystick not found -- driver not present\n\n");
                return;
        }
 
@@ -1524,7 +1555,7 @@ void IN_StartupJoystick (void)
        // abort startup if we didn't find a valid joystick
        if (mmr != JOYERR_NOERROR)
        {
-               Con_Printf ("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
+               Con_Printf("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
                return;
        }
 
@@ -1533,7 +1564,7 @@ void IN_StartupJoystick (void)
        memset (&jc, 0, sizeof(jc));
        if ((mmr = joyGetDevCaps (joy_id, &jc, sizeof(jc))) != JOYERR_NOERROR)
        {
-               Con_Printf ("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
+               Con_Printf("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
                return;
        }
 
@@ -1550,7 +1581,7 @@ void IN_StartupJoystick (void)
        joy_avail = true;
        joy_advancedinit = false;
 
-       Con_Printf ("\njoystick detected\n\n");
+       Con_Print("\njoystick detected\n\n");
 }
 
 
@@ -1615,7 +1646,7 @@ void Joy_AdvancedUpdate_f (void)
                if (strcmp (joy_name.string, "joystick") != 0)
                {
                        // notify user of advanced controller
-                       Con_Printf ("\n%s configured\n\n", joy_name.string);
+                       Con_Printf("\n%s configured\n\n", joy_name.string);
                }
 
                // advanced initialization here
@@ -1674,13 +1705,13 @@ void IN_Commands (void)
        {
                if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
                {
-                       key_index = (i < 4) ? K_JOY1 : K_AUX1;
+                       key_index = (i < 16) ? K_JOY1 : K_AUX1;
                        Key_Event (key_index + i, 0, true);
                }
 
                if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
                {
-                       key_index = (i < 4) ? K_JOY1 : K_AUX1;
+                       key_index = (i < 16) ? K_JOY1 : K_AUX1;
                        Key_Event (key_index + i, 0, false);
                }
        }