Save / load window SDL2 window position.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>

source/frontends/common2/programoptions.cpp

@@ -189,6 +189,7 @@ namespace common2
 
       if (vm.count("geometry"))
       {
+        options.geometry.empty = false;
         parseGeometry(vm["geometry"].as<std::string>(), options.geometry);
       }
 

source/frontends/common2/programoptions.h

@@ -8,6 +8,7 @@ namespace common2
 
   struct Geometry
   {
+    bool empty = true;
     int width;
     int height;
     int x;

source/frontends/common2/utils.cpp

@@ -1,5 +1,6 @@
 #include "StdAfx.h"
 #include "frontends/common2/utils.h"
+#include "frontends/common2/programoptions.h"
 
 #include "linux/network/uthernet2.h"
 
@@ -24,6 +25,7 @@
 #include "SaveState.h"
 #include "RGBMonitor.h"
 #include "Riff.h"
+#include "Registry.h"
 #include "Utilities.h"
 #include "Interface.h"
 #include "Debugger/Debug.h"
@@ -133,4 +135,39 @@ namespace common2
     RiffFinishWriteFile();
   }
 
+  void loadGeometryFromRegistry(const std::string &section, Geometry & geometry)
+  {
+    if (geometry.empty)  // otherwise it was user provided
+    {
+      const std::string path = section + "\\geometry";
+      const auto loadValue = [&path](const char * name, int & dest)
+      {
+        DWORD value;
+        if (RegLoadValue(path.c_str(), name, TRUE, &value))
+        {
+          dest = value;
+        }
+      };
+
+      loadValue("width", geometry.width);
+      loadValue("height", geometry.height);
+      loadValue("x", geometry.x);
+      loadValue("y", geometry.y);
+    }
+  }
+
+  void saveGeometryToRegistry(const std::string &section, const Geometry & geometry)
+  {
+    const std::string path = section + "\\geometry";
+    const auto saveValue = [&path](const char * name, const int source)
+    {
+      RegSaveValue(path.c_str(), name, TRUE, source);
+    };
+
+    saveValue("width", geometry.width);
+    saveValue("height", geometry.height);
+    saveValue("x", geometry.x);
+    saveValue("y", geometry.y);
+  }
+
 }

source/frontends/common2/utils.h

@@ -4,6 +4,7 @@
 
 namespace common2
 {
+  struct Geometry;
 
   void setSnapshotFilename(const std::string & filename, const bool load);
 
@@ -11,4 +12,6 @@ namespace common2
   void InitialiseEmulator();
   void DestroyEmulator();
 
+  void loadGeometryFromRegistry(const std::string &section, Geometry & geometry);
+  void saveGeometryToRegistry(const std::string &section, const Geometry & geometry);
 }

source/frontends/sdl/main.cpp

@@ -67,6 +67,7 @@ void run_sdl(int argc, const char * argv [])
   const int sw = video.GetFrameBufferBorderlessWidth();
   const int sh = video.GetFrameBufferBorderlessHeight();
 
+  options.geometry.empty = true;
   options.geometry.width = sw * 2;
   options.geometry.height = sh * 2;
   options.geometry.x = SDL_WINDOWPOS_UNDEFINED;
@@ -79,6 +80,8 @@ void run_sdl(int argc, const char * argv [])
   const LoggerContext logger(options.log);
   const RegistryContext registryContext(CreateFileRegistry(options));
 
+  common2::loadGeometryFromRegistry("sa2", options.geometry);
+
   std::shared_ptr<sa2::SDLFrame> frame;
   if (options.imgui)
   {

source/frontends/sdl/sdlframe.cpp

@@ -136,6 +136,18 @@ namespace sa2
   {
   }
 
+  void SDLFrame::Destroy()
+  {
+    if (!myFullscreen)
+    {
+      common2::Geometry geometry;
+      SDL_GetWindowPosition(myWindow.get(), &geometry.x, &geometry.y);
+      SDL_GetWindowSize(myWindow.get(), &geometry.width, &geometry.height);
+      saveGeometryToRegistry("sa2", geometry);
+      common2::CommonFrame::Destroy();
+    }
+  }
+
   void SDLFrame::setGLSwapInterval(const int interval)
   {
     const int current = SDL_GL_GetSwapInterval();

source/frontends/sdl/sdlframe.h

@@ -19,6 +19,7 @@ namespace sa2
     SDLFrame(const common2::EmulatorOptions & options);
 
     void Initialize() override;
+    void Destroy() override;
 
     void FrameRefreshStatus(int drawflags) override;
     int FrameMessageBox(LPCSTR lpText, LPCSTR lpCaption, UINT uType) override;