Date: Mon, 24 Feb 2003 16:31:25 -0500
authorSam Lantinga <slouken@libsdl.org>
Thu, 06 Mar 2003 06:02:16 +0000
changeset 604 31d3af76488b
parent 603 2e726be3dc08
child 605 6399f4e90211
Date: Mon, 24 Feb 2003 16:31:25 -0500 From: Ragnvald "Despair" Maartmann-Moe IV Subject: SDL x11 video mode selection bug Hi, I've found an oddity with video mode selection. I recently added a bunch of oddball video modes to my XF86Config, to support weird resolutions xine & mplayer need if I don't want to beat my cpu up with video scaling. Since adding them, SDL started picking the biggest video mode it could find that matched the height constraint. Getting a narrow vertical strip of QuakeForge (I code for the project, so needless to say it's my favorite test) in the middle of an 800x480 screen, instead of the 640x480 I asked for annoys me tremendously. So here's a patch that tries a bit harder to get an exact match. I didn't touch the XiG section, since I can't test that, but I'd bet a similar patch would prevent similar problems there. --Ragnvald "Despair" Maartmann-Moe IV
src/video/x11/SDL_x11modes.c
--- a/src/video/x11/SDL_x11modes.c	Thu Mar 06 05:57:29 2003 +0000
+++ b/src/video/x11/SDL_x11modes.c	Thu Mar 06 06:02:16 2003 +0000
@@ -113,10 +113,16 @@
             }
 #endif
             for ( i = nmodes-1; i > 0 ; --i ) {
+                if ( (modes[i]->hdisplay == width) &&
+                     (modes[i]->vdisplay == height) )
+                    goto match;
+            }
+            for ( i = nmodes-1; i > 0 ; --i ) {
                 if ( (modes[i]->hdisplay >= width) &&
                      (modes[i]->vdisplay >= height) )
                     break;
             }
+       match:
             if ( (modes[i]->hdisplay != mode.hdisplay) ||
                  (modes[i]->vdisplay != mode.vdisplay) ) {
                 SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, modes[i]);