Updated todo

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 5035a182c07b6dc2c9970591377946ef2a0e61dc..890cf78f34704fbaf5318ab3f40bafd0cf4a49ec 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <X11/cursorfont.h>
 
 #include <X11/extensions/XShm.h>
-#if !defined(__APPLE__) && !defined(__MACH__)
+#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS)
 #include <X11/extensions/xf86dga.h>
 #endif
 #include <X11/extensions/xf86vmode.h>
@@ -93,7 +93,7 @@ static qboolean vid_usevsync = false;
 static float   mouse_x, mouse_y;
 static int p_mouse_x, p_mouse_y;
 
-#ifndef __APPLE__
+#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
@@ -207,6 +207,8 @@ static int XLateKey(XKeyEvent *ev, char *ascii)
                case XK_KP_Subtract: key = K_KP_MINUS; break;
                case XK_KP_Divide: key = K_KP_SLASH; break;
 
+               case XK_section:        key = '~'; break;
+
                default:
                        if (keysym < 32 && keysym > 126)
                                break;
@@ -263,7 +265,7 @@ static void IN_Activate (qboolean grab)
 
                        XGrabPointer(vidx11_display, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
 
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
                        if (vid_dga.integer)
                        {
                                int MajorVersion, MinorVersion;
@@ -296,7 +298,7 @@ static void IN_Activate (qboolean grab)
        {
                if (vid_usingmouse)
                {
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
                        if (vid_dga.integer)
                                XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
 #endif
@@ -346,7 +348,7 @@ static void HandleEvents(void)
                        // mouse moved
                        if (vid_usingmouse)
                        {
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
                                if (vid_dga.integer == 1)
                                {
                                        mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value;
@@ -650,7 +652,7 @@ int VID_GetGamma(unsigned short *ramps)
 
 void VID_Init(void)
 {
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
        Cvar_RegisterVariable (&vid_dga);
        Cvar_RegisterVariable (&vid_dga_mouseaccel);
 #endif
@@ -830,15 +832,24 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
        ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
        if (!ctx)
-               Sys_Error ("glXCreateContext failed\n");
+       {
+               Con_Printf ("glXCreateContext failed\n");
+               return false;
+       }
 
        if (!qglXMakeCurrent(vidx11_display, win, ctx))
-               Sys_Error ("glXMakeCurrent failed\n");
+       {
+               Con_Printf ("glXMakeCurrent failed\n");
+               return false;
+       }
 
        XSync(vidx11_display, False);
 
        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);