From d402c1e3ece07bd33bae11be87280a91c1d34dfd Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Tue, 10 Aug 2021 16:21:37 +0200
Subject: [PATCH] Use SDL2's fake fullscreen mode instead of the exclusive one.

Also don't maximize the window before toggling fullscreen and hide the mouse pointer if the window size equals the desktop size to also account for the macOS native fullscreen toggle.
---
 src/projectM-sdl/pmSDL.cpp | 25 +++++++++----------------
 src/projectM-sdl/pmSDL.hpp |  1 -
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/projectM-sdl/pmSDL.cpp b/src/projectM-sdl/pmSDL.cpp
index 7295c5d18..5abebf99c 100644
--- a/src/projectM-sdl/pmSDL.cpp
+++ b/src/projectM-sdl/pmSDL.cpp
@@ -63,19 +63,6 @@ void projectMSDL::setHelpText(const std::string& helpText)
     projectm_set_help_text(_projectM, helpText.c_str());
 }
 
-void projectMSDL::maximize()
-{
-    SDL_DisplayMode dm;
-    if (SDL_GetDesktopDisplayMode(0, &dm) != 0)
-    {
-        SDL_Log("SDL_GetDesktopDisplayMode failed: %s", SDL_GetError());
-        return;
-    }
-
-    SDL_SetWindowSize(win, dm.w, dm.h);
-    resize(dm.w, dm.h);
-}
-
 /* Stretch projectM across multiple monitors */
 void projectMSDL::stretchMonitors()
 {
@@ -153,7 +140,6 @@ void projectMSDL::nextMonitor()
 
 void projectMSDL::toggleFullScreen()
 {
-    maximize();
     if (isFullScreen)
     {
         SDL_SetWindowFullscreen(win, 0);
@@ -163,7 +149,7 @@ void projectMSDL::toggleFullScreen()
     else
     {
         SDL_ShowCursor(false);
-        SDL_SetWindowFullscreen(win, SDL_WINDOW_FULLSCREEN);
+        SDL_SetWindowFullscreen(win, SDL_WINDOW_FULLSCREEN_DESKTOP);
         isFullScreen = true;
     }
 }
@@ -355,7 +341,14 @@ void projectMSDL::resize(unsigned int width_, unsigned int height_)
 {
     width = width_;
     height = height_;
-    projectm_set_window_size(_projectM, width, height);
+
+		// Hide cursor if window size equals desktop size
+	  SDL_DisplayMode dm;
+	  if (SDL_GetDesktopDisplayMode(0, &dm) == 0) {
+		    SDL_ShowCursor(isFullScreen ? SDL_DISABLE : SDL_ENABLE);
+	  }
+
+	  projectm_set_window_size(_projectM, width, height);
 }
 
 void projectMSDL::pollEvent()
diff --git a/src/projectM-sdl/pmSDL.hpp b/src/projectM-sdl/pmSDL.hpp
index c68cf29e8..915319a18 100644
--- a/src/projectM-sdl/pmSDL.hpp
+++ b/src/projectM-sdl/pmSDL.hpp
@@ -122,7 +122,6 @@ public:
     void setHelpText(const std::string& theValue);
     void renderFrame();
     void pollEvent();
-    void maximize();
     bool keymod = false;
     std::string getActivePresetName();
     void addFakePCM();