Use SDL_GetWindowSize and SDL_WarpMouseInWindow in Windows (#443)

Add few WindowSize and WarpMouseInWindow to class OSWindow
Remove few related #ifdef _WIN32

Author: q4a

src/libs/window/include/os_window.hpp

@@ -6,6 +6,12 @@
 
 namespace storm
 {
+struct WindowSize
+{
+    int width{};
+    int height{};
+};
+
 //! Abstract window
 class OSWindow
 {
@@ -38,6 +44,8 @@ class OSWindow
     virtual int Width() const = 0;
     //! Current height of window
     virtual int Height() const = 0;
+    //! Current window size
+    virtual WindowSize GetWindowSize() const = 0;
     //! Is window fullscreen
     virtual bool Fullscreen() const = 0;
     //! Window title
@@ -47,6 +55,8 @@ class OSWindow
     virtual void SetFullscreen(bool fullscreen) = 0;
     //! Resize window
     virtual void Resize(int width, int height) = 0;
+    //! Warp mouse
+    virtual void WarpMouseInWindow(int x, int y) = 0;
     //! Set window title
     virtual void SetTitle(const std::string &title) = 0;
     //! Set window gamma

src/libs/window/src/sdl_window.cpp

@@ -55,6 +55,13 @@ int SDLWindow::Height() const
     return h;
 }
 
+WindowSize SDLWindow::GetWindowSize() const
+{
+    int w, h;
+    SDL_GetWindowSize(window_.get(), &w, &h);
+    return {w, h};
+}
+
 bool SDLWindow::Fullscreen() const
 {
     return fullscreen_;
@@ -76,6 +83,11 @@ void SDLWindow::Resize(int width, int height)
     SDL_SetWindowSize(window_.get(), width, height);
 }
 
+void SDLWindow::WarpMouseInWindow(int x, int y)
+{
+    SDL_WarpMouseInWindow(window_.get(), x, y);
+}
+
 void SDLWindow::SetTitle(const std::string &title)
 {
     SDL_SetWindowTitle(window_.get(), title.c_str());

src/libs/window/src/sdl_window.hpp

@@ -18,11 +18,13 @@ class SDLWindow : public OSWindow
 
     int Width() const override;
     int Height() const override;
+    WindowSize GetWindowSize() const override;
     bool Fullscreen() const override;
     std::string Title() const override;
 
     void SetFullscreen(bool fullscreen) override;
     void Resize(int width, int height) override;
+    void WarpMouseInWindow(int x, int y) override;
     void SetTitle(const std::string &title) override;
     void SetGamma(const uint16_t (&red)[256], const uint16_t (&green)[256], const uint16_t (&blue)[256]) override;
 

src/libs/xinterface/src/xinterface.cpp

@@ -1067,20 +1067,12 @@ void XINTERFACE::LoadIni()
     if (!ini)
         throw std::runtime_error("ini file not found!");
 
-    int sdlScreenWidth, sdlScreenHeight;
-#ifdef _WIN32 // FIX_LINUX GetWindowRect
-    RECT Screen_Rect;
-    GetWindowRect(static_cast<HWND>(core.GetWindow()->OSHandle()), &Screen_Rect);
-    sdlScreenWidth = Screen_Rect.right - Screen_Rect.left;
-    sdlScreenHeight = Screen_Rect.bottom - Screen_Rect.top;
-#else
-    SDL_GetWindowSize(reinterpret_cast<SDL_Window *>(core.GetWindow()->OSHandle()), &sdlScreenWidth, &sdlScreenHeight);
-#endif
+    auto windowSize = core.GetWindow()->GetWindowSize();
 
     fScale = 1.0f;
     const auto screenSize = core.GetScreenSize();
     dwScreenHeight = screenSize.height;
-    dwScreenWidth = sdlScreenWidth * dwScreenHeight / sdlScreenHeight;
+    dwScreenWidth = windowSize.width * dwScreenHeight / windowSize.height;
     if (dwScreenWidth < screenSize.width)
         dwScreenWidth = screenSize.width;
     GlobalScreenRect.top = 0;
@@ -1092,7 +1084,7 @@ void XINTERFACE::LoadIni()
     bool sectionFound = false;
     if (ini->GetSectionName(platform, sizeof(platform) - 1))
     {
-        float windowRatio = (float)sdlScreenWidth / (float)sdlScreenHeight;
+        float windowRatio = (float)windowSize.width / (float)windowSize.height;
         float iniRatio;
         char splitPlatform[23], *platformW, *platformH;
         do
@@ -1163,13 +1155,7 @@ void XINTERFACE::LoadIni()
     sscanf(param, "%[^,],%d,size:(%d,%d),pos:(%d,%d)", param2, &m_lMouseSensitive, &MouseSize.x, &MouseSize.y,
            &m_lXMouse, &m_lYMouse);
     m_idTex = pRenderService->TextureCreate(param2);
-    //  RECT Screen_Rect;
-    //  GetWindowRect(core.GetAppHWND(), &Screen_Rect);
-#ifdef _WIN32 // FIX_LINUX Cursor
-    lock_x = Screen_Rect.left + (Screen_Rect.right - Screen_Rect.left) / 2;
-    lock_y = Screen_Rect.top + (Screen_Rect.bottom - Screen_Rect.top) / 2;
-    SetCursorPos(lock_x, lock_y);
-#endif
+    core.GetWindow()->WarpMouseInWindow(windowSize.width / 2, windowSize.height / 2);
     fXMousePos = static_cast<float>(dwScreenWidth / 2);
     fYMousePos = static_cast<float>(dwScreenHeight / 2);
     for (int i = 0; i < 4; i++)