now entirely dynamic OpenGL binding
[xonotic/darkplaces.git] / vid_glx.c
index a1a898f..07104c1 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -17,18 +17,18 @@ 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 <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>
-
-#include "quakedef.h"
+//#include <dlfcn.h>
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <GL/glx.h>
 
 #include <X11/keysym.h>
@@ -38,11 +38,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <X11/extensions/xf86dga.h>
 #include <X11/extensions/xf86vmode.h>
 
-static Display *dpy = NULL;
+#include "quakedef.h"
+
+XVisualInfo *(GLAPIENTRY *qglXChooseVisual)(Display *dpy, int screen, int *attribList);
+GLXContext (GLAPIENTRY *qglXCreateContext)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
+void (GLAPIENTRY *qglXDestroyContext)(Display *dpy, GLXContext ctx);
+Bool (GLAPIENTRY *qglXMakeCurrent)(Display *dpy, GLXDrawable drawable, GLXContext ctx);
+void (GLAPIENTRY *qglXSwapBuffers)(Display *dpy, GLXDrawable drawable);
+
+
+static Display *vidx11_display = NULL;
 static int scrnum;
 static Window win;
 static GLXContext ctx = NULL;
 
+Atom wm_delete_window_atom;
+
 #define KEY_MASK (KeyPressMask | KeyReleaseMask)
 #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
                    PointerMotionMask | ButtonMotionMask )
@@ -53,14 +64,11 @@ viddef_t    vid;                            // global video state
 
 static qboolean                mouse_avail = true;
 static qboolean                mouse_active = false, usingmouse = false;
-// static qboolean             dga_active;
 static float   mouse_x, mouse_y;
-static float   old_mouse_x, old_mouse_y;
 static int p_mouse_x, p_mouse_y;
 
-cvar_t vid_dga = {"vid_dga", "1", true};
-cvar_t vid_dga_mouseaccel = {"vid_dga_mouseaccel", "1", false};
-cvar_t m_filter = {"m_filter", "0"};
+cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
+cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
 
 qboolean vidmode_ext = false;
 
@@ -69,24 +77,17 @@ static int win_x, win_y;
 static int scr_width, scr_height;
 
 static XF86VidModeModeInfo **vidmodes;
-//static int default_dotclock_vidmode;
 static int num_vidmodes;
 static qboolean vidmode_active = false;
 
-/*-----------------------------------------------------------------------*/
-
-float          gldepthmin, gldepthmax;
-
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
+static Visual *vidx11_visual;
+static Colormap vidx11_colormap;
 
 /*-----------------------------------------------------------------------*/
+
 static int
-XLateKey(XKeyEvent *ev/*, qboolean modified*/)
+XLateKey(XKeyEvent *ev)
 {
-//     char tmp[2];
        int key = 0;
        KeySym keysym;
 
@@ -180,7 +181,7 @@ XLateKey(XKeyEvent *ev/*, qboolean modified*/)
                        {
                                /* ASCII keys */
                                key = keysym;
-                               if (/*!modified && */((key >= 'A') && (key <= 'Z')))
+                               if ((key >= 'A') && (key <= 'Z'))
                                        key = key + ('a' - 'A');
                        }
                        break;
@@ -197,7 +198,7 @@ static Cursor CreateNullCursor(Display *display, Window root)
        XColor dummycolour;
        Cursor cursor;
 
-       cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
+       cursormask = XCreatePixmap(display, root, 1, 1, 1);
        xgc.function = GXclear;
        gc =  XCreateGC(display, cursormask, GCFunction, &xgc);
        XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
@@ -215,56 +216,54 @@ static void install_grabs(void)
        XWindowAttributes attribs_1;
        XSetWindowAttributes attribs_2;
 
-       XGetWindowAttributes(dpy, win, &attribs_1);
+       XGetWindowAttributes(vidx11_display, win, &attribs_1);
        attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK;
-       XChangeWindowAttributes(dpy, win, CWEventMask, &attribs_2);
+       XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2);
 
 // inviso cursor
-       XDefineCursor(dpy, win, CreateNullCursor(dpy, win));
+       XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win));
 
-       XGrabPointer(dpy, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+       XGrabPointer(vidx11_display, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
 
-       if (vid_dga.value)
+       if (vid_dga.integer)
        {
                int MajorVersion, MinorVersion;
 
-               if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion))
+               if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
                {
                        // unable to query, probalby not supported
                        Con_Printf( "Failed to detect XF86DGA Mouse\n" );
-                       vid_dga.value = 0;
+                       vid_dga.integer = 0;
                }
                else
                {
-                       vid_dga.value = 1;
-                       XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse);
-                       XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
+                       vid_dga.integer = 1;
+                       XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse);
+                       XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
                }
        }
        else
-               XWarpPointer(dpy, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
+               XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
 
-       XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+       XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
 
        mouse_active = true;
        mouse_x = mouse_y = 0;
-
-//     XSync(dpy, True);
 }
 
 static void uninstall_grabs(void)
 {
-       if (!dpy || !win)
+       if (!vidx11_display || !win)
                return;
 
-       if (vid_dga.value == 1)
-               XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0);
+       if (vid_dga.integer == 1)
+               XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
 
-       XUngrabPointer(dpy, CurrentTime);
-       XUngrabKeyboard(dpy, CurrentTime);
+       XUngrabPointer(vidx11_display, CurrentTime);
+       XUngrabKeyboard(vidx11_display, CurrentTime);
 
 // inviso cursor
-       XUndefineCursor(dpy, win);
+       XUndefineCursor(vidx11_display, win);
 
        mouse_active = false;
 }
@@ -272,64 +271,56 @@ static void uninstall_grabs(void)
 static void HandleEvents(void)
 {
        XEvent event;
-//     KeySym ks;
        qboolean dowarp = false;
 
-       if (!dpy)
+       if (!vidx11_display)
                return;
 
-       while (XPending(dpy))
+       while (XPending(vidx11_display))
        {
-               XNextEvent(dpy, &event);
+               XNextEvent(vidx11_display, &event);
 
                switch (event.type)
                {
                case KeyPress:
+                       // key pressed
+                       Key_Event(XLateKey(&event.xkey), true);
+                       break;
+
                case KeyRelease:
-                       Key_Event(XLateKey(&event.xkey), event.type == KeyPress);
+                       // key released
+                       Key_Event(XLateKey(&event.xkey), false);
                        break;
 
                case MotionNotify:
+                       // mouse moved
                        if (usingmouse)
                        {
-                               if (vid_dga.value == 1)
+                               if (vid_dga.integer == 1)
                                {
                                        mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value;
                                        mouse_y += event.xmotion.y_root * vid_dga_mouseaccel.value;
                                }
                                else
                                {
-                                       /*
-                                       if (!p_mouse_x && !p_mouse_y)
-                                       {
-                                               Con_Printf("event->xmotion.x: %d\n", event.xmotion.x);
-                                               Con_Printf("event->xmotion.y: %d\n", event.xmotion.y);
-                                       }
-                                       */
-                                       //if (usingmouse)
-                                       {
-                                               if (!event.xmotion.send_event)
-                                               {
-                                                       mouse_x += (event.xmotion.x - p_mouse_x);
-                                                       mouse_y += (event.xmotion.y - p_mouse_y);
-                                                       if (abs(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4)
-                                                               dowarp = true;
-                                               }
-                                       }
-                                       /*
-                                       else
+
+                                       if (!event.xmotion.send_event)
                                        {
-                                               mouse_x += (event.xmotion.x - p_mouse_x);
-                                               mouse_y += (event.xmotion.y - p_mouse_y);
+                                               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)
+                                                       dowarp = true;
                                        }
-                                       */
                                        p_mouse_x = event.xmotion.x;
                                        p_mouse_y = event.xmotion.y;
                                }
                        }
+                       else
+                               ui_mouseupdate(event.xmotion.x, event.xmotion.y);
                        break;
 
                case ButtonPress:
+                       // mouse button pressed
                        switch(event.xbutton.button)
                        {
                        case 1:
@@ -354,6 +345,7 @@ static void HandleEvents(void)
                        break;
 
                case ButtonRelease:
+                       // mouse button released
                        switch(event.xbutton.button)
                        {
                        case 1:
@@ -377,31 +369,62 @@ static void HandleEvents(void)
                        }
                        break;
 
-               case CreateNotify :
+               case CreateNotify:
+                       // window created
                        win_x = event.xcreatewindow.x;
                        win_y = event.xcreatewindow.y;
                        break;
 
-               case ConfigureNotify :
+               case ConfigureNotify:
+                       // window changed size/location
                        win_x = event.xconfigure.x;
                        win_y = event.xconfigure.y;
                        break;
+               case DestroyNotify:
+                       // window has been destroyed
+                       Sys_Quit();
+                       break;
+               case ClientMessage:
+                       // window manager messages
+                       if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom))
+                               Sys_Quit();
+                       break;
+               case MapNotify:
+                       // window restored
+                       vid_hidden = false;
+                       break;
+               case UnmapNotify:
+                       // window iconified/rolledup/whatever
+                       vid_hidden = true;
+                       break;
+               case FocusIn:
+                       // window is now the input focus
+                       break;
+               case FocusOut:
+                       // window is no longer the input focus
+                       break;
+               case EnterNotify:
+                       // mouse entered window
+                       break;
+               case LeaveNotify:
+                       // mouse left window
+                       break;
                }
        }
 
        if (dowarp)
        {
                /* move the mouse to the window center again */
-               p_mouse_x = vid.width / 2;
-               p_mouse_y = vid.height / 2;
-               XWarpPointer(dpy, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
+               p_mouse_x = scr_width / 2;
+               p_mouse_y = scr_height / 2;
+               XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
        }
 
 }
 
 static void IN_DeactivateMouse( void )
 {
-       if (!mouse_avail || !dpy || !win)
+       if (!mouse_avail || !vidx11_display || !win)
                return;
 
        if (mouse_active)
@@ -413,7 +436,7 @@ static void IN_DeactivateMouse( void )
 
 static void IN_ActivateMouse( void )
 {
-       if (!mouse_avail || !dpy || !win)
+       if (!mouse_avail || !vidx11_display || !win)
                return;
 
        if (!mouse_active)
@@ -427,27 +450,25 @@ static void IN_ActivateMouse( void )
 
 void VID_Shutdown(void)
 {
-       if (!ctx || !dpy)
+       if (!ctx || !vidx11_display)
                return;
 
-       if (dpy)
+       if (vidx11_display)
        {
                uninstall_grabs();
 
                if (vidmode_active)
-                       XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[0]);
-/* Disabled, causes a segfault during shutdown.
-               if (ctx)
-                       glXDestroyContext(dpy, ctx);
-*/
+                       XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]);
                if (win)
-                       XDestroyWindow(dpy, win);
-               XCloseDisplay(dpy);
+                       XDestroyWindow(vidx11_display, win);
+               XCloseDisplay(vidx11_display);
        }
        vidmode_active = false;
-       dpy = NULL;
+       vidx11_display = NULL;
        win = 0;
        ctx = NULL;
+
+       GL_CloseLibrary();
 }
 
 void signal_handler(int sig)
@@ -471,97 +492,30 @@ void InitSig(void)
        signal(SIGTERM, signal_handler);
 }
 
-void VID_CheckMultitexture(void)
-{
-       void *prjobj;
-       qglMTexCoord2f = NULL;
-       qglSelectTexture = NULL;
-       // Check to see if multitexture is disabled
-       if (COM_CheckParm("-nomtex"))
-       {
-               Con_Printf("...multitexture disabled\n");
-               return;
-       }
-       if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL)
-       {
-               Con_Printf("Unable to open symbol list for main program.\n");
-               return;
-       }
-       // Test for ARB_multitexture
-       if (!COM_CheckParm("-SGISmtex") && strstr(gl_extensions, "GL_ARB_multitexture "))
-       {
-               Con_Printf("...using GL_ARB_multitexture\n");
-               qglMTexCoord2f = (void *) dlsym(prjobj, "glMultiTexCoord2fARB");
-               qglSelectTexture = (void *) dlsym(prjobj, "glActiveTextureARB");
-               gl_mtexable = true;
-               gl_mtex_enum = GL_TEXTURE0_ARB;
-       }
-       else if (strstr(gl_extensions, "GL_SGIS_multitexture ")) // Test for SGIS_multitexture (if ARB_multitexture not found)
-       {
-               Con_Printf("...using GL_SGIS_multitexture\n");
-               qglMTexCoord2f = (void *) dlsym(prjobj, "glMTexCoord2fSGIS");
-               qglSelectTexture = (void *) dlsym(prjobj, "glSelectTextureSGIS");
-               gl_mtexable = true;
-               gl_mtex_enum = TEXTURE0_SGIS;
-       }
-       else
-               Con_Printf("...multitexture disabled (not detected)\n");
-       dlclose(prjobj);
-}
-
-void VID_CheckCVA(void)
-{
-       void *prjobj;
-       qglLockArraysEXT = NULL;
-       qglUnlockArraysEXT = NULL;
-       gl_supportslockarrays = false;
-       if (COM_CheckParm("-nocva"))
-       {
-               Con_Printf("...compiled vertex arrays disabled\n");
-               return;
-       }
-       if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL)
-       {
-               Con_Printf("Unable to open symbol list for main program.\n");
-               return;
-       }
-       if (strstr(gl_extensions, "GL_EXT_compiled_vertex_array"))
-       {
-               Con_Printf("...using compiled vertex arrays\n");
-               qglLockArraysEXT = (void *) dlsym(prjobj, "glLockArraysEXT");
-               qglUnlockArraysEXT = (void *) dlsym(prjobj, "glUnlockArraysEXT");
-               gl_supportslockarrays = true;
-       }
-       dlclose(prjobj);
-}
-
 /*
 =================
-GL_BeginRendering
-
+VID_GetWindowSize
 =================
 */
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
+void VID_GetWindowSize (int *x, int *y, int *width, int *height)
 {
        *x = *y = 0;
        *width = scr_width;
        *height = scr_height;
-
-//     glViewport (*x, *y, *width, *height);
 }
 
-
-void GL_EndRendering (void)
+void VID_Finish (void)
 {
        int usemouse;
-       if (!r_render.value)
-               return;
-       glFlush();
-       glXSwapBuffers(dpy, win);
+       if (r_render.integer)
+       {
+               qglFinish();
+               qglXSwapBuffers(vidx11_display, win);
+       }
 
 // handle the mouse state when windowed if that's changed
        usemouse = false;
-       if (vid_mouse.value && key_dest == key_game)
+       if (vid_mouse.integer && key_dest == key_game)
                usemouse = true;
        if (vidmode_active)
                usemouse = true;
@@ -583,15 +537,100 @@ void GL_EndRendering (void)
        }
 }
 
+// LordHavoc: ported from SDL 1.2.2, this was far more difficult to port from
+// SDL than to simply use the XFree gamma ramp extension, but that affects the
+// whole screen even when the game window is inactive, this only affects the
+// screen while the window is active, very desirable behavior :)
 int VID_SetGamma(float prescale, float gamma, float scale, float base)
 {
+// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
+#if 1
        return FALSE;
+#else
+       int i, ncolors, c;
+       unsigned int Rmask, Gmask, Bmask, Rloss, Gloss, Bloss, Rshift, Gshift, Bshift, mask;
+       XColor xcmap[256];
+       unsigned short ramp[256];
+
+       if (COM_CheckParm("-nogamma"))
+               return FALSE;
+
+       if (vidx11_visual->class != DirectColor)
+       {
+               Con_Printf("X11 Visual class is %d, can only do gamma on %d\n", vidx11_visual->class, DirectColor);
+               return FALSE;
+       }
+
+       Rmask = vidx11_visual->red_mask;
+       Gmask = vidx11_visual->green_mask;
+       Bmask = vidx11_visual->blue_mask;
+
+       Rshift = 0;
+       Rloss = 8;
+       if ((mask = Rmask))
+       {
+               for (;!(mask & 1);mask >>= 1)
+                       ++Rshift;
+               for (;(mask & 1);mask >>= 1)
+                       --Rloss;
+       }
+       Gshift = 0;
+       Gloss = 8;
+       if ((mask = Gmask))
+       {
+               for (;!(mask & 1);mask >>= 1)
+                       ++Gshift;
+               for (;(mask & 1);mask >>= 1)
+                       --Gloss;
+       }
+       Bshift = 0;
+       Bloss = 8;
+       if ((mask = Bmask))
+       {
+               for (;!(mask & 1);mask >>= 1)
+                       ++Bshift;
+               for (;(mask & 1);mask >>= 1)
+                       --Bloss;
+       }
+
+       BuildGammaTable16(prescale, gamma, scale, base, ramp);
+
+       // convert gamma ramp to palette (yes this seems odd)
+       ncolors = vidx11_visual->map_entries;
+       for (i = 0;i < ncolors;i++)
+       {
+               c = (256 * i / ncolors);
+               xcmap[i].pixel = ((c >> Rloss) << Rshift) | ((c >> Gloss) << Gshift) | ((c >> Bloss) << Bshift);
+               xcmap[i].red   = ramp[c];
+               xcmap[i].green = ramp[c];
+               xcmap[i].blue  = ramp[c];
+               xcmap[i].flags = (DoRed|DoGreen|DoBlue);
+       }
+       XStoreColors(vidx11_display, vidx11_colormap, xcmap, ncolors);
+       XSync(vidx11_display, false);
+       // FIXME: should this check for BadAccess/BadColor/BadValue errors produced by XStoreColors before setting this true?
+       return TRUE;
+#endif
 }
 
 void VID_Init(void)
 {
        int i;
-       int attrib[] =
+// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
+#if 0
+       int gammaattrib[] =
+       {
+               GLX_RGBA,
+               GLX_RED_SIZE, 1,
+               GLX_GREEN_SIZE, 1,
+               GLX_BLUE_SIZE, 1,
+               GLX_DOUBLEBUFFER,
+               GLX_DEPTH_SIZE, 1,
+               GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR,
+               None
+       };
+#endif
+       int nogammaattrib[] =
        {
                GLX_RGBA,
                GLX_RED_SIZE, 1,
@@ -601,7 +640,6 @@ void VID_Init(void)
                GLX_DEPTH_SIZE, 1,
                None
        };
-//     char    gldir[MAX_OSPATH];
        int width = 640, height = 480;
        XSetWindowAttributes attr;
        unsigned long mask;
@@ -609,12 +647,11 @@ void VID_Init(void)
        XVisualInfo *visinfo;
        qboolean fullscreen = true;
        int MajorVersion, MinorVersion;
-       int actualWidth, actualHeight;
 
-       Cvar_RegisterVariable (&vid_mouse);
+       GL_OpenLibrary();
+
        Cvar_RegisterVariable (&vid_dga);
        Cvar_RegisterVariable (&vid_dga_mouseaccel);
-       Cvar_RegisterVariable (&m_filter);
 
 // interpret command-line params
 
@@ -646,18 +683,18 @@ void VID_Init(void)
        if (vid.conheight < 200)
                vid.conheight = 200;
 
-       if (!(dpy = XOpenDisplay(NULL)))
+       if (!(vidx11_display = XOpenDisplay(NULL)))
        {
                fprintf(stderr, "Error couldn't open the X display\n");
                exit(1);
        }
 
-       scrnum = DefaultScreen(dpy);
-       root = RootWindow(dpy, scrnum);
+       scrnum = DefaultScreen(vidx11_display);
+       root = RootWindow(vidx11_display, scrnum);
 
        // Get video mode list
        MajorVersion = MinorVersion = 0;
-       if (!XF86VidModeQueryVersion(dpy, &MajorVersion, &MinorVersion))
+       if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
                vidmode_ext = false;
        else
        {
@@ -665,18 +702,33 @@ void VID_Init(void)
                vidmode_ext = true;
        }
 
-       visinfo = glXChooseVisual(dpy, scrnum, attrib);
+       if ((qglXChooseVisual = GL_GetProcAddress("glXChooseVisual")) == NULL
+        || (qglXCreateContext = GL_GetProcAddress("glXCreateContext")) == NULL
+        || (qglXMakeCurrent = GL_GetProcAddress("glXMakeCurrent")) == NULL
+        || (qglXSwapBuffers = GL_GetProcAddress("glXSwapBuffers")) == NULL)
+               Sys_Error("glX functions not found in libGL.so.1\n");
+
+       visinfo = NULL;
+// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
+#if 0
+       if (!COM_CheckParm("-nogamma"))
+               visinfo = qglXChooseVisual(vidx11_display, scrnum, gammaattrib);
+#endif
        if (!visinfo)
        {
-               fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n");
-               exit(1);
+               visinfo = qglXChooseVisual(vidx11_display, scrnum, nogammaattrib);
+               if (!visinfo)
+               {
+                       Sys_Error("couldn't get an RGB, Double-buffered, Depth visual\n");
+                       exit(1);
+               }
        }
 
        if (vidmode_ext)
        {
                int best_fit, best_dist, dist, x, y;
 
-               XF86VidModeGetAllModeLines(dpy, scrnum, &num_vidmodes, &vidmodes);
+               XF86VidModeGetAllModeLines(vidx11_display, scrnum, &num_vidmodes, &vidmodes);
 
                // Are we going fullscreen?  If so, let's change video mode
                if (fullscreen)
@@ -701,25 +753,32 @@ void VID_Init(void)
 
                        if (best_fit != -1)
                        {
-                               actualWidth = vidmodes[best_fit]->hdisplay;
-                               actualHeight = vidmodes[best_fit]->vdisplay;
+                               // LordHavoc: changed from ActualWidth/ActualHeight =,
+                               // to width/height =, so the window will take the full area of
+                               // the mode chosen
+                               width = vidmodes[best_fit]->hdisplay;
+                               height = vidmodes[best_fit]->vdisplay;
 
                                // change to the mode
-                               XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]);
+                               XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[best_fit]);
                                vidmode_active = true;
 
                                // Move the viewport to top left
-                               XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
+                               XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0);
                        }
                        else
                                fullscreen = 0;
                }
        }
 
+       // LordHavoc: save the visual for use in gamma ramp settings later
+       vidx11_visual = visinfo->visual;
+
        /* window attributes */
        attr.background_pixel = 0;
        attr.border_pixel = 0;
-       attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
+       // 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)
        {
@@ -731,25 +790,30 @@ void VID_Init(void)
        else
                mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
 
-       win = XCreateWindow(dpy, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
-       XStoreName(dpy, win, "DarkPlaces-GLX");
-       XMapWindow(dpy, win);
+       win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
+       XStoreName(vidx11_display, win, gamename);
+       XMapWindow(vidx11_display, win);
+
+       // LordHavoc: making the close button on a window do the right thing
+       // seems to involve this mess, sigh...
+       wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false);
+       XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1);
 
        if (vidmode_active)
        {
-               XMoveWindow(dpy, win, 0, 0);
-               XRaiseWindow(dpy, win);
-               XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
-               XFlush(dpy);
+               XMoveWindow(vidx11_display, win, 0, 0);
+               XRaiseWindow(vidx11_display, win);
+               XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
+               XFlush(vidx11_display);
                // Move the viewport to top left
-               XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
+               XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0);
        }
 
-       XFlush(dpy);
+       XFlush(vidx11_display);
 
-       ctx = glXCreateContext(dpy, visinfo, NULL, True);
+       ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
 
-       glXMakeCurrent(dpy, win, ctx);
+       qglXMakeCurrent(vidx11_display, win, ctx);
 
        scr_width = width;
        scr_height = height;
@@ -758,17 +822,14 @@ void VID_Init(void)
                vid.conheight = height;
        if (vid.conwidth > width)
                vid.conwidth = width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
 
        InitSig(); // trap evil signals
 
+       vid_hidden = false;
+
        GL_Init();
 
        Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
-
-       // force a surface cache flush
-       vid.recalc_refdef = 1;
 }
 
 void Sys_SendKeyEvents(void)
@@ -778,6 +839,8 @@ void Sys_SendKeyEvents(void)
 
 void IN_Init(void)
 {
+       if (COM_CheckParm ("-nomouse"))
+               mouse_avail = false;
 }
 
 void IN_Shutdown(void)
@@ -793,54 +856,11 @@ void IN_Commands (void)
 {
 }
 
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-       if (!mouse_avail)
-               return;
-
-       if (m_filter.value)
-       {
-               mouse_x = (mouse_x + old_mouse_x) * 0.5;
-               mouse_y = (mouse_y + old_mouse_y) * 0.5;
-
-               old_mouse_x = mouse_x;
-               old_mouse_y = mouse_y;
-       }
-
-       mouse_x *= sensitivity.value;
-       mouse_y *= sensitivity.value;
-
-       if (in_strafe.state & 1)
-               cmd->sidemove += m_side.value * mouse_x;
-       else
-               cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-
-       //if (freelook)
-               V_StopPitchDrift ();
-
-       if (/*freelook && */!(in_strafe.state & 1))
-       {
-               cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-               cl.viewangles[PITCH] = bound (-70, cl.viewangles[PITCH], 80);
-       }
-       else
-       {
-               if ((in_strafe.state & 1) && noclip_anglehack)
-                       cmd->upmove -= m_forward.value * mouse_y;
-               else
-                       cmd->forwardmove -= m_forward.value * mouse_y;
-       }
-       mouse_x = mouse_y = 0.0;
-}
-
 void IN_Move (usercmd_t *cmd)
 {
-       IN_MouseMove(cmd);
+       if (mouse_avail)
+               IN_Mouse(cmd, mouse_x, mouse_y);
+       mouse_x = 0;
+       mouse_y = 0;
 }
 
-