Fix to allow SDL compiled under XFree v4 to work with XFree v3 xservers.

Contributed by Jarek Sobieszek
libsdl-org · Jul 7, 2001 · 21ccfba · 21ccfba
1 parent c56dbd3
commit 21ccfba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/video/x11/SDL_x11gamma.c b/src/video/x11/SDL_x11gamma.c
@@ -37,7 +37,7 @@ static char rcsid =
 static int X11_SetGammaNoLock(_THIS, float red, float green, float blue)
 {
 #ifdef XFREE86_VMGAMMA
-    if (use_vidmode) {
+    if (use_vidmode >= 2) {
         XF86VidModeGamma gamma;
         Bool succeeded;
 
@@ -98,7 +98,7 @@ int X11_SetVidModeGamma(_THIS, float red, float green, float blue)
 static int X11_GetGammaNoLock(_THIS, float *red, float *green, float *blue)
 {
 #ifdef XFREE86_VMGAMMA
-    if (use_vidmode) {
+    if (use_vidmode >= 2) {
         XF86VidModeGamma gamma;
         if (XVidMode(GetGamma, (SDL_Display, SDL_Screen, &gamma))) {
             *red   = gamma.red;

diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
@@ -271,7 +271,7 @@ int X11_GetVideoModes(_THIS)
         }
         XFree(modes);
 
-        use_vidmode = 1;
+        use_vidmode = vm_major;
         save_mode(this);
     }
 #endif /* XFREE86_VM */