]> 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 f7755608719e2776707e9f99345a93de425f5fd2..96bf36f26d51d0b2dd2a7e50a55ae22cc4212cb2 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -8,204 +8,216 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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>
 
-#include "quakedef.h"
-
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <GL/glx.h>
 
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
 
+#include <X11/extensions/XShm.h>
+#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS)
 #include <X11/extensions/xf86dga.h>
+#endif
 #include <X11/extensions/xf86vmode.h>
 
-static Display *dpy = NULL;
-static int scrnum;
-static Window win;
-static GLXContext ctx = NULL;
+#include "quakedef.h"
 
-#define KEY_MASK (KeyPressMask | KeyReleaseMask)
-#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
-                   PointerMotionMask | ButtonMotionMask )
-#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask )
+// 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);
+void (GLAPIENTRY *qglXDestroyContext)(Display *dpy, GLXContext ctx);
+Bool (GLAPIENTRY *qglXMakeCurrent)(Display *dpy, GLXDrawable drawable, GLXContext ctx);
+void (GLAPIENTRY *qglXSwapBuffers)(Display *dpy, GLXDrawable drawable);
+const char *(GLAPIENTRY *qglXQueryExtensionsString)(Display *dpy, int screen);
+
+//GLX_ARB_get_proc_address
+void *(GLAPIENTRY *qglXGetProcAddressARB)(const GLubyte *procName);
 
+static dllfunction_t getprocaddressfuncs[] =
+{
+       {"glXGetProcAddressARB", (void **) &qglXGetProcAddressARB},
+       {NULL, NULL}
+};
+
+//GLX_SGI_swap_control
+GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval);
+
+static dllfunction_t swapcontrolfuncs[] =
+{
+       {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI},
+       {NULL, NULL}
+};
 
-unsigned               d_8to24table[256];
-unsigned char  d_15to8table[65536];
+static Display *vidx11_display = NULL;
+static int vidx11_screen;
+static Window win;
+static GLXContext ctx = NULL;
 
-cvar_t vid_mode = {"vid_mode","0",false};
-viddef_t       vid;                            // global video state
+Atom wm_delete_window_atom;
 
-static qboolean        mouse_avail = true;
-static qboolean        mouse_active = false;
-static float   mouse_x, mouse_y;
-static float   old_mouse_x, old_mouse_y;
+#define KEY_MASK (KeyPressMask | KeyReleaseMask)
+#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
+                   PointerMotionMask | ButtonMotionMask)
+#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | \
+               StructureNotifyMask | FocusChangeMask | EnterWindowMask | \
+               LeaveWindowMask)
+
+
+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;
 
-static cvar_t in_mouse = {"in_mouse", "1", false};
-static cvar_t in_dgamouse = {"in_dgamouse", "1", false};
-static cvar_t m_filter = {"m_filter", "0"};
+#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 dgamouse = false;
 qboolean vidmode_ext = false;
 
 static int win_x, win_y;
 
-static int scr_width, scr_height;
+static XF86VidModeModeInfo init_vidmode;
+static qboolean vid_isfullscreen = false;
 
-static XF86VidModeModeInfo **vidmodes;
-//static int default_dotclock_vidmode;
-static int num_vidmodes;
-static qboolean vidmode_active = false;
+static Visual *vidx11_visual;
+static Colormap vidx11_colormap;
 
 /*-----------------------------------------------------------------------*/
 
-int            texture_extension_number = 1;
+static int XLateKey(XKeyEvent *ev, char *ascii)
+{
+       int key = 0;
+       char buf[64];
+       KeySym keysym, shifted;
 
-float          gldepthmin, gldepthmax;
+       keysym = XLookupKeysym (ev, 0);
+       XLookupString(ev, buf, sizeof buf, &shifted, 0);
+       *ascii = buf[0];
 
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
+       switch(keysym)
+       {
+               case XK_KP_Page_Up:      key = K_KP_PGUP; break;
+               case XK_Page_Up:         key = K_PGUP; break;
 
-void (*qglMTexCoord2f) (GLenum, GLfloat, GLfloat);
-void (*qglSelectTexture) (GLenum);
+               case XK_KP_Page_Down: key = K_KP_PGDN; break;
+               case XK_Page_Down:       key = K_PGDN; break;
 
-//static float vid_gamma = 1.0;
+               case XK_KP_Home: key = K_KP_HOME; break;
+               case XK_Home:    key = K_HOME; break;
 
-// LordHavoc: ARB multitexture support
-int gl_mtex_enum = 0;
+               case XK_KP_End:  key = K_KP_END; break;
+               case XK_End:     key = K_END; break;
 
-// LordHavoc: in GLX these are never set, simply provided to make the rest of the code work
-qboolean isG200 = false;
-qboolean isRagePro = false;
-qboolean gl_mtexable = false;
-qboolean gl_arrays = false;
+               case XK_KP_Left: key = K_KP_LEFTARROW; break;
+               case XK_Left:    key = K_LEFTARROW; break;
 
-/*-----------------------------------------------------------------------*/
-static int
-XLateKey(XKeyEvent *ev/*, qboolean modified*/)
-{
-//     char tmp[2];
-       int key = 0;
-       KeySym keysym;
+               case XK_KP_Right: key = K_KP_RIGHTARROW; break;
+               case XK_Right:  key = K_RIGHTARROW;             break;
+
+               case XK_KP_Down: key = K_KP_DOWNARROW; break;
+               case XK_Down:    key = K_DOWNARROW; break;
+
+               case XK_KP_Up:   key = K_KP_UPARROW; break;
+               case XK_Up:              key = K_UPARROW;        break;
+
+               case XK_Escape: key = K_ESCAPE;         break;
+
+               case XK_KP_Enter: key = K_KP_ENTER;     break;
+               case XK_Return: key = K_ENTER;           break;
 
-/*     if (!modified) {*/
-               keysym = XLookupKeysym(ev, 0);
-/*     } else {
-               XLookupString(ev, tmp, 1, &keysym, NULL);
-       }*/
+               case XK_Tab:            key = K_TAB;                     break;
 
-       switch(keysym) {
-               case XK_KP_Page_Up:     key = KP_PGUP; break;
-               case XK_Page_Up:        key = K_PGUP; break;
+               case XK_F1:              key = K_F1;                            break;
 
-               case XK_KP_Page_Down:   key = KP_PGDN; break;
-               case XK_Page_Down:      key = K_PGDN; break;
+               case XK_F2:              key = K_F2;                            break;
 
-               case XK_KP_Home:        key = KP_HOME; break;
-               case XK_Home:           key = K_HOME; break;
+               case XK_F3:              key = K_F3;                            break;
 
-               case XK_KP_End:         key = KP_END; break;
-               case XK_End:            key = K_END; break;
+               case XK_F4:              key = K_F4;                            break;
 
-               case XK_KP_Left:        key = KP_LEFTARROW; break;
-               case XK_Left:           key = K_LEFTARROW; break;
+               case XK_F5:              key = K_F5;                            break;
 
-               case XK_KP_Right:       key = KP_RIGHTARROW; break;
-               case XK_Right:          key = K_RIGHTARROW; break;
+               case XK_F6:              key = K_F6;                            break;
 
-               case XK_KP_Down:        key = KP_DOWNARROW; break;
-               case XK_Down:           key = K_DOWNARROW; break;
+               case XK_F7:              key = K_F7;                            break;
 
-               case XK_KP_Up:          key = KP_UPARROW; break;
-               case XK_Up:                     key = K_UPARROW; break;
+               case XK_F8:              key = K_F8;                            break;
 
-               case XK_Escape:         key = K_ESCAPE; break;
+               case XK_F9:              key = K_F9;                            break;
 
-               case XK_KP_Enter:       key = KP_ENTER; break;
-               case XK_Return:         key = K_ENTER; break;
+               case XK_F10:            key = K_F10;                     break;
 
-               case XK_Tab:            key = K_TAB; break;
+               case XK_F11:            key = K_F11;                     break;
 
-               case XK_F1:                     key = K_F1; break;
-               case XK_F2:                     key = K_F2; break;
-               case XK_F3:                     key = K_F3; break;
-               case XK_F4:                     key = K_F4; break;
-               case XK_F5:                     key = K_F5; break;
-               case XK_F6:                     key = K_F6; break;
-               case XK_F7:                     key = K_F7; break;
-               case XK_F8:                     key = K_F8; break;
-               case XK_F9:                     key = K_F9; break;
-               case XK_F10:            key = K_F10; break;
-               case XK_F11:            key = K_F11; break;
-               case XK_F12:            key = K_F12; break;
+               case XK_F12:            key = K_F12;                     break;
 
-               case XK_BackSpace:      key = K_BACKSPACE; break;
+               case XK_BackSpace: key = K_BACKSPACE; break;
 
-               case XK_KP_Delete:      key = KP_DEL; break;
-               case XK_Delete:         key = K_DEL; break;
+               case XK_KP_Delete: key = K_KP_DEL; break;
+               case XK_Delete: key = K_DEL; break;
 
-               case XK_Pause:          key = K_PAUSE; break;
+               case XK_Pause:  key = K_PAUSE;           break;
 
                case XK_Shift_L:
-               case XK_Shift_R:        key = K_SHIFT; break;
+               case XK_Shift_R:        key = K_SHIFT;          break;
 
                case XK_Execute:
                case XK_Control_L:
-               case XK_Control_R:      key = K_CTRL; break;
+               case XK_Control_R:      key = K_CTRL;            break;
 
-               case XK_Mode_switch:
                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;
+               case XK_Meta_R: key = K_ALT;                    break;
 
-               case XK_Caps_Lock:      key = K_CAPSLOCK; break;
-               case XK_KP_Begin:       key = KP_5; break;
+               case XK_KP_Begin: key = K_KP_5; break;
 
-               case XK_Insert:         key = K_INS; break;
-               case XK_KP_Insert:      key = KP_INS; break;
+               case XK_Insert:key = K_INS; break;
+               case XK_KP_Insert: key = K_KP_INS; break;
 
-               case XK_KP_Multiply:    key = KP_MULTIPLY; break;
-               case XK_KP_Add:         key = KP_PLUS; break;
-               case XK_KP_Subtract:    key = KP_MINUS; break;
-               case XK_KP_Divide:      key = KP_DIVIDE; break;
+               case XK_KP_Multiply: key = '*'; break;
+               case XK_KP_Add:  key = K_KP_PLUS; break;
+               case XK_KP_Subtract: key = K_KP_MINUS; break;
+               case XK_KP_Divide: key = K_KP_SLASH; break;
 
-               /* For Sun keyboards */
-               case XK_F27:            key = K_HOME; break;
-               case XK_F29:            key = K_PGUP; break;
-               case XK_F33:            key = K_END; break;
-               case XK_F35:            key = K_PGDN; break;
+               case XK_section:        key = '~'; break;
 
                default:
-                       if (keysym < 128) {
-                               /* ASCII keys */
+                       if (keysym < 32)
+                               break;
+
+                       if (keysym >= 'A' && keysym <= 'Z')
+                               key = keysym - 'A' + 'a';
+                       else
                                key = keysym;
-                               if (/*!modified && */((key >= 'A') && (key <= 'Z'))) {
-                                       key = key + ('a' - 'A');
-                               }
-                       }
+
                        break;
        }
 
@@ -214,243 +226,317 @@ XLateKey(XKeyEvent *ev/*, qboolean modified*/)
 
 static Cursor CreateNullCursor(Display *display, Window root)
 {
-    Pixmap cursormask; 
-    XGCValues xgc;
-    GC gc;
-    XColor dummycolour;
-    Cursor cursor;
-
-    cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
-    xgc.function = GXclear;
-    gc =  XCreateGC(display, cursormask, GCFunction, &xgc);
-    XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
-    dummycolour.pixel = 0;
-    dummycolour.red = 0;
-    dummycolour.flags = 04;
-    cursor = XCreatePixmapCursor(display, cursormask, cursormask,
-          &dummycolour,&dummycolour, 0,0);
-    XFreePixmap(display,cursormask);
-    XFreeGC(display,gc);
-    return cursor;
+       Pixmap cursormask;
+       XGCValues xgc;
+       GC gc;
+       XColor dummycolour;
+       Cursor cursor;
+
+       cursormask = XCreatePixmap(display, root, 1, 1, 1);
+       xgc.function = GXclear;
+       gc =  XCreateGC(display, cursormask, GCFunction, &xgc);
+       XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
+       dummycolour.pixel = 0;
+       dummycolour.red = 0;
+       dummycolour.flags = 04;
+       cursor = XCreatePixmapCursor(display, cursormask, cursormask, &dummycolour,&dummycolour, 0,0);
+       XFreePixmap(display,cursormask);
+       XFreeGC(display,gc);
+       return cursor;
 }
 
-static void install_grabs(void)
+static void IN_Activate (qboolean grab)
 {
-        XWindowAttributes attribs_1;
-        XSetWindowAttributes attribs_2;
-
-        XGetWindowAttributes(dpy, win, &attribs_1);
-        attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK;
-        XChangeWindowAttributes(dpy, win, CWEventMask, &attribs_2);
-
-// inviso cursor
-       XDefineCursor(dpy, win, CreateNullCursor(dpy, win));
-
-       XGrabPointer(dpy, win,  True, 0, GrabModeAsync, GrabModeAsync,
-                    win, None, CurrentTime);
-
-/*     if (in_dgamouse.value) {
-               int MajorVersion, MinorVersion;
-
-               if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion)) { 
-                       // unable to query, probalby not supported
-                       Con_Printf( "Failed to detect XF86DGA Mouse\n" );
-                       in_dgamouse.value = 0;
-               } else {
-                       dgamouse = true;
-                       XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse);
-                       XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
-               }
-       } else {*/
-               XWarpPointer(dpy, None, win,
-                                        0, 0, 0, 0,
-                                        vid.width / 2, vid.height / 2);
-/*     }*/
-
-       XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+       if (!vidx11_display)
+               return;
+       if (grab)
+       {
+               if (!vid_usingmouse && mouse_avail && win)
+               {
+                       XWindowAttributes attribs_1;
+                       XSetWindowAttributes attribs_2;
 
-       mouse_active = true;
-       mouse_x = mouse_y = 0;
+                       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);
 
-//     XSync(dpy, True);
-}
+               // inviso cursor
+                       XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win));
 
-static void uninstall_grabs(void)
-{
-       if (!dpy || !win)
-               return;
+                       XGrabPointer(vidx11_display, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
 
-/*     if (dgamouse) {
-               dgamouse = false;
-               XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0);
-       }*/
+#if !defined(__APPLE__) && !defined(SUNOS)
+                       if (vid_dga.integer)
+                       {
+                               int MajorVersion, MinorVersion;
 
-       XUngrabPointer(dpy, CurrentTime);
-       XUngrabKeyboard(dpy, CurrentTime);
+                               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);
 
-// inviso cursor
-       XUndefineCursor(dpy, win);
+                       if (vid_grabkeyboard.integer)
+                               XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
 
-       mouse_active = false;
+                       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
+
+                       XUngrabPointer(vidx11_display, CurrentTime);
+                       XUngrabKeyboard(vidx11_display, CurrentTime);
+
+                       // inviso cursor
+                       if (win)
+                               XUndefineCursor(vidx11_display, win);
+
+                       cl_ignoremousemove = true;
+                       vid_usingmouse = false;
+               }
+       }
 }
 
+static keynum_t buttonremap[18] =
+{
+       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)
 {
        XEvent event;
-//     KeySym ks;
-       int b;
+       int key;
+       char ascii;
        qboolean dowarp = false;
 
-       if (!dpy)
+       if (!vidx11_display)
                return;
 
-       while (XPending(dpy)) {
-               XNextEvent(dpy, &event);
+       while (XPending(vidx11_display))
+       {
+               XNextEvent(vidx11_display, &event);
 
-               switch (event.type) {
+               switch (event.type)
+               {
                case KeyPress:
+                       // key pressed
+                       key = XLateKey (&event.xkey, &ascii);
+                       Key_Event(key, ascii, true);
+                       break;
+
                case KeyRelease:
-                       Key_Event(XLateKey(&event.xkey), event.type == KeyPress);
+                       // key released
+                       key = XLateKey (&event.xkey, &ascii);
+                       Key_Event(key, ascii, false);
                        break;
 
                case MotionNotify:
-                       if (dgamouse) {
-                               mouse_x += event.xmotion.x_root/* * in_dga_mouseaccel.value*/;
-                               mouse_y += event.xmotion.y_root/* * in_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 (vid_fullscreen.value || _windowed_mouse.value) {*/
-                                       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 {
-                                       mouse_x += (event.xmotion.x - p_mouse_x);
-                                       mouse_y += (event.xmotion.y - p_mouse_y);
-                               }*/
-                               p_mouse_x = event.xmotion.x;
-                               p_mouse_y = event.xmotion.y;
-                       }
-        
-/*                     if (mouse_active) {
-                               if (dgamouse) {
-                                       mouse_x += (event.xmotion.x + win_x) * 2;
-                                       mouse_y += (event.xmotion.y + win_y) * 2;
-                               } 
+                       // mouse moved
+                       if (vid_usingmouse)
+                       {
+#if !defined(__APPLE__) && !defined(SUNOS)
+                               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
+#endif
                                {
-                                       mouse_x += ((int)event.xmotion.x - mwx) * 2;
-                                       mouse_y += ((int)event.xmotion.y - mwy) * 2;
-                                       mwx = event.xmotion.x;
-                                       mwy = event.xmotion.y;
 
-                                       if (mouse_x || mouse_y)
-                                               dowarp = true;
+                                       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;
+                                       }
+                                       p_mouse_x = event.xmotion.x;
+                                       p_mouse_y = event.xmotion.y;
                                }
-                       }*/
+                       }
+                       //else
+                       //      ui_mouseupdate(event.xmotion.x, event.xmotion.y);
                        break;
 
                case ButtonPress:
-                       b=-1;
-                       if (event.xbutton.button == 1)
-                               b = 0;
-                       else if (event.xbutton.button == 2)
-                               b = 2;
-                       else if (event.xbutton.button == 3)
-                               b = 1;
-                       if (b>=0)
-                               Key_Event(K_MOUSE1 + b, true);
+                       // mouse button pressed
+                       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:
-                       b=-1;
-                       if (event.xbutton.button == 1)
-                               b = 0;
-                       else if (event.xbutton.button == 2)
-                               b = 2;
-                       else if (event.xbutton.button == 3)
-                               b = 1;
-                       if (b>=0)
-                               Key_Event(K_MOUSE1 + b, false);
+                       // mouse button released
+                       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 :
+               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) && ((unsigned int)event.xclient.data.l[0] == wm_delete_window_atom))
+                               Sys_Quit();
+                       break;
+               case MapNotify:
+                       // window restored
+                       vid_hidden = false;
+                       VID_RestoreSystemGamma();
+                       break;
+               case UnmapNotify:
+                       // window iconified/rolledup/whatever
+                       vid_hidden = true;
+                       VID_RestoreSystemGamma();
+                       break;
+               case FocusIn:
+                       // window is now the input focus
+                       vid_activewindow = true;
+                       break;
+               case FocusOut:
+                       // window is no longer the input focus
+                       vid_activewindow = false;
+                       VID_RestoreSystemGamma();
+                       break;
+               case EnterNotify:
+                       // mouse entered window
+                       break;
+               case LeaveNotify:
+                       // mouse left window
+                       break;
                }
        }
 
-       if (dowarp) {
+       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);
+               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)
-               return;
+static void *prjobj = NULL;
 
-       if (mouse_active) {
-               uninstall_grabs();
-               mouse_active = false;
-       }
+static void GL_CloseLibrary(void)
+{
+       if (prjobj)
+               dlclose(prjobj);
+       prjobj = NULL;
+       gl_driver[0] = 0;
+       qglXGetProcAddressARB = NULL;
+       gl_extensions = "";
+       gl_platform = "";
+       gl_platformextensions = "";
 }
 
-static void IN_ActivateMouse( void ) 
+static int GL_OpenLibrary(const char *name)
 {
-       if (!mouse_avail || !dpy || !win)
-               return;
-
-       if (!mouse_active) {
-               mouse_x = mouse_y = 0; // don't spazz
-               install_grabs();
-               mouse_active = true;
+       Con_Printf("Loading OpenGL driver %s\n", name);
+       GL_CloseLibrary();
+       if (!(prjobj = dlopen(name, RTLD_LAZY)))
+       {
+               Con_Printf("Unable to open symbol list for %s\n", name);
+               return false;
        }
+       strlcpy(gl_driver, name, sizeof(gl_driver));
+       return true;
 }
 
+void *GL_GetProcAddress(const char *name)
+{
+       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)
 {
-       if (!ctx || !dpy)
+       if (!ctx || !vidx11_display)
                return;
 
-       if (dpy) {
-               uninstall_grabs();
+       if (vidx11_display)
+       {
+               IN_Activate(false);
+               VID_RestoreSystemGamma();
 
-               if (ctx)
-                       glXDestroyContext(dpy, ctx);
+               // FIXME: glXDestroyContext here?
+               if (vid_isfullscreen)
+                       XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
                if (win)
-                       XDestroyWindow(dpy, win);
-               if (vidmode_active)
-                       XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[0]);
-               XCloseDisplay(dpy);
+                       XDestroyWindow(vidx11_display, win);
+               XCloseDisplay(vidx11_display);
        }
-       vidmode_active = false;
-       dpy = NULL;
+       vid_hidden = true;
+       vid_isfullscreen = false;
+       vidx11_display = NULL;
        win = 0;
        ctx = NULL;
+
+       GL_CloseLibrary();
+       Key_ClearStates ();
 }
 
 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);
 }
@@ -469,374 +555,319 @@ void InitSig(void)
        signal(SIGTERM, signal_handler);
 }
 
-/*
-void (*qglVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (*qglColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (*qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (*qglArrayElement)(GLint i);
-void (*qglDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-void (*qglMTexCoord2f)(GLenum, GLfloat, GLfloat);
-void (*qglSelectTexture)(GLenum);
-
-void VID_CheckVertexArrays (void)
+void VID_Finish (qboolean allowmousegrab)
 {
-       void *prjobj;
-       if (COM_CheckParm("-novertex"))
-       {
-               Con_Printf("...vertex array support disabled\n");
-               return;
-       }
-       if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL)
+       qboolean vid_usemouse;
+
+       vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
+       if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
        {
-               Con_Printf("Unable to open symbol list for main program.\n");
-               return;
+               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");
        }
-       qglMTexCoord2fSGIS = (void *) dlsym(prjobj, "glMTexCoord2fSGIS");
-       if ((qglArrayElement = (void *) dlsym(prjobj, "glArrayElement"))
-        && (qglColorPointer = (void *) dlsym(prjobj, "glColorPointer"))
-//      && (qglDrawArrays = (void *) dlsym(prjobj, "glDrawArrays"))
-        && (qglDrawElements = (void *) dlsym(prjobj, "glDrawElements"))
-//      && (qglInterleavedArrays = (void *) dlsym(prjobj, "glInterleavedArrays"))
-        && (qglTexCoordPointer = (void *) dlsym(prjobj, "glTexCoordPointer"))
-        && (qglVertexPointer = (void *) dlsym(prjobj, "glVertexPointer"))
-               )
+
+       // 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)
        {
-               Con_Printf("...vertex array support detected\n");
-               gl_arrays = true;
-               dlclose(prjobj);
-               return;
+               CHECKGLERROR
+               if (r_speeds.integer || gl_finish.integer)
+               {
+                       qglFinish();CHECKGLERROR
+               }
+               qglXSwapBuffers(vidx11_display, win);CHECKGLERROR
        }
 
-       Con_Printf("...vertex array support disabled (not detected - get a better driver)\n");
-       dlclose(prjobj);
+       if (vid_x11_hardwaregammasupported)
+               VID_UpdateGamma(false, vid_x11_gammarampsize);
 }
-*/
 
-// LordHavoc: require OpenGL 1.2.x
-void VID_CheckVertexArrays (void)
+int VID_SetGamma(unsigned short *ramps, int rampsize)
 {
-       gl_arrays = true;
+       return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-void VID_CheckMultiTexture(void) 
+int VID_GetGamma(unsigned short *ramps, int rampsize)
 {
-       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;
-       }
-       if (!gl_mtexable)
-               Con_Printf("...multitexture disabled (not detected)\n");
-       dlclose(prjobj);
+       return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-/*
-=================
-GL_BeginRendering
-
-=================
-*/
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
+void VID_Init(void)
 {
-       *x = *y = 0;
-       *width = scr_width;
-       *height = scr_height;
-
-//     glViewport (*x, *y, *width, *height);
+#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 GL_EndRendering (void)
+void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer)
 {
-       if (!r_render.value)
-               return;
-       glFlush();
-       glXSwapBuffers(dpy, win);
+       *attrib++ = GLX_RGBA;
+       *attrib++ = GLX_RED_SIZE;*attrib++ = 1;
+       *attrib++ = GLX_GREEN_SIZE;*attrib++ = 1;
+       *attrib++ = GLX_BLUE_SIZE;*attrib++ = 1;
+       *attrib++ = GLX_DOUBLEBUFFER;
+       *attrib++ = GLX_DEPTH_SIZE;*attrib++ = 1;
+       // if stencil is enabled, ask for alpha too
+       if (stencil)
+       {
+               *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8;
+               *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1;
+       }
+       if (stereobuffer)
+               *attrib++ = GLX_STEREO;
+       *attrib++ = None;
 }
 
-void VID_Init()
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
 {
        int i;
-       int attrib[] = {
-               GLX_RGBA,
-               GLX_RED_SIZE, 1,
-               GLX_GREEN_SIZE, 1,
-               GLX_BLUE_SIZE, 1,
-               GLX_DOUBLEBUFFER,
-               GLX_DEPTH_SIZE, 1,
-               None
-       };
-//     char    gldir[MAX_OSPATH];
-       int width = 640, height = 480;
+       int attrib[32];
        XSetWindowAttributes attr;
        unsigned long mask;
        Window root;
        XVisualInfo *visinfo;
-       qboolean fullscreen = true;
        int MajorVersion, MinorVersion;
-       int actualWidth, actualHeight;
-
-       Cvar_RegisterVariable (&vid_mode);
-       Cvar_RegisterVariable (&in_mouse);
-       Cvar_RegisterVariable (&in_dgamouse);
-       Cvar_RegisterVariable (&m_filter);
-       
-// interpret command-line params
-
-// set vid parameters
-       if ((i = COM_CheckParm("-window")) != 0)
-               fullscreen = false;
-
-       if ((i = COM_CheckParm("-width")) != 0)
-               width = atoi(com_argv[i+1]);
-
-       if ((i = COM_CheckParm("-height")) != 0)
-               height = atoi(com_argv[i+1]);
-
-       if ((i = COM_CheckParm("-conwidth")) != 0)
-               vid.conwidth = atoi(com_argv[i+1]);
-       else
-               vid.conwidth = 640;
-
-       vid.conwidth &= 0xfff8; // make it a multiple of eight
-
-       if (vid.conwidth < 320)
-               vid.conwidth = 320;
-
-       // pick a conheight that matches with correct aspect
-       vid.conheight = vid.conwidth*3 / 4;
-
-       if ((i = COM_CheckParm("-conheight")) != 0)
-               vid.conheight = atoi(com_argv[i+1]);
-       if (vid.conheight < 200)
-               vid.conheight = 200;
+       const char *drivername;
+
+#if defined(__APPLE__) && defined(__MACH__)
+       drivername = "/usr/X11R6/lib/libGL.1.dylib";
+#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];
+       if (!GL_OpenLibrary(drivername))
+       {
+               Con_Printf("Unable to load GL driver \"%s\"\n", drivername);
+               return false;
+       }
 
-       if (!(dpy = XOpenDisplay(NULL))) {
-               fprintf(stderr, "Error couldn't open the X display\n");
-               exit(1);
+       if (!(vidx11_display = XOpenDisplay(NULL)))
+       {
+               Con_Print("Couldn't open the X display\n");
+               return false;
        }
 
-       scrnum = DefaultScreen(dpy);
-       root = RootWindow(dpy, scrnum);
+       vidx11_screen = DefaultScreen(vidx11_display);
+       root = RootWindow(vidx11_display, vidx11_screen);
 
        // Get video mode list
        MajorVersion = MinorVersion = 0;
-       if (!XF86VidModeQueryVersion(dpy, &MajorVersion, &MinorVersion)) { 
+       if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
                vidmode_ext = false;
-       } else {
-               Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
+       else
+       {
+               Con_DPrintf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
                vidmode_ext = true;
        }
 
-       visinfo = glXChooseVisual(dpy, scrnum, attrib);
-       if (!visinfo) {
-               fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n");
-               exit(1);
+       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;
        }
 
-       if (vidmode_ext) {
+       VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer);
+       visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
+       if (!visinfo)
+       {
+               Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n");
+               return false;
+       }
+
+       if (vidmode_ext)
+       {
                int best_fit, best_dist, dist, x, y;
-               
-               XF86VidModeGetAllModeLines(dpy, scrnum, &num_vidmodes, &vidmodes);
 
                // Are we going fullscreen?  If so, let's change video mode
-               if (fullscreen) {
+               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;
 
-                       for (i = 0; i < num_vidmodes; i++) {
-                               if (width > vidmodes[i]->hdisplay ||
-                                       height > vidmodes[i]->vdisplay)
+                       for (i = 0; i < num_vidmodes; i++)
+                       {
+                               if (width > vidmodes[i]->hdisplay || height > vidmodes[i]->vdisplay)
                                        continue;
 
                                x = width - vidmodes[i]->hdisplay;
                                y = height - vidmodes[i]->vdisplay;
                                dist = (x * x) + (y * y);
-                               if (dist < best_dist) {
+                               if (dist < best_dist)
+                               {
                                        best_dist = dist;
                                        best_fit = i;
                                }
                        }
 
-                       if (best_fit != -1) {
-                               actualWidth = vidmodes[best_fit]->hdisplay;
-                               actualHeight = vidmodes[best_fit]->vdisplay;
+                       if (best_fit != -1)
+                       {
+                               // 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]);
-                               vidmode_active = true;
+                               XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
+                               vid_isfullscreen = true;
 
                                // Move the viewport to top left
-                               XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
-                       } else
+                               XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
+                       }
+                       else
                                fullscreen = 0;
+
+                       free(vidmodes);
                }
        }
 
+       // 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) {
-               mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | 
-                       CWEventMask | CWOverrideRedirect;
+       if (vid_isfullscreen)
+       {
+               mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
                attr.override_redirect = True;
                attr.backing_store = NotUseful;
                attr.save_under = False;
-       } else
+       }
+       else
                mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
 
-       win = XCreateWindow(dpy, root, 0, 0, width, height,
-                                               0, visinfo->depth, InputOutput,
-                                               visinfo->visual, mask, &attr);
-       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);
+       if (vid_isfullscreen)
+       {
+               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, vidx11_screen, 0, 0);
        }
 
-       XFlush(dpy);
+       //XSync(vidx11_display, False);
 
-       ctx = glXCreateContext(dpy, visinfo, NULL, True);
-
-       glXMakeCurrent(dpy, win, ctx);
-
-       scr_width = width;
-       scr_height = height;
+       ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
+       if (!ctx)
+       {
+               Con_Printf ("glXCreateContext failed\n");
+               return false;
+       }
 
-       if (vid.conheight > height)
-               vid.conheight = height;
-       if (vid.conwidth > width)
-               vid.conwidth = width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
+       if (!qglXMakeCurrent(vidx11_display, win, ctx))
+       {
+               Con_Printf ("glXMakeCurrent failed\n");
+               return false;
+       }
 
-       vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
+       XSync(vidx11_display, False);
 
-       InitSig(); // trap evil signals
+       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 = (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);
+// 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);
+
+       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();
-
-       Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
-
-       vid.recalc_refdef = 1;                          // force a surface cache flush
-
-       install_grabs();
+       return true;
 }
 
 void Sys_SendKeyEvents(void)
 {
-       HandleEvents();
-}
-
-void Force_CenterView_f (void)
-{
-       cl.viewangles[PITCH] = 0;
-}
-
-void IN_Init(void)
-{
-}
+       static qboolean sound_active = true;
 
-void IN_Shutdown(void)
-{
-}
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-       if (!dpy || !win)
-               return;
-
-       if (vidmode_active || key_dest == key_game)
-               IN_ActivateMouse();
-       else
-               IN_DeactivateMouse ();
-}
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-       if (!mouse_avail)
-               return;
+       // enable/disable sound on focus gain/loss
+       if (!vid_activewindow && sound_active)
+       {
+               S_BlockSound ();
+               sound_active = false;
+       }
+       else if (vid_activewindow && !sound_active)
+       {
+               S_UnblockSound ();
+               sound_active = true;
+       }
 
-        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;
+       HandleEvents();
 }
 
-void IN_Move (usercmd_t *cmd)
+void IN_Move (void)
 {
-       IN_MouseMove(cmd);
+       if (mouse_avail)
+       {
+               in_mouse_x = mouse_x;
+               in_mouse_y = mouse_y;
+       }
+       mouse_x = 0;
+       mouse_y = 0;
 }
-
-