restore the wrapping behavior on tcMod scroll for compatibility reasons

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 9fff961384005f85c53818c1a6a25c1f7214a9c7..abb90970eac7c6a031a2f21e582424473331f36f 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -91,6 +91,7 @@ static SDL_Window *window;
 static int window_flags;
 #endif
 static SDL_Surface *vid_softsurface;
+static vid_mode_t desktop_mode;
 
 /////////////////////////
 // Input handling
@@ -2474,21 +2475,36 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        // Knghtbrd: should do platform-specific extension string function here
 
        vid_isfullscreen = false;
-       if (mode->fullscreen) {
 #if SDL_MAJOR_VERSION == 1
+       {
                SDL_VideoInfo *vi = SDL_GetVideoInfo();
-               mode->width = vi->current_w;
-               mode->height = vi->current_h;
-               mode->bitsperpixel = vi->vfmt->BitsPerPixel;
-               flags |= SDL_FULLSCREEN;
+               desktop_mode.width = vi->current_w;
+               desktop_mode.height = vi->current_h;
+               desktop_mode.bpp = vi->vfmt->BitsPerPixel;
+               desktop_mode.pixelheight_num = 1;
+               desktop_mode.pixelheight_denom = 1; // SDL does not provide this
+               if (mode->fullscreen) {
+                       if (vid_desktopfullscreen.integer)
+                       {
+                               mode->width = vi->current_w;
+                               mode->height = vi->current_h;
+                               mode->bitsperpixel = vi->vfmt->BitsPerPixel;
+                       }
+                       flags |= SDL_FULLSCREEN;
+                       vid_isfullscreen = true;
+               }
+       }
 #else
-               if (vid_desktopfullscreen.integer)
-                       windowflags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
-               else
-                       windowflags |= SDL_WINDOW_FULLSCREEN;
-#endif
-               vid_isfullscreen = true;
+       {
+               if (mode->fullscreen) {
+                       if (vid_desktopfullscreen.integer)
+                               windowflags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+                       else
+                               windowflags |= SDL_WINDOW_FULLSCREEN;
+                       vid_isfullscreen = true;
+               }
        }
+#endif
        //flags |= SDL_HWSURFACE;
 
        SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
@@ -2855,6 +2871,27 @@ void VID_Finish (void)
        }
 }
 
+vid_mode_t *VID_GetDesktopMode(void)
+{
+#if SDL_MAJOR_VERSION != 1
+       SDL_DisplayMode mode;
+       int bpp;
+       Uint32 rmask, gmask, bmask, amask;
+       SDL_GetDesktopDisplayMode(0, &mode);
+       SDL_PixelFormatEnumToMasks(mode.format, &bpp, &rmask, &gmask, &bmask, &amask);
+       modes[k].width = mode.w;
+       modes[k].height = mode.h;
+       modes[k].bpp = bpp;
+       modes[k].refreshrate = mode.refreshrate;
+       modes[k].pixelheight_num = 1;
+       modes[k].pixelheight_denom = 1; // SDL does not provide this
+       // TODO check whether this actually works, or whether we do still need
+       // a read-window-size-after-entering-desktop-fullscreen hack for
+       // multiscreen setups.
+#endif
+       return &desktop_mode;
+}
+
 size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
 {
        size_t k = 0;
@@ -2886,9 +2923,9 @@ size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
                        continue;
                modes[k].width = mode.w;
                modes[k].height = mode.h;
+               // FIXME bpp?
                modes[k].refreshrate = mode.refresh_rate;
                modes[k].pixelheight_num = 1;
-               modes[k].pixelheight_num = 1;
                modes[k].pixelheight_denom = 1; // SDL does not provide this
                k++;
        }