From b4001bd1ff00aea297ffeac3f80de5ba79dc3e2e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 7 Jul 2001 08:08:42 +0000 Subject: [PATCH] Fix to allow SDL compiled under XFree v4 to work with XFree v3 xservers. Contributed by Jarek Sobieszek --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%4091 --- src/video/x11/SDL_x11gamma.c | 4 ++-- src/video/x11/SDL_x11modes.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video/x11/SDL_x11gamma.c b/src/video/x11/SDL_x11gamma.c index 897e0198d..b28794890 100644 --- 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 index dc2238544..3199d4806 100644 --- 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 */