]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_glx.c
added vid_grabkeyboard cvar which defaults to 0, this means that the glx client no...
[xonotic/darkplaces.git] / vid_glx.c
index 6aeb59220f00dc40967e4142c61536c95383e05a..96bf36f26d51d0b2dd2a7e50a55ae22cc4212cb2 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -17,12 +17,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-//#include <termios.h>
-//#include <sys/ioctl.h>
-//#include <sys/stat.h>
-//#include <sys/vt.h>
-//#include <stdarg.h>
-//#include <stdio.h>
 #include <signal.h>
 
 #include <dlfcn.h>
@@ -35,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <X11/cursorfont.h>
 
 #include <X11/extensions/XShm.h>
-#if !defined(__APPLE__) && !defined(__MACH__)
+#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS)
 #include <X11/extensions/xf86dga.h>
 #endif
 #include <X11/extensions/xf86vmode.h>
@@ -45,6 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Tell startup code that we have a client
 int cl_available = true;
 
+// note: if we used the XRandR extension we could support refresh rates
+qboolean vid_supportrefreshrate = false;
+
 //GLX prototypes
 XVisualInfo *(GLAPIENTRY *qglXChooseVisual)(Display *dpy, int screen, int *attribList);
 GLXContext (GLAPIENTRY *qglXCreateContext)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
@@ -62,14 +59,12 @@ static dllfunction_t getprocaddressfuncs[] =
        {NULL, NULL}
 };
 
-//GLX_SGI_video_sync
-GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count);
-GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(GLint divisor, GLint remainder, GLuint *count);
+//GLX_SGI_swap_control
+GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval);
 
-static dllfunction_t videosyncfuncs[] =
+static dllfunction_t swapcontrolfuncs[] =
 {
-       {"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI},
-       {"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI},
+       {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI},
        {NULL, NULL}
 };
 
@@ -88,25 +83,27 @@ Atom wm_delete_window_atom;
                LeaveWindowMask)
 
 
-static qboolean                mouse_avail = true;
-static qboolean                mouse_active = false, usingmouse = false;
+static qboolean mouse_avail = true;
+static qboolean vid_usingmouse = false;
+static qboolean vid_usingvsync = false;
+static qboolean vid_usevsync = false;
+static qboolean vid_x11_hardwaregammasupported = false;
+static int vid_x11_gammarampsize = 0;
 static float   mouse_x, mouse_y;
 static int p_mouse_x, p_mouse_y;
 
-#ifndef __APPLE__
-cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
-cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
+#if !defined(__APPLE__) && !defined(SUNOS)
+// FIXME: vid_dga_mouseaccel is poorly named, it is actually the multiplier for mouse movement, not an acceleration (which would be a power function or something)
+cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1", "make use of DGA mouse input"};
+cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1", "speed of mouse when using DGA mouse input"};
 #endif
 
 qboolean vidmode_ext = false;
 
 static int win_x, win_y;
 
-static int scr_width, scr_height;
-
-static XF86VidModeModeInfo **vidmodes;
-static int num_vidmodes;
-static qboolean vidmode_active = false;
+static XF86VidModeModeInfo init_vidmode;
+static qboolean vid_isfullscreen = false;
 
 static Visual *vidx11_visual;
 static Colormap vidx11_colormap;
@@ -196,6 +193,7 @@ static int XLateKey(XKeyEvent *ev, char *ascii)
 
                case XK_Alt_L:
                case XK_Meta_L:
+               case XK_ISO_Level3_Shift:
                case XK_Alt_R:
                case XK_Meta_R: key = K_ALT;                    break;
 
@@ -209,8 +207,10 @@ static int XLateKey(XKeyEvent *ev, char *ascii)
                case XK_KP_Subtract: key = K_KP_MINUS; break;
                case XK_KP_Divide: key = K_KP_SLASH; break;
 
+               case XK_section:        key = '~'; break;
+
                default:
-                       if (keysym < 32 && keysym > 126)
+                       if (keysym < 32)
                                break;
 
                        if (keysym >= 'A' && keysym <= 'Z')
@@ -245,66 +245,99 @@ static Cursor CreateNullCursor(Display *display, Window root)
        return cursor;
 }
 
-static void install_grabs(void)
+static void IN_Activate (qboolean grab)
 {
-       XWindowAttributes attribs_1;
-       XSetWindowAttributes attribs_2;
+       if (!vidx11_display)
+               return;
+       if (grab)
+       {
+               if (!vid_usingmouse && mouse_avail && win)
+               {
+                       XWindowAttributes attribs_1;
+                       XSetWindowAttributes attribs_2;
 
-       XGetWindowAttributes(vidx11_display, win, &attribs_1);
-       attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK;
-       XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2);
+                       XGetWindowAttributes(vidx11_display, win, &attribs_1);
+                       attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK;
+                       XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2);
 
-// inviso cursor
-       XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win));
+               // inviso cursor
+                       XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win));
 
-       XGrabPointer(vidx11_display, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+                       XGrabPointer(vidx11_display, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
 
-#ifndef __APPLE__
-       if (vid_dga.integer)
-       {
-               int MajorVersion, MinorVersion;
+#if !defined(__APPLE__) && !defined(SUNOS)
+                       if (vid_dga.integer)
+                       {
+                               int MajorVersion, MinorVersion;
 
-               if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
-               {
-                       // unable to query, probalby not supported
-                       Con_Printf( "Failed to detect XF86DGA Mouse\n" );
-                       vid_dga.integer = 0;
-               }
-               else
-               {
-                       vid_dga.integer = 1;
-                       XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse);
-                       XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
+                               if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
+                               {
+                                       // unable to query, probably not supported
+                                       Con_Print( "Failed to detect XF86DGA Mouse\n" );
+                                       Cvar_SetValueQuick(&vid_dga, 0);
+                                       XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
+                               }
+                               else
+                               {
+                                       XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse);
+                                       XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
+                               }
+                       }
+                       else
+#endif
+                               XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
+
+                       if (vid_grabkeyboard.integer)
+                               XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+
+                       mouse_x = mouse_y = 0;
+                       cl_ignoremousemove = true;
+                       vid_usingmouse = true;
                }
        }
        else
+       {
+               if (vid_usingmouse)
+               {
+#if !defined(__APPLE__) && !defined(SUNOS)
+                       if (vid_dga.integer)
+                               XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
 #endif
-               XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
 
-       XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+                       XUngrabPointer(vidx11_display, CurrentTime);
+                       XUngrabKeyboard(vidx11_display, CurrentTime);
+
+                       // inviso cursor
+                       if (win)
+                               XUndefineCursor(vidx11_display, win);
 
-       mouse_active = true;
-       mouse_x = mouse_y = 0;
+                       cl_ignoremousemove = true;
+                       vid_usingmouse = false;
+               }
+       }
 }
 
-static void uninstall_grabs(void)
+static keynum_t buttonremap[18] =
 {
-       if (!vidx11_display || !win)
-               return;
-
-#ifndef __APPLE__
-       if (vid_dga.integer == 1)
-               XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
-#endif
-
-       XUngrabPointer(vidx11_display, CurrentTime);
-       XUngrabKeyboard(vidx11_display, CurrentTime);
-
-// inviso cursor
-       XUndefineCursor(vidx11_display, win);
-
-       mouse_active = false;
-}
+       K_MOUSE1,
+       K_MOUSE3,
+       K_MOUSE2,
+       K_MWHEELUP,
+       K_MWHEELDOWN,
+       K_MOUSE4,
+       K_MOUSE5,
+       K_MOUSE6,
+       K_MOUSE7,
+       K_MOUSE8,
+       K_MOUSE9,
+       K_MOUSE10,
+       K_MOUSE11,
+       K_MOUSE12,
+       K_MOUSE13,
+       K_MOUSE14,
+       K_MOUSE15,
+       K_MOUSE16,
+};
 
 static void HandleEvents(void)
 {
@@ -336,9 +369,9 @@ static void HandleEvents(void)
 
                case MotionNotify:
                        // mouse moved
-                       if (usingmouse)
+                       if (vid_usingmouse)
                        {
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
                                if (vid_dga.integer == 1)
                                {
                                        mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value;
@@ -352,7 +385,7 @@ static void HandleEvents(void)
                                        {
                                                mouse_x += event.xmotion.x - p_mouse_x;
                                                mouse_y += event.xmotion.y - p_mouse_y;
-                                               if (abs(scr_width/2 - event.xmotion.x) > scr_width / 4 || abs(scr_height/2 - event.xmotion.y) > scr_height / 4)
+                                               if (abs(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4)
                                                        dowarp = true;
                                        }
                                        p_mouse_x = event.xmotion.x;
@@ -365,94 +398,18 @@ static void HandleEvents(void)
 
                case ButtonPress:
                        // mouse button pressed
-                       switch(event.xbutton.button)
-                       {
-                       case 1:
-                               Key_Event(K_MOUSE1, 0, true);
-                               break;
-                       case 2:
-                               Key_Event(K_MOUSE3, 0, true);
-                               break;
-                       case 3:
-                               Key_Event(K_MOUSE2, 0, true);
-                               break;
-                       case 4:
-                               Key_Event(K_MWHEELUP, 0, true);
-                               break;
-                       case 5:
-                               Key_Event(K_MWHEELDOWN, 0, true);
-                               break;
-                       case 6:
-                               Key_Event(K_MOUSE4, 0, true);
-                               break;
-                       case 7:
-                               Key_Event(K_MOUSE5, 0, true);
-                               break;
-                       case 8:
-                               Key_Event(K_MOUSE6, 0, true);
-                               break;
-                       case 9:
-                               Key_Event(K_MOUSE7, 0, true);
-                               break;
-                       case 10:
-                               Key_Event(K_MOUSE8, 0, true);
-                               break;
-                       case 11:
-                               Key_Event(K_MOUSE9, 0, true);
-                               break;
-                       case 12:
-                               Key_Event(K_MOUSE10, 0, true);
-                               break;
-                       default:
-                               Con_Printf("HandleEvents: ButtonPress gave value %d, 1-12 expected\n", event.xbutton.button);
-                               break;
-                       }
+                       if (event.xbutton.button <= 18)
+                               Key_Event(buttonremap[event.xbutton.button - 1], 0, true);
+                       else
+                               Con_Printf("HandleEvents: ButtonPress gave value %d, 1-18 expected\n", event.xbutton.button);
                        break;
 
                case ButtonRelease:
                        // mouse button released
-                       switch(event.xbutton.button)
-                       {
-                       case 1:
-                               Key_Event(K_MOUSE1, 0, false);
-                               break;
-                       case 2:
-                               Key_Event(K_MOUSE3, 0, false);
-                               break;
-                       case 3:
-                               Key_Event(K_MOUSE2, 0, false);
-                               break;
-                       case 4:
-                               Key_Event(K_MWHEELUP, 0, false);
-                               break;
-                       case 5:
-                               Key_Event(K_MWHEELDOWN, 0, false);
-                               break;
-                       case 6:
-                               Key_Event(K_MOUSE4, 0, false);
-                               break;
-                       case 7:
-                               Key_Event(K_MOUSE5, 0, false);
-                               break;
-                       case 8:
-                               Key_Event(K_MOUSE6, 0, false);
-                               break;
-                       case 9:
-                               Key_Event(K_MOUSE7, 0, false);
-                               break;
-                       case 10:
-                               Key_Event(K_MOUSE8, 0, false);
-                               break;
-                       case 11:
-                               Key_Event(K_MOUSE9, 0, false);
-                               break;
-                       case 12:
-                               Key_Event(K_MOUSE10, 0, false);
-                               break;
-                       default:
-                               Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-12 expected\n", event.xbutton.button);
-                               break;
-                       }
+                       if (event.xbutton.button <= 18)
+                               Key_Event(buttonremap[event.xbutton.button - 1], 0, false);
+                       else
+                               Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-18 expected\n", event.xbutton.button);
                        break;
 
                case CreateNotify:
@@ -478,13 +435,11 @@ static void HandleEvents(void)
                case MapNotify:
                        // window restored
                        vid_hidden = false;
-                       vid_activewindow = false;
                        VID_RestoreSystemGamma();
                        break;
                case UnmapNotify:
                        // window iconified/rolledup/whatever
                        vid_hidden = true;
-                       vid_activewindow = false;
                        VID_RestoreSystemGamma();
                        break;
                case FocusIn:
@@ -508,36 +463,47 @@ static void HandleEvents(void)
        if (dowarp)
        {
                /* move the mouse to the window center again */
-               p_mouse_x = scr_width / 2;
-               p_mouse_y = scr_height / 2;
+               p_mouse_x = vid.width / 2;
+               p_mouse_y = vid.height / 2;
                XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
        }
-
 }
 
-static void IN_DeactivateMouse( void )
+static void *prjobj = NULL;
+
+static void GL_CloseLibrary(void)
 {
-       if (!mouse_avail || !vidx11_display || !win)
-               return;
+       if (prjobj)
+               dlclose(prjobj);
+       prjobj = NULL;
+       gl_driver[0] = 0;
+       qglXGetProcAddressARB = NULL;
+       gl_extensions = "";
+       gl_platform = "";
+       gl_platformextensions = "";
+}
 
-       if (mouse_active)
+static int GL_OpenLibrary(const char *name)
+{
+       Con_Printf("Loading OpenGL driver %s\n", name);
+       GL_CloseLibrary();
+       if (!(prjobj = dlopen(name, RTLD_LAZY)))
        {
-               uninstall_grabs();
-               mouse_active = false;
+               Con_Printf("Unable to open symbol list for %s\n", name);
+               return false;
        }
+       strlcpy(gl_driver, name, sizeof(gl_driver));
+       return true;
 }
 
-static void IN_ActivateMouse( void )
+void *GL_GetProcAddress(const char *name)
 {
-       if (!mouse_avail || !vidx11_display || !win)
-               return;
-
-       if (!mouse_active)
-       {
-               mouse_x = mouse_y = 0; // don't spazz
-               install_grabs();
-               mouse_active = true;
-       }
+       void *p = NULL;
+       if (qglXGetProcAddressARB != NULL)
+               p = (void *) qglXGetProcAddressARB((GLubyte *)name);
+       if (p == NULL)
+               p = (void *) dlsym(prjobj, name);
+       return p;
 }
 
 void VID_Shutdown(void)
@@ -545,21 +511,20 @@ void VID_Shutdown(void)
        if (!ctx || !vidx11_display)
                return;
 
-       vid_hidden = true;
-       usingmouse = false;
        if (vidx11_display)
        {
+               IN_Activate(false);
                VID_RestoreSystemGamma();
-               uninstall_grabs();
 
                // FIXME: glXDestroyContext here?
-               if (vidmode_active)
-                       XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]);
+               if (vid_isfullscreen)
+                       XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
                if (win)
                        XDestroyWindow(vidx11_display, win);
                XCloseDisplay(vidx11_display);
        }
-       vidmode_active = false;
+       vid_hidden = true;
+       vid_isfullscreen = false;
        vidx11_display = NULL;
        win = 0;
        ctx = NULL;
@@ -570,7 +535,7 @@ void VID_Shutdown(void)
 
 void signal_handler(int sig)
 {
-       printf("Received signal %d, exiting...\n", sig);
+       Con_Printf("Received signal %d, exiting...\n", sig);
        VID_RestoreSystemGamma();
        Sys_Quit();
        exit(0);
@@ -590,73 +555,65 @@ void InitSig(void)
        signal(SIGTERM, signal_handler);
 }
 
-/*
-=================
-VID_GetWindowSize
-=================
-*/
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
+void VID_Finish (qboolean allowmousegrab)
 {
-       *x = *y = 0;
-       *width = scr_width;
-       *height = scr_height;
-}
+       qboolean vid_usemouse;
 
-void VID_Finish (void)
-{
-       int usemouse;
-       if (r_render.integer)
+       vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
+       if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
        {
-               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
+       // handle the mouse state when windowed if that's changed
+       vid_usemouse = false;
+       if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback))
+               vid_usemouse = true;
+       if (!vid_activewindow)
+               vid_usemouse = false;
+       if (vid_isfullscreen)
+               vid_usemouse = true;
+       IN_Activate(vid_usemouse);
+
+       if (r_render.integer)
        {
-               if (usingmouse)
+               CHECKGLERROR
+               if (r_speeds.integer || gl_finish.integer)
                {
-                       usingmouse = false;
-                       IN_DeactivateMouse ();
+                       qglFinish();CHECKGLERROR
                }
+               qglXSwapBuffers(vidx11_display, win);CHECKGLERROR
        }
+
+       if (vid_x11_hardwaregammasupported)
+               VID_UpdateGamma(false, vid_x11_gammarampsize);
 }
 
-int VID_SetGamma(unsigned short *ramps)
+int VID_SetGamma(unsigned short *ramps, int rampsize)
 {
-       return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
+       return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-int VID_GetGamma(unsigned short *ramps)
+int VID_GetGamma(unsigned short *ramps, int rampsize)
 {
-       return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
+       return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
 void VID_Init(void)
 {
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
        Cvar_RegisterVariable (&vid_dga);
        Cvar_RegisterVariable (&vid_dga_mouseaccel);
 #endif
        InitSig(); // trap evil signals
+// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar)
        if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
                mouse_avail = false;
 }
 
-void VID_BuildGLXAttrib(int *attrib, int stencil)
+void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer)
 {
        *attrib++ = GLX_RGBA;
        *attrib++ = GLX_RED_SIZE;*attrib++ = 1;
@@ -670,10 +627,12 @@ void VID_BuildGLXAttrib(int *attrib, int stencil)
                *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8;
                *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1;
        }
+       if (stereobuffer)
+               *attrib++ = GLX_STEREO;
        *attrib++ = None;
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp)
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
 {
        int i;
        int attrib[32];
@@ -689,6 +648,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 #else
        drivername = "libGL.so.1";
 #endif
+// 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];
@@ -700,7 +662,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
        if (!(vidx11_display = XOpenDisplay(NULL)))
        {
-               Con_Printf("Couldn't open the X display\n");
+               Con_Print("Couldn't open the X display\n");
                return false;
        }
 
@@ -717,21 +679,22 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
                vidmode_ext = true;
        }
 
-       if ((qglXChooseVisual = GL_GetProcAddress("glXChooseVisual")) == NULL
-        || (qglXCreateContext = GL_GetProcAddress("glXCreateContext")) == NULL
-        || (qglXMakeCurrent = GL_GetProcAddress("glXMakeCurrent")) == NULL
-        || (qglXSwapBuffers = GL_GetProcAddress("glXSwapBuffers")) == NULL
-        || (qglXQueryExtensionsString = GL_GetProcAddress("glXQueryExtensionsString")) == NULL)
+       if ((qglXChooseVisual = (XVisualInfo *(GLAPIENTRY *)(Display *dpy, int screen, int *attribList))GL_GetProcAddress("glXChooseVisual")) == NULL
+        || (qglXCreateContext = (GLXContext (GLAPIENTRY *)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct))GL_GetProcAddress("glXCreateContext")) == NULL
+        || (qglXDestroyContext = (void (GLAPIENTRY *)(Display *dpy, GLXContext ctx))GL_GetProcAddress("glXDestroyContext")) == NULL
+        || (qglXMakeCurrent = (Bool (GLAPIENTRY *)(Display *dpy, GLXDrawable drawable, GLXContext ctx))GL_GetProcAddress("glXMakeCurrent")) == NULL
+        || (qglXSwapBuffers = (void (GLAPIENTRY *)(Display *dpy, GLXDrawable drawable))GL_GetProcAddress("glXSwapBuffers")) == NULL
+        || (qglXQueryExtensionsString = (const char *(GLAPIENTRY *)(Display *dpy, int screen))GL_GetProcAddress("glXQueryExtensionsString")) == NULL)
        {
                Con_Printf("glX functions not found in %s\n", gl_driver);
                return false;
        }
 
-       VID_BuildGLXAttrib(attrib, bpp == 32);
+       VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer);
        visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
        if (!visinfo)
        {
-               Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
+               Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n");
                return false;
        }
 
@@ -742,6 +705,14 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
                // Are we going fullscreen?  If so, let's change video mode
                if (fullscreen)
                {
+                       XF86VidModeModeLine *current_vidmode;
+                       XF86VidModeModeInfo **vidmodes;
+                       int num_vidmodes;
+
+                       // This nice hack comes from the SDL source code
+                       current_vidmode = (XF86VidModeModeLine*)((char*)&init_vidmode + sizeof(init_vidmode.dotclock));
+                       XF86VidModeGetModeLine(vidx11_display, vidx11_screen, (int*)&init_vidmode.dotclock, current_vidmode);
+
                        XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes);
                        best_dist = 9999999;
                        best_fit = -1;
@@ -771,13 +742,15 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
                                // change to the mode
                                XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
-                               vidmode_active = true;
+                               vid_isfullscreen = true;
 
                                // Move the viewport to top left
                                XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
                        }
                        else
                                fullscreen = 0;
+
+                       free(vidmodes);
                }
        }
 
@@ -790,7 +763,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        // LordHavoc: save the colormap for later, too
        vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone);
        attr.event_mask = X_MASK;
-       if (vidmode_active)
+       if (vid_isfullscreen)
        {
                mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
                attr.override_redirect = True;
@@ -809,7 +782,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false);
        XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1);
 
-       if (vidmode_active)
+       if (vid_isfullscreen)
        {
                XMoveWindow(vidx11_display, win, 0, 0);
                XRaiseWindow(vidx11_display, win);
@@ -823,92 +796,78 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
        ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
        if (!ctx)
-               Sys_Error ("glXCreateContext failed\n");
+       {
+               Con_Printf ("glXCreateContext failed\n");
+               return false;
+       }
 
        if (!qglXMakeCurrent(vidx11_display, win, ctx))
-               Sys_Error ("glXMakeCurrent failed\n");
+       {
+               Con_Printf ("glXMakeCurrent failed\n");
+               return false;
+       }
 
        XSync(vidx11_display, False);
 
-       scr_width = width;
-       scr_height = height;
-
-       if ((qglGetString = GL_GetProcAddress("glGetString")) == NULL)
-               Sys_Error("glGetString not found in %s", gl_driver);
+       if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
+       {
+               Con_Printf ("glGetString not found in %s\n", gl_driver);
+               return false;
+       }
 
-       gl_renderer = qglGetString(GL_RENDERER);
-       gl_vendor = qglGetString(GL_VENDOR);
-       gl_version = qglGetString(GL_VERSION);
-       gl_extensions = qglGetString(GL_EXTENSIONS);
+       gl_renderer = (const char *)qglGetString(GL_RENDERER);
+       gl_vendor = (const char *)qglGetString(GL_VENDOR);
+       gl_version = (const char *)qglGetString(GL_VERSION);
+       gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
        gl_platform = "GLX";
        gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen);
 
+       gl_videosyncavailable = false;
+
+// COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
+// COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
+// COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
        GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false);
-       gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false);
+// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control
+// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control
+// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control
+       gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
 
-       usingmouse = false;
+       vid_usingmouse = false;
+       vid_usingvsync = false;
        vid_hidden = false;
        vid_activewindow = true;
+       vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0;
        GL_Init();
        return true;
 }
 
 void Sys_SendKeyEvents(void)
 {
-       HandleEvents();
-}
+       static qboolean sound_active = true;
 
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-       if (mouse_avail)
-               IN_Mouse(cmd, mouse_x, mouse_y);
-       mouse_x = 0;
-       mouse_y = 0;
-}
-
-static void *prjobj = NULL;
-
-int GL_OpenLibrary(const char *name)
-{
-       Con_Printf("Loading OpenGL driver %s\n", name);
-       GL_CloseLibrary();
-       if (!(prjobj = dlopen(name, RTLD_LAZY)))
+       // enable/disable sound on focus gain/loss
+       if (!vid_activewindow && sound_active)
        {
-               Con_Printf("Unable to open symbol list for %s\n", name);
-               return false;
+               S_BlockSound ();
+               sound_active = false;
+       }
+       else if (vid_activewindow && !sound_active)
+       {
+               S_UnblockSound ();
+               sound_active = true;
        }
-       strcpy(gl_driver, name);
-       return true;
-}
 
-void GL_CloseLibrary(void)
-{
-       if (prjobj)
-               dlclose(prjobj);
-       prjobj = NULL;
-       gl_driver[0] = 0;
-       qglXGetProcAddressARB = NULL;
-       gl_extensions = "";
-       gl_platform = "";
-       gl_platformextensions = "";
+       HandleEvents();
 }
 
-void *GL_GetProcAddress(const char *name)
+void IN_Move (void)
 {
-       void *p = NULL;
-       if (qglXGetProcAddressARB != NULL)
-               p = (void *) qglXGetProcAddressARB(name);
-       if (p == NULL)
-               p = (void *) dlsym(prjobj, name);
-       return p;
+       if (mouse_avail)
+       {
+               in_mouse_x = mouse_x;
+               in_mouse_y = mouse_y;
+       }
+       mouse_x = 0;
+       mouse_y = 0;
 }
-