]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_glx.c
changed most Sys_Error calls to Con_Printf with appropriate error returns
[xonotic/darkplaces.git] / vid_glx.c
index 000156b2f64c542229a9adb64f71b389f97fff29..33d32d67d20b1743fdf2ace6ef31298efffa8b3d 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__)
 #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
@@ -59,14 +62,12 @@ static dllfunction_t getprocaddressfuncs[] =
        {NULL, NULL}
 };
 
-//GLX_SGI_video_sync
-GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count);
-GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(GLint divisor, GLint remainder, GLuint *count);
+//GLX_SGI_swap_control
+GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval);
 
-static dllfunction_t videosyncfuncs[] =
+static dllfunction_t swapcontrolfuncs[] =
 {
-       {"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI},
-       {"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI},
+       {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI},
        {NULL, NULL}
 };
 
@@ -85,23 +86,25 @@ Atom wm_delete_window_atom;
                LeaveWindowMask)
 
 
-static qboolean                mouse_avail = true;
-static qboolean                mouse_active = false, usingmouse = false;
+static qboolean mouse_avail = true;
+static qboolean vid_usingmouse = false;
+static qboolean vid_usingvsync = false;
+static qboolean vid_usevsync = false;
 static float   mouse_x, mouse_y;
 static int p_mouse_x, p_mouse_y;
 
+#ifndef __APPLE__
 cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
 cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
+#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;
@@ -240,61 +243,75 @@ 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;
+#ifndef __APPLE__
+                       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)
+               {
+#ifndef __APPLE__
+                       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)
@@ -327,29 +344,31 @@ static void HandleEvents(void)
 
                case MotionNotify:
                        // mouse moved
-                       if (usingmouse)
+                       if (vid_usingmouse)
                        {
+#ifndef __APPLE__
                                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:
@@ -467,31 +486,29 @@ static void HandleEvents(void)
                case MapNotify:
                        // window restored
                        vid_hidden = false;
-                       vid_allowhwgamma = true;
+                       vid_activewindow = false;
+                       VID_RestoreSystemGamma();
                        break;
                case UnmapNotify:
                        // window iconified/rolledup/whatever
                        vid_hidden = true;
-                       vid_allowhwgamma = false;
+                       vid_activewindow = false;
                        VID_RestoreSystemGamma();
                        break;
                case FocusIn:
                        // window is now the input focus
-                       vid_allowhwgamma = true;
+                       vid_activewindow = true;
                        break;
                case FocusOut:
                        // window is no longer the input focus
-                       vid_allowhwgamma = false;
+                       vid_activewindow = false;
                        VID_RestoreSystemGamma();
                        break;
                case EnterNotify:
                        // mouse entered window
-                       vid_allowhwgamma = true;
                        break;
                case LeaveNotify:
                        // mouse left window
-                       vid_allowhwgamma = false;
-                       VID_RestoreSystemGamma();
                        break;
                }
        }
@@ -499,36 +516,47 @@ static void HandleEvents(void)
        if (dowarp)
        {
                /* move the mouse to the window center again */
-               p_mouse_x = scr_width / 2;
-               p_mouse_y = scr_height / 2;
+               p_mouse_x = vid.width / 2;
+               p_mouse_y = vid.height / 2;
                XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
        }
-
 }
 
-static void IN_DeactivateMouse( void )
+static void *prjobj = NULL;
+
+static void GL_CloseLibrary(void)
 {
-       if (!mouse_avail || !vidx11_display || !win)
-               return;
+       if (prjobj)
+               dlclose(prjobj);
+       prjobj = NULL;
+       gl_driver[0] = 0;
+       qglXGetProcAddressARB = NULL;
+       gl_extensions = "";
+       gl_platform = "";
+       gl_platformextensions = "";
+}
 
-       if (mouse_active)
+static int GL_OpenLibrary(const char *name)
+{
+       Con_Printf("Loading OpenGL driver %s\n", name);
+       GL_CloseLibrary();
+       if (!(prjobj = dlopen(name, RTLD_LAZY)))
        {
-               uninstall_grabs();
-               mouse_active = false;
+               Con_Printf("Unable to open symbol list for %s\n", name);
+               return false;
        }
+       strcpy(gl_driver, name);
+       return true;
 }
 
-static void IN_ActivateMouse( void )
+void *GL_GetProcAddress(const char *name)
 {
-       if (!mouse_avail || !vidx11_display || !win)
-               return;
-
-       if (!mouse_active)
-       {
-               mouse_x = mouse_y = 0; // don't spazz
-               install_grabs();
-               mouse_active = true;
-       }
+       void *p = NULL;
+       if (qglXGetProcAddressARB != NULL)
+               p = (void *) qglXGetProcAddressARB(name);
+       if (p == NULL)
+               p = (void *) dlsym(prjobj, name);
+       return p;
 }
 
 void VID_Shutdown(void)
@@ -536,21 +564,20 @@ void VID_Shutdown(void)
        if (!ctx || !vidx11_display)
                return;
 
-       vid_hidden = true;
-       usingmouse = false;
        if (vidx11_display)
        {
+               IN_Activate(false);
                VID_RestoreSystemGamma();
-               uninstall_grabs();
 
                // FIXME: glXDestroyContext here?
-               if (vidmode_active)
+               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;
@@ -561,7 +588,7 @@ void VID_Shutdown(void)
 
 void signal_handler(int sig)
 {
-       printf("Received signal %d, exiting...\n", sig);
+       Con_Printf("Received signal %d, exiting...\n", sig);
        VID_RestoreSystemGamma();
        Sys_Quit();
        exit(0);
@@ -581,48 +608,33 @@ 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);
        }
 }
 
@@ -638,9 +650,12 @@ int VID_GetGamma(unsigned short *ramps)
 
 void VID_Init(void)
 {
+#ifndef __APPLE__
        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;
 }
@@ -662,7 +677,7 @@ void VID_BuildGLXAttrib(int *attrib, int stencil)
        *attrib++ = None;
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
+int VID_InitMode(int fullscreen, int width, int height, int bpp)
 {
        int i;
        int attrib[32];
@@ -673,7 +688,14 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
        int MajorVersion, MinorVersion;
        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];
@@ -685,7 +707,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
 
        if (!(vidx11_display = XOpenDisplay(NULL)))
        {
-               Con_Printf("Couldn't open the X display\n");
+               Con_Print("Couldn't open the X display\n");
                return false;
        }
 
@@ -712,11 +734,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
                return false;
        }
 
-       VID_BuildGLXAttrib(attrib, stencil);
+       VID_BuildGLXAttrib(attrib, bpp == 32);
        visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
        if (!visinfo)
        {
-               Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
+               Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n");
                return false;
        }
 
@@ -756,7 +778,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
 
                                // change to the mode
                                XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
-                               vidmode_active = true;
+                               vid_isfullscreen = true;
 
                                // Move the viewport to top left
                                XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
@@ -775,7 +797,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
        // 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;
@@ -794,7 +816,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
        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);
@@ -808,18 +830,24 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
 
        ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
        if (!ctx)
-               Sys_Error ("glXCreateContext failed\n");
+       {
+               Con_Printf ("glXCreateContext failed\n");
+               return false;
+       }
 
        if (!qglXMakeCurrent(vidx11_display, win, ctx))
-               Sys_Error ("glXMakeCurrent failed\n");
+       {
+               Con_Printf ("glXMakeCurrent failed\n");
+               return false;
+       }
 
        XSync(vidx11_display, False);
 
-       scr_width = width;
-       scr_height = height;
-
        if ((qglGetString = GL_GetProcAddress("glGetString")) == NULL)
-               Sys_Error("glGetString not found in %s", gl_driver);
+       {
+               Con_Printf ("glGetString not found in %s", gl_driver);
+               return false;
+       }
 
        gl_renderer = qglGetString(GL_RENDERER);
        gl_vendor = qglGetString(GL_VENDOR);
@@ -828,12 +856,21 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
        gl_platform = "GLX";
        gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen);
 
+       gl_videosyncavailable = false;
+
+// COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
+// COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
+// COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
        GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false);
-       gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false);
+// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control
+// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control
+// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control
+       gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
 
-       usingmouse = false;
+       vid_usingmouse = false;
+       vid_usingvsync = false;
        vid_hidden = false;
-       vid_allowhwgamma = true;
+       vid_activewindow = true;
        GL_Init();
        return true;
 }
@@ -843,57 +880,13 @@ void Sys_SendKeyEvents(void)
        HandleEvents();
 }
 
-/*
-===========
-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 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;
+               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;
 }
-