Date: Mon, 24 Feb 2003 16:31:25 -0500
authorSam Lantinga <slouken@libsdl.org>
Thu, 06 Mar 2003 06:02:16 +0000
changeset 60431d3af76488b
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
     1.1 --- a/src/video/x11/SDL_x11modes.c	Thu Mar 06 05:57:29 2003 +0000
     1.2 +++ b/src/video/x11/SDL_x11modes.c	Thu Mar 06 06:02:16 2003 +0000
     1.3 @@ -113,10 +113,16 @@
     1.4              }
     1.5  #endif
     1.6              for ( i = nmodes-1; i > 0 ; --i ) {
     1.7 +                if ( (modes[i]->hdisplay == width) &&
     1.8 +                     (modes[i]->vdisplay == height) )
     1.9 +                    goto match;
    1.10 +            }
    1.11 +            for ( i = nmodes-1; i > 0 ; --i ) {
    1.12                  if ( (modes[i]->hdisplay >= width) &&
    1.13                       (modes[i]->vdisplay >= height) )
    1.14                      break;
    1.15              }
    1.16 +       match:
    1.17              if ( (modes[i]->hdisplay != mode.hdisplay) ||
    1.18                   (modes[i]->vdisplay != mode.vdisplay) ) {
    1.19                  SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, modes[i]);