Remove v_glslgamma cvar (now assumed to be 1) and corresponding code like R_DrawGamma.

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 9e33fdc91f7fe5c631f1ef9a6ac284dca719abd2..4c5c9c9d02f6b5b852b5dce49712289cd66a015d 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -119,11 +119,9 @@ static qboolean vid_usingmouse = false;
 static qboolean vid_usinghidecursor = false;
 static qboolean vid_usingvsync = false;
 static qboolean vid_usevsync = false;
-static qboolean vid_x11_hardwaregammasupported = false;
 #ifdef USEDGA
 static qboolean vid_x11_dgasupported = false;
 #endif
-static int vid_x11_gammarampsize = 0;
 
 #ifdef USEDGA
 cvar_t vid_dgamouse = {CVAR_SAVE, "vid_dgamouse", "0", "make use of DGA mouse input"};
@@ -284,6 +282,10 @@ static int XLateKey(XKeyEvent *ev, Uchar *ascii)
                case XK_KP_Subtract: key = K_KP_MINUS; break;
                case XK_KP_Divide: key = K_KP_SLASH; break;
 
+               case XK_Num_Lock: key = K_NUMLOCK; break;
+               case XK_Caps_Lock: key = K_CAPSLOCK; break;
+               case XK_Scroll_Lock: key = K_SCROLLOCK; break;
+
                case XK_asciicircum:    *ascii = key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2
 
                case XK_section:        *ascii = key = '~'; break;
@@ -701,7 +703,6 @@ static void HandleEvents(void)
                                break;
                        // window restored
                        vid_hidden = false;
-                       VID_RestoreSystemGamma();
 
                        if(vid_isvidmodefullscreen)
                        {
@@ -738,7 +739,6 @@ static void HandleEvents(void)
                                break;
                        // window iconified/rolledup/whatever
                        vid_hidden = true;
-                       VID_RestoreSystemGamma();
 
                        if(vid_isvidmodefullscreen)
                                XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
@@ -775,7 +775,6 @@ static void HandleEvents(void)
 
                        // window is no longer the input focus
                        vid_activewindow = false;
-                       VID_RestoreSystemGamma();
 
                        break;
                case EnterNotify:
@@ -851,7 +850,6 @@ void VID_Shutdown(void)
 
        VID_EnableJoystick(false);
        VID_SetMouse(false, false, false);
-       VID_RestoreSystemGamma();
 
        // FIXME: glXDestroyContext here?
        if (vid_isvidmodefullscreen)
@@ -883,13 +881,11 @@ void VID_Shutdown(void)
        ctx = NULL;
 
        GL_CloseLibrary();
-       Key_ClearStates ();
 }
 
 static void signal_handler(int sig)
 {
        Con_Printf("Received signal %d, exiting...\n", sig);
-       VID_RestoreSystemGamma();
        Sys_Quit(1);
 }
 
@@ -964,18 +960,7 @@ void VID_Finish (void)
                        break;
        }
 
-       if (vid_x11_hardwaregammasupported)
-               VID_UpdateGamma(false, vid_x11_gammarampsize);
-}
-
-int VID_SetGamma(unsigned short *ramps, int rampsize)
-{
-       return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
-}
-
-int VID_GetGamma(unsigned short *ramps, int rampsize)
-{
-       return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
+       VID_UpdateGamma();
 }
 
 void VID_Init(void)
@@ -1312,7 +1297,6 @@ static qboolean VID_InitModeSoft(viddef_mode_t *mode)
        vid_usingvsync = false;
        vid_hidden = false;
        vid_activewindow = true;
-       vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0;
 #ifdef USEDGA
        vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion);
        if (!vid_x11_dgasupported)
@@ -1659,7 +1643,6 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        vid_usingvsync = false;
        vid_hidden = false;
        vid_activewindow = true;
-       vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0;
 #ifdef USEDGA
        vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion);
        if (!vid_x11_dgasupported)