made MapKey static since it's not used anywhere else

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index da0bee76199c84e68d868a2a7837158bd7151e2e..8f9c2dc83b063bd03bc9d2014581f2c32d5bd485 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);
@@ -367,7 +378,7 @@ MapKey
 Map from windows to quake keynums
 =======
 */
-int MapKey (int key, int virtualkey)
+static int MapKey (int key, int virtualkey)
 {
        int result;
        int modified = (key >> 16) & 255;
@@ -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 */
@@ -782,6 +811,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        }
 
        gldrivername = "opengl32.dll";
+// COMMANDLINEOPTION: Windows WGL: -gl_driver <drivername> selects a GL driver library, default is opengl32.dll, useful only for 3dfxogl.dll or 3dfxvgl.dll, if you don't know what this is for, you don't need it
        i = COM_CheckParm("-gl_driver");
        if (i && i < com_argc - 1)
                gldrivername = com_argv[i + 1];
@@ -957,10 +987,13 @@ 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);
 
-       gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, NULL, false);
+// COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control
+       gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
        ReleaseDC(mainwindow, hdc);
 
        GL_Init ();
@@ -1238,6 +1271,7 @@ void IN_StartupMouse (void)
 
        mouseinitialized = true;
 
+// COMMANDLINEOPTION: Windows Input: -dinput uses DirectInput (instead of GDI) for mouse/joystick input, may be more precise or responsive, but probably not
        if (COM_CheckParm ("-dinput"))
        {
                dinput = IN_InitDInput ();
@@ -1258,15 +1292,18 @@ void IN_StartupMouse (void)
 
                if (mouseparmsvalid)
                {
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (ignored with -dinput, windows only)
                        if ( COM_CheckParm ("-noforcemspd") )
                                newmouseparms[2] = originalmouseparms[2];
 
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (ignored with -dinput, windows only)
                        if ( COM_CheckParm ("-noforcemaccel") )
                        {
                                newmouseparms[0] = originalmouseparms[0];
                                newmouseparms[1] = originalmouseparms[1];
                        }
 
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (ignored with -dinput, windows only)
                        if ( COM_CheckParm ("-noforcemparms") )
                        {
                                newmouseparms[0] = originalmouseparms[0];
@@ -1333,7 +1370,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;
        }
 
@@ -1500,6 +1537,7 @@ void IN_StartupJoystick (void)
        joy_avail = false;
 
        // abort startup if user requests no joystick
+// COMMANDLINEOPTION: Windows Input: -nojoy disables joystick support, may be a small speed increase
        if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe"))
                return;
 
@@ -1674,13 +1712,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);
                }
        }