]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_glx.c
made darkplaces compile successfully with g++ to test for errors C doesn't care about...
[xonotic/darkplaces.git] / vid_glx.c
index 33ecded764021e3467925582cc2b502a23a05663..8c2ab74e667ce491225455b07e9da45f27c8b99c 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -35,11 +35,14 @@ 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__) && !defined(SUNOS)
 #include <X11/extensions/xf86dga.h>
+#endif
 #include <X11/extensions/xf86vmode.h>
 
 #include "quakedef.h"
 
+// Tell startup code that we have a client
 int cl_available = true;
 
 //GLX prototypes
@@ -53,25 +56,23 @@ const char *(GLAPIENTRY *qglXQueryExtensionsString)(Display *dpy, int screen);
 //GLX_ARB_get_proc_address
 void *(GLAPIENTRY *qglXGetProcAddressARB)(const GLubyte *procName);
 
-static gl_extensionfunctionlist_t getprocaddressfuncs[] =
+static dllfunction_t getprocaddressfuncs[] =
 {
        {"glXGetProcAddressARB", (void **) &qglXGetProcAddressARB},
        {NULL, NULL}
 };
 
-//GLX_SGI_video_sync
-GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count);
-GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count);
+//GLX_SGI_swap_control
+GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval);
 
-static gl_extensionfunctionlist_t videosyncfuncs[] =
+static dllfunction_t swapcontrolfuncs[] =
 {
-       {"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI},
-       {"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI},
+       {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI},
        {NULL, NULL}
 };
 
 static Display *vidx11_display = NULL;
-static int scrnum;
+static int vidx11_screen;
 static Window win;
 static GLXContext ctx = NULL;
 
@@ -79,134 +80,144 @@ Atom wm_delete_window_atom;
 
 #define KEY_MASK (KeyPressMask | KeyReleaseMask)
 #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
-                   PointerMotionMask | ButtonMotionMask )
-#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask )
-
+                   PointerMotionMask | ButtonMotionMask)
+#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | \
+               StructureNotifyMask | FocusChangeMask | EnterWindowMask | \
+               LeaveWindowMask)
 
-viddef_t       vid;                            // global video state
 
-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 float   mouse_x, mouse_y;
 static int p_mouse_x, p_mouse_y;
 
+#if !defined(__APPLE__) && !defined(SUNOS)
 cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
 cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
+#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 qboolean vid_isfullscreen = false;
 
 static Visual *vidx11_visual;
 static Colormap vidx11_colormap;
 
 /*-----------------------------------------------------------------------*/
 
-static int
-XLateKey(XKeyEvent *ev)
+static int XLateKey(XKeyEvent *ev, char *ascii)
 {
        int key = 0;
-       KeySym keysym;
+       char buf[64];
+       KeySym keysym, shifted;
 
-       keysym = XLookupKeysym(ev, 0);
+       keysym = XLookupKeysym (ev, 0);
+       XLookupString(ev, buf, sizeof buf, &shifted, 0);
+       *ascii = buf[0];
 
        switch(keysym)
        {
-               case XK_KP_Page_Up:     key = KP_PGUP; break;
-               case XK_Page_Up:        key = K_PGUP; break;
+               case XK_KP_Page_Up:      key = K_KP_PGUP; break;
+               case XK_Page_Up:         key = K_PGUP; break;
+
+               case XK_KP_Page_Down: key = K_KP_PGDN; break;
+               case XK_Page_Down:       key = K_PGDN; break;
+
+               case XK_KP_Home: key = K_KP_HOME; break;
+               case XK_Home:    key = K_HOME; break;
+
+               case XK_KP_End:  key = K_KP_END; break;
+               case XK_End:     key = K_END; break;
+
+               case XK_KP_Left: key = K_KP_LEFTARROW; break;
+               case XK_Left:    key = K_LEFTARROW; break;
+
+               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;
+
+               case XK_Tab:            key = K_TAB;                     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_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 && keysym > 126)
+                               break;
+
+                       if (keysym >= 'A' && keysym <= 'Z')
+                               key = keysym - 'A' + 'a';
+                       else
                                key = keysym;
-                               if ((key >= 'A') && (key <= 'Z'))
-                                       key = key + ('a' - 'A');
-                       }
+
                        break;
        }
 
@@ -234,66 +245,82 @@ 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);
 
-       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);
+
+                       XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+
+                       mouse_x = mouse_y = 0;
+                       cl_ignoremousemove = true;
+                       vid_usingmouse = true;
                }
        }
        else
-               XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
-
-       XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
-
-       mouse_active = true;
-       mouse_x = mouse_y = 0;
-}
-
-static void uninstall_grabs(void)
-{
-       if (!vidx11_display || !win)
-               return;
-
-       if (vid_dga.integer == 1)
-               XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
+       {
+               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);
+                       XUngrabPointer(vidx11_display, CurrentTime);
+                       XUngrabKeyboard(vidx11_display, CurrentTime);
 
-// inviso cursor
-       XUndefineCursor(vidx11_display, win);
+                       // inviso cursor
+                       if (win)
+                               XUndefineCursor(vidx11_display, win);
 
-       mouse_active = false;
+                       cl_ignoremousemove = true;
+                       vid_usingmouse = false;
+               }
+       }
 }
 
 static void HandleEvents(void)
 {
        XEvent event;
+       int key;
+       char ascii;
        qboolean dowarp = false;
 
        if (!vidx11_display)
@@ -307,39 +334,43 @@ static void HandleEvents(void)
                {
                case KeyPress:
                        // key pressed
-                       Key_Event(XLateKey(&event.xkey), true);
+                       key = XLateKey (&event.xkey, &ascii);
+                       Key_Event(key, ascii, true);
                        break;
 
                case KeyRelease:
                        // key released
-                       Key_Event(XLateKey(&event.xkey), false);
+                       key = XLateKey (&event.xkey, &ascii);
+                       Key_Event(key, ascii, false);
                        break;
 
                case MotionNotify:
                        // mouse moved
-                       if (usingmouse)
+                       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
                                {
 
                                        if (!event.xmotion.send_event)
                                        {
                                                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;
                                        p_mouse_y = event.xmotion.y;
                                }
                        }
-                       else
-                               ui_mouseupdate(event.xmotion.x, event.xmotion.y);
+                       //else
+                       //      ui_mouseupdate(event.xmotion.x, event.xmotion.y);
                        break;
 
                case ButtonPress:
@@ -347,22 +378,43 @@ static void HandleEvents(void)
                        switch(event.xbutton.button)
                        {
                        case 1:
-                               Key_Event(K_MOUSE1, true);
+                               Key_Event(K_MOUSE1, 0, true);
                                break;
                        case 2:
-                               Key_Event(K_MOUSE3, true);
+                               Key_Event(K_MOUSE3, 0, true);
                                break;
                        case 3:
-                               Key_Event(K_MOUSE2, true);
+                               Key_Event(K_MOUSE2, 0, true);
                                break;
                        case 4:
-                               Key_Event(K_MWHEELUP, true);
+                               Key_Event(K_MWHEELUP, 0, true);
                                break;
                        case 5:
-                               Key_Event(K_MWHEELDOWN, true);
+                               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;
-               default:
-                               Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button);
+                       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;
                        }
                        break;
@@ -372,22 +424,43 @@ static void HandleEvents(void)
                        switch(event.xbutton.button)
                        {
                        case 1:
-                               Key_Event(K_MOUSE1, false);
+                               Key_Event(K_MOUSE1, 0, false);
                                break;
                        case 2:
-                               Key_Event(K_MOUSE3, false);
+                               Key_Event(K_MOUSE3, 0, false);
                                break;
                        case 3:
-                               Key_Event(K_MOUSE2, false);
+                               Key_Event(K_MOUSE2, 0, false);
                                break;
                        case 4:
-                               Key_Event(K_MWHEELUP, false);
+                               Key_Event(K_MWHEELUP, 0, false);
                                break;
                        case 5:
-                               Key_Event(K_MWHEELDOWN, false);
+                               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;
-               default:
-                               Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button);
+                       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;
                        }
                        break;
@@ -409,22 +482,29 @@ static void HandleEvents(void)
                        break;
                case ClientMessage:
                        // window manager messages
-                       if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom))
+                       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_activewindow = false;
+                       VID_RestoreSystemGamma();
                        break;
                case UnmapNotify:
                        // window iconified/rolledup/whatever
                        vid_hidden = true;
+                       vid_activewindow = false;
+                       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
@@ -438,38 +518,48 @@ 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 )
-{
-       if (!mouse_avail || !vidx11_display || !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 || !vidx11_display || !win)
-               return;
-
-       if (!mouse_active)
+       Con_Printf("Loading OpenGL driver %s\n", name);
+       GL_CloseLibrary();
+       if (!(prjobj = dlopen(name, RTLD_LAZY)))
        {
-               mouse_x = mouse_y = 0; // don't spazz
-               install_grabs();
-               mouse_active = true;
+               Con_Printf("Unable to open symbol list for %s\n", name);
+               return false;
        }
+       strcpy(gl_driver, name);
+       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)
 {
@@ -478,25 +568,30 @@ void VID_Shutdown(void)
 
        if (vidx11_display)
        {
-               uninstall_grabs();
+               IN_Activate(false);
+               VID_RestoreSystemGamma();
 
-               if (vidmode_active)
-                       XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]);
+               // FIXME: glXDestroyContext here?
+               if (vid_isfullscreen)
+                       XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]);
                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;
 
        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);
 }
@@ -515,174 +610,111 @@ void InitSig(void)
        signal(SIGTERM, signal_handler);
 }
 
-/*
-=================
-VID_GetWindowSize
-=================
-*/
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
-{
-       *x = *y = 0;
-       *width = scr_width;
-       *height = scr_height;
-}
-
 void VID_Finish (void)
 {
-       int usemouse;
-       if (r_render.integer)
+       qboolean vid_usemouse;
+
+       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
+       vid_usemouse = false;
+       if (vid_mouse.integer && !key_consoleactive && !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)
-               {
-                       usingmouse = false;
-                       IN_DeactivateMouse ();
-               }
+               if (r_speeds.integer || gl_finish.integer)
+                       qglFinish();
+               qglXSwapBuffers(vidx11_display, win);
        }
 }
 
-// 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)
+int VID_SetGamma(unsigned short *ramps)
 {
-// 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;
+       return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
+}
 
-       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;
-       }
+int VID_GetGamma(unsigned short *ramps)
+{
+       return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
+}
 
-       BuildGammaTable16(prescale, gamma, scale, base, ramp);
+void VID_Init(void)
+{
+#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;
+}
 
-       // convert gamma ramp to palette (yes this seems odd)
-       ncolors = vidx11_visual->map_entries;
-       for (i = 0;i < ncolors;i++)
+void VID_BuildGLXAttrib(int *attrib, int stencil)
+{
+       *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)
        {
-               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);
+               *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8;
+               *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1;
        }
-       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
+       *attrib++ = None;
 }
 
-void VID_Init(int fullscreen, int width, int height)
+int VID_InitMode(int fullscreen, int width, int height, int bpp)
 {
        int i;
-// 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,
-               GLX_GREEN_SIZE, 1,
-               GLX_BLUE_SIZE, 1,
-               GLX_DOUBLEBUFFER,
-               GLX_DEPTH_SIZE, 1,
-               None
-       };
+       int attrib[32];
        XSetWindowAttributes attr;
        unsigned long mask;
        Window root;
        XVisualInfo *visinfo;
        int MajorVersion, MinorVersion;
+       const char *drivername;
 
-       if (!GL_OpenLibrary("libGL.so.1"))
-               Sys_Error("Unable to load GL driver\n");
-
-       Cvar_RegisterVariable (&vid_dga);
-       Cvar_RegisterVariable (&vid_dga_mouseaccel);
+#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 (!(vidx11_display = XOpenDisplay(NULL)))
        {
-               fprintf(stderr, "Error couldn't open the X display\n");
-               exit(1);
+               Con_Print("Couldn't open the X display\n");
+               return false;
        }
 
-       scrnum = DefaultScreen(vidx11_display);
-       root = RootWindow(vidx11_display, scrnum);
+       vidx11_screen = DefaultScreen(vidx11_display);
+       root = RootWindow(vidx11_display, vidx11_screen);
 
        // Get video mode list
        MajorVersion = MinorVersion = 0;
@@ -690,42 +722,37 @@ void VID_Init(int fullscreen, int width, int height)
                vidmode_ext = false;
        else
        {
-               Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
+               Con_DPrintf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
                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)
-               Sys_Error("glX functions not found in %s\n", gl_driver);
-
-       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 ((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);
+       visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
        if (!visinfo)
        {
-               visinfo = qglXChooseVisual(vidx11_display, scrnum, nogammaattrib);
-               if (!visinfo)
-               {
-                       Sys_Error("couldn't get an RGB, Double-buffered, Depth visual\n");
-                       exit(1);
-               }
+               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(vidx11_display, scrnum, &num_vidmodes, &vidmodes);
-
                // Are we going fullscreen?  If so, let's change video mode
                if (fullscreen)
                {
+                       XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes);
                        best_dist = 9999999;
                        best_fit = -1;
 
@@ -753,11 +780,11 @@ void VID_Init(int fullscreen, int width, int height)
                                height = vidmodes[best_fit]->vdisplay;
 
                                // change to the mode
-                               XF86VidModeSwitchToMode(vidx11_display, 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(vidx11_display, scrnum, 0, 0);
+                               XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
                        }
                        else
                                fullscreen = 0;
@@ -773,7 +800,7 @@ void VID_Init(int fullscreen, int width, int height)
        // 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;
@@ -792,45 +819,63 @@ void VID_Init(int fullscreen, int width, int height)
        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);
                XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
                XFlush(vidx11_display);
                // Move the viewport to top left
-               XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0);
+               XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
        }
 
-       XFlush(vidx11_display);
+       //XSync(vidx11_display, False);
 
        ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
+       if (!ctx)
+       {
+               Con_Printf ("glXCreateContext failed\n");
+               return false;
+       }
 
-       qglXMakeCurrent(vidx11_display, win, ctx);
+       if (!qglXMakeCurrent(vidx11_display, win, ctx))
+       {
+               Con_Printf ("glXMakeCurrent failed\n");
+               return false;
+       }
 
-       scr_width = width;
-       scr_height = height;
+       XSync(vidx11_display, False);
 
-       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", 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, scrnum);
+       gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen);
 
-       GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false);
-       gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false);
+       gl_videosyncavailable = false;
 
-       InitSig(); // trap evil signals
+// 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;
        GL_Init();
-
-       Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
+       return true;
 }
 
 void Sys_SendKeyEvents(void)
@@ -838,66 +883,13 @@ void Sys_SendKeyEvents(void)
        HandleEvents();
 }
 
-void IN_Init(void)
-{
-       if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
-               mouse_avail = false;
-}
-
-void IN_Shutdown(void)
-{
-}
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-}
-
-void IN_Move (usercmd_t *cmd)
+void IN_Move (void)
 {
        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 GL 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;
+               in_mouse_x = mouse_x;
+               in_mouse_y = mouse_y;
        }
-       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 = "";
-}
-
-void *GL_GetProcAddress(const char *name)
-{
-       void *p = NULL;
-       if (qglXGetProcAddressARB != NULL)
-               p = (void *) qglXGetProcAddressARB(name);
-       if (p == NULL)
-               p = (void *) dlsym(prjobj, name);
-       return p;
+       mouse_x = 0;
+       mouse_y = 0;
 }