RecreateDisplayResources() and fix Linux res switching

Author: morganchristiansson

CGame.h

@@ -42,6 +42,7 @@ class CGame
     CFont lastFps;
 
     Uint32 lastFrameTime = 0;
+    unsigned suppressResizeEvents_ = 0;
 
     // structure for mouse cursor
     struct
@@ -65,6 +66,7 @@ class CGame
     std::unique_ptr<CMap> MapObj;
 
     void SetAppIcon();
+    void RecreateDisplayResources();
 
 public:
     CGame(Extent GameResolution_, bool fullscreen_);

CGame_Event.cpp

@@ -385,6 +385,11 @@ void CGame::EventHandling(SDL_Event* Event)
         {
             if(Event->window.event == SDL_WINDOWEVENT_RESIZED)
             {
+                if(suppressResizeEvents_ > 0)
+                {
+                    suppressResizeEvents_--;
+                    break; // Skip stale event from our own window recreation
+                }
                 UpdateDisplaySize(Extent(Event->window.data1, Event->window.data2));
             }
             break;

CGame_Init.cpp

@@ -19,6 +19,7 @@
 
 bool CGame::ReCreateWindow()
 {
+    suppressResizeEvents_ = 3;
     displayTexture_.reset();
     renderer_.reset();
     window_.reset();
@@ -30,23 +31,26 @@ bool CGame::ReCreateWindow()
     renderer_.reset(SDL_CreateRenderer(window_.get(), -1, 0));
     if(!renderer_)
         return false;
-    displayTexture_ = makeSdlTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, GameResolution.x,
-                                     GameResolution.y);
-    Surf_Display = makeRGBSurface(GameResolution.x, GameResolution.y, true);
+    RecreateDisplayResources();
     if(!displayTexture_ || !Surf_Display)
         return false;
 
     SetAppIcon();
     return true;
 }
 
+void CGame::RecreateDisplayResources()
+{
+    displayTexture_.reset();
+    displayTexture_ = makeSdlTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, GameResolution.x,
+                                     GameResolution.y);
+    Surf_Display = makeRGBSurface(GameResolution.x, GameResolution.y, true);
+}
+
 void CGame::UpdateDisplaySize(const Extent& newSize)
 {
     GameResolution = newSize;
-    displayTexture_.reset();
-    displayTexture_ =
-      makeSdlTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, newSize.x, newSize.y);
-    Surf_Display = makeRGBSurface(newSize.x, newSize.y, true);
+    RecreateDisplayResources();
     for(auto& menu : Menus)
         menu->resetSurface();
     for(auto& wnd : Windows)

CGame_Render.cpp

@@ -39,6 +39,7 @@ void CGame::SetAppIcon()
 
 void CGame::Render()
 {
+    suppressResizeEvents_ = 0;
     if(Extent(Surf_Display->w, Surf_Display->h) != GameResolution
        || fullscreen != ((SDL_GetWindowFlags(window_.get()) & SDL_WINDOW_FULLSCREEN) != 0))
     {