Merge #4528 #4535 #4538

4528: Try to fix SDL2 assertion failure (fixes #4434) r=heinrich5991 a=def-

I can't really reproduce it:

Assertion failure at SDL_GetWindowFlags_REAL (/home/deen/isos/ddnet/debian6/root/mac64/SDL2-2.0.16/src/video/SDL_video.c:1905), triggered 1 time:
'window && window->magic == &_this->window_magic'

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


4535: Explicitly disable notch area for fullscreen on macOS (fixes #4533) r=heinrich5991 a=def-

See https://developer.apple.com/documentation/bundleresources/information_property_list/nsprefersdisplaysafeareacompatibilitymode?language=objc

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


4538: Add new icons by Ravie r=heinrich5991 a=def-

<img width="752" alt="Screenshot 2021-12-27 at 23 25 59" src="https://user-images.githubusercontent.com/2335377/147511038-9c073c25-8684-4104-96a5-dc1d7ff3e904.png">

## Checklist

- [x] Tested the change ingame
- [x] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>

CMakeLists.txt

@@ -2548,6 +2548,7 @@ if(NOT DEV)
   install(FILES other/ddnet.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo COMPONENT client)
   foreach(SIZE 16 32 48 128 256 512)
     install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client)
+    install(FILES other/icons/DDNet-Server_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet-server.png COMPONENT server)
   endforeach()
 endif()
 

other/bundle/client/Info.plist.in

@@ -20,5 +20,7 @@
 		<string>org.DDNetClient.app</string>
 		<key>NSHighResolutionCapable</key>
 		<true/>
+		<key>NSPrefersDisplaySafeAreaCompatibilityMode</key>
+		<true/>
 	</dict>
 </plist>

other/icons/license.txt

@@ -1 +1 @@
-"DDNet-Server" icon is based on "Game Server" icon by Deepz from the Noun Project (Creative Commons CCBY)
+Icons by Ravie

src/engine/client/backend_sdl.cpp

@@ -1160,12 +1160,12 @@ int CGraphicsBackend_SDL_OpenGL::GetWindowScreen()
 
 int CGraphicsBackend_SDL_OpenGL::WindowActive()
 {
-	return SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_INPUT_FOCUS;
+	return m_pWindow && SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_INPUT_FOCUS;
 }
 
 int CGraphicsBackend_SDL_OpenGL::WindowOpen()
 {
-	return SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_SHOWN;
+	return m_pWindow && SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_SHOWN;
 }
 
 void CGraphicsBackend_SDL_OpenGL::SetWindowGrab(bool Grab)
@@ -1176,35 +1176,35 @@ void CGraphicsBackend_SDL_OpenGL::SetWindowGrab(bool Grab)
 void CGraphicsBackend_SDL_OpenGL::ResizeWindow(int w, int h, int RefreshRate)
 {
 	// don't call resize events when the window is at fullscreen desktop
-	if((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) != SDL_WINDOW_FULLSCREEN_DESKTOP)
+	if(!m_pWindow || (SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP)
+		return;
+
+	// if the window is at fullscreen use SDL_SetWindowDisplayMode instead, suggested by SDL
+	if(SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN)
 	{
-		// if the window is at fullscreen use SDL_SetWindowDisplayMode instead, suggested by SDL
-		if(SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN)
-		{
 #ifdef CONF_PLATFORM_WINDOWS
-			// in windows make the window windowed mode first, this prevents strange window glitches (other games probably do something similar)
-			SetWindowParams(0, 1);
+		// in windows make the window windowed mode first, this prevents strange window glitches (other games probably do something similar)
+		SetWindowParams(0, 1);
 #endif
-			SDL_DisplayMode SetMode = {};
-			SDL_DisplayMode ClosestMode = {};
-			SetMode.format = 0;
-			SetMode.w = w;
-			SetMode.h = h;
-			SetMode.refresh_rate = RefreshRate;
-			SDL_SetWindowDisplayMode(m_pWindow, SDL_GetClosestDisplayMode(g_Config.m_GfxScreen, &SetMode, &ClosestMode));
+		SDL_DisplayMode SetMode = {};
+		SDL_DisplayMode ClosestMode = {};
+		SetMode.format = 0;
+		SetMode.w = w;
+		SetMode.h = h;
+		SetMode.refresh_rate = RefreshRate;
+		SDL_SetWindowDisplayMode(m_pWindow, SDL_GetClosestDisplayMode(g_Config.m_GfxScreen, &SetMode, &ClosestMode));
 #ifdef CONF_PLATFORM_WINDOWS
-			// now change it back to fullscreen, this will restore the above set state, bcs SDL saves fullscreen modes appart from other video modes (as of SDL 2.0.16)
-			// see implementation of SDL_SetWindowDisplayMode
-			SetWindowParams(1, 0);
+		// now change it back to fullscreen, this will restore the above set state, bcs SDL saves fullscreen modes appart from other video modes (as of SDL 2.0.16)
+		// see implementation of SDL_SetWindowDisplayMode
+		SetWindowParams(1, 0);
 #endif
-		}
-		else
-		{
-			SDL_SetWindowSize(m_pWindow, w, h);
-			if(SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_MAXIMIZED)
-				// remove maximize flag
-				SDL_RestoreWindow(m_pWindow);
-		}
+	}
+	else
+	{
+		SDL_SetWindowSize(m_pWindow, w, h);
+		if(SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_MAXIMIZED)
+			// remove maximize flag
+			SDL_RestoreWindow(m_pWindow);
 	}
 }