SDL: avoid saving dimensions of fullscreen window

Author: chrisws

src/platform/sdl/main.cpp

@@ -405,11 +405,12 @@ int main(int argc, char* argv[]) {
       Runtime *runtime = new Runtime(window);
       runtime->construct(font.c_str(), fontBold.c_str());
       fontScale = runtime->runShell(runFile, fontScale, debug ? g_debugPort : 0);
+      rect = runtime->getWindowRect();
       delete runtime;
     } else {
       fprintf(stderr, "Failed to locate display font\n");
     }
-    saveSettings(window, fontScale, debug);
+    saveSettings(rect, fontScale, debug);
     SDL_DestroyWindow(window);
   } else {
     fprintf(stderr, "Could not create window: %s\n", SDL_GetError());

src/platform/sdl/runtime.cpp

@@ -296,6 +296,9 @@ void Runtime::exportRun(const char *file) {
 }
 
 bool Runtime::toggleFullscreen() {
+  if (!_fullscreen) {
+    setWindowRect(_windowRect);
+  }
   _fullscreen = !_fullscreen;
   SDL_SetWindowFullscreen(_window, _fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
   return _fullscreen;
@@ -815,6 +818,21 @@ void Runtime::optionsBox(StringList *items) {
   _output->redraw();
 }
 
+SDL_Rect Runtime::getWindowRect() {
+  SDL_Rect result;
+  if (_fullscreen) {
+    result = _windowRect;
+  } else {
+    setWindowRect(result);
+  }
+  return result;
+}
+
+void Runtime::setWindowRect(SDL_Rect &rc) {
+  SDL_GetWindowPosition(_window, &rc.x, &rc.y);
+  SDL_GetWindowSize(_window, &rc.w, &rc.h);
+}
+
 void Runtime::setClipboardText(const char *text) {
   SDL_SetClipboardText(text);
 }

src/platform/sdl/runtime.h

@@ -54,10 +54,13 @@ struct Runtime : public System {
   void onResize(int w, int h);
   void setClipboardText(const char *text);
   char *getClipboardText();
+  void setWindowRect(SDL_Rect &rect);
+  SDL_Rect getWindowRect();
 
 private:
   int _menuX, _menuY;
   bool _fullscreen;
+  SDL_Rect _windowRect;
   Graphics *_graphics;
   Stack<MAEvent *> *_eventQueue;
   SDL_Window *_window;

src/platform/sdl/settings.cpp

@@ -217,13 +217,10 @@ void restoreSettings(SDL_Rect &rect, int &fontScale, bool debug, bool restoreDir
 //
 // save the window position
 //
-void saveSettings(SDL_Window *window, int fontScale, bool debug) {
+void saveSettings(SDL_Rect &rect, int fontScale, bool debug) {
   FILE *fp = openConfig(false, debug ? k_debug : k_window);
   if (fp) {
-    int x, y, w, h;
-    SDL_GetWindowPosition(window, &x, &y);
-    SDL_GetWindowSize(window, &w, &h);
-    fprintf(fp, "%d,%d,%d,%d,%d,%d,%d,%d\n", x, y, w, h,
+    fprintf(fp, "%d,%d,%d,%d,%d,%d,%d,%d\n", rect.x, rect.y, rect.w, rect.h,
             fontScale, opt_mute_audio, opt_ide, g_themeId);
     // print user theme colours on the second line
     for (int i = 0; i < THEME_COLOURS; i++) {

src/platform/sdl/settings.h

@@ -12,7 +12,7 @@
 #include <SDL.h>
 
 void restoreSettings(SDL_Rect &rect, int &fontScale, bool debug, bool restoreDir);
-void saveSettings(SDL_Window *window, int fontScale, bool debug);
+void saveSettings(SDL_Rect &rect, int fontScale, bool debug);
 String saveGist(const char *buffer, const char *fileName, const char *description);
 void setRecentFile(const char *path);
 bool getRecentFile(strlib::String &path, unsigned position);