aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl/sdl-window.h
diff options
context:
space:
mode:
authorColin Snover2017-02-12 19:17:33 -0600
committerColin Snover2017-07-06 19:11:54 -0500
commit332fabcb8a0ff3957f0198ad3b93b4f3861f7eba (patch)
tree0568f55085e32c4a6497edfb986ef635f9f4351a /backends/platform/sdl/sdl-window.h
parent6d37e1e88cf5c34e48c47cba74c21f89daa94178 (diff)
downloadscummvm-rg350-332fabcb8a0ff3957f0198ad3b93b4f3861f7eba.tar.gz
scummvm-rg350-332fabcb8a0ff3957f0198ad3b93b4f3861f7eba.tar.bz2
scummvm-rg350-332fabcb8a0ff3957f0198ad3b93b4f3861f7eba.zip
SDL: Only recreate SDL2 window when necessary
Destroying and recreating the SDL window whenever the video mode changes in SDL2 is not necessary and causes several problems: 1. In windowed mode, the game window shifts position; 2. In fullscreen mode in macOS, every time the window is recreated, it causes the OS to play its switch-to-fullscreen animation again and emit system alert noises; 3. The window content flickers; and 4. The engine loses events from the old destroyed window. This patch changes the SDL backend code to avoid destroying and recreating the SDL window when using SDL2, except when switching OpenGL modes, since there is no way to change the OpenGL feature of a window. There are still some outstanding issues with OpenGL where window size ends up getting reset even though the user has resized it; this will probably need to be addressed at some point in another patch. Thanks to @bgK and @criezy for their feedback which made this patch much better. Co-Authored-By: Bastien Bouclet <bastien.bouclet@gmail.com>
Diffstat (limited to 'backends/platform/sdl/sdl-window.h')
-rw-r--r--backends/platform/sdl/sdl-window.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/backends/platform/sdl/sdl-window.h b/backends/platform/sdl/sdl-window.h
index b62860960d..d75e811f56 100644
--- a/backends/platform/sdl/sdl-window.h
+++ b/backends/platform/sdl/sdl-window.h
@@ -81,14 +81,14 @@ public:
SDL_Window *getSDLWindow() const { return _window; }
/**
- * Creates a new SDL window (and destroys the old one).
+ * Creates or updates the SDL window.
*
* @param width Width of the window.
* @param height Height of the window.
* @param flags SDL flags passed to SDL_CreateWindow
* @return true on success, false otherwise
*/
- bool createWindow(int width, int height, uint32 flags);
+ bool createOrUpdateWindow(int width, int height, uint32 flags);
/**
* Destroys the current SDL window.
@@ -99,6 +99,15 @@ protected:
SDL_Window *_window;
private:
+ uint32 _lastFlags;
+
+ /**
+ * Switching between software and OpenGL modes requires the window to be
+ * destroyed and recreated. These properties store the position of the last
+ * window so the new window will be created in the same place.
+ */
+ int _lastX, _lastY;
+
bool _inputGrabState;
Common::String _windowCaption;
#endif