Ticket #2845: fake_fullscreen_option_v2.diff

binaries/data/config/default.cfg

@@ -26 +26 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false
 
+; Use 'fake' fullscreen mode (SDL_WINDOW_FULLSCREEN_DESKTOP)
+; when creating the game window to work around some issues
+; with true fullscreen mode (SDL_WINDOW_FULLSCREEN).
+; See details in http://trac.wildfiregames.com/ticket/2845
+fakefullscreen = true
+
 ; Show detailed tooltips (Unit stats)
 showdetailedtooltips = false
 

source/ps/VideoMode.cpp

@@ -49 +49 @@
 CVideoMode::CVideoMode() :
     m_IsFullscreen(false), m_IsInitialised(false), m_Window(NULL),
     m_PreferredW(0), m_PreferredH(0), m_PreferredBPP(0), m_PreferredFreq(0),
-    m_ConfigW(0), m_ConfigH(0), m_ConfigBPP(0), m_ConfigFullscreen(false), m_ConfigForceS3TCEnable(true),
+    m_ConfigW(0), m_ConfigH(0), m_ConfigBPP(0),
+    m_ConfigFullscreen(false), m_ConfigFakeFullscreen(true), m_ConfigForceS3TCEnable(true),
     m_WindowedW(DEFAULT_WINDOW_W), m_WindowedH(DEFAULT_WINDOW_H), m_WindowedX(0), m_WindowedY(0)
 {
     // (m_ConfigFullscreen defaults to false, so users don't get stuck if
@@ -62 +63 @@
     CFG_GET_VAL("windowed", windowed);
     m_ConfigFullscreen = !windowed;
 
+    CFG_GET_VAL("fakefullscreen", m_ConfigFakeFullscreen);
+
     CFG_GET_VAL("xres", m_ConfigW);
     CFG_GET_VAL("yres", m_ConfigH);
     CFG_GET_VAL("bpp", m_ConfigBPP);
@@ -73 +76 @@
 {
     Uint32 flags = 0;
     if (fullscreen)
-        flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+        flags |= (m_ConfigFakeFullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN);
 
     if (!m_Window)
     {

source/ps/VideoMode.h

@@ -107 +107 @@
     int m_ConfigBPP;
     int m_ConfigDisplay;
     bool m_ConfigFullscreen;
+    bool m_ConfigFakeFullscreen;
     bool m_ConfigForceS3TCEnable;
 
     // If we're fullscreen, size/position of window when we were last windowed (or the default window