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 da0bee76199c84e68d868a2a7837158bd7151e2e..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 */
@@ -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);
 
@@ -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;
        }
 
@@ -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);
                }
        }