+ if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
{
- if (r_speeds.integer || gl_finish.integer)
- qglFinish();
- qglXSwapBuffers(vidx11_display, win);
+ vid_usingvsync = vid_usevsync;
+ if (qglXSwapIntervalSGI (vid_usevsync))
+ Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n");
}
// handle the mouse state when windowed if that's changed
- usemouse = false;
- if (vid_mouse.integer && !key_consoleactive)
- usemouse = true;
- if (vidmode_active)
- usemouse = true;
- if (usemouse)
- {
- if (!usingmouse)
- {
- usingmouse = true;
- IN_ActivateMouse ();
- }
- }
- else
+ vid_usemouse = false;
+ if (vid_mouse.integer && !key_consoleactive && !cls.demoplayback)
-// COMMANDLINEOPTION: -nomouse disables mouse support (see also vid_mouse cvar)
+// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar)
if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
mouse_avail = false;
}
@@ -691,7+695,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
#else
drivername = "libGL.so.1";
#endif
-// COMMANDLINEOPTION: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1 (Linux/BSD) or opengl32.dll (windows) or /usr/X11R6/lib/libGL.1.dylib (MacOSX), if you don't know what this is for, you don't need it
+// COMMANDLINEOPTION: Linux GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it
+// COMMANDLINEOPTION: BSD GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it
+// LordHavoc: although this works on MacOSX, it's useless there (as there is only one system libGL)
i = COM_CheckParm("-gl_driver");
if (i && i < com_argc - 1)
drivername = com_argv[i + 1];
@@ -774,7+780,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)