Change handling of NSAutoreleasePool

GUI toolkits such as wxWidgets and Qt provide their own NSAutoreleasePool
objects. To avoid pool corruption, it is required that the pools be nested,
which the previous implementation did not guarantee. Furthermore, autorelease
pools should always be drained in the same context (function, loop, etc.) that
they are created, which was not the case with the previous implementation
(https://developer.apple.com/documentation/foundation/nsautoreleasepool).

This commit complete removes the AutoreleasePoolWrapper, and functions that use
autorelease create and drain their own pools.

Should fix crashes in issue SFML#1549 and similar.

src/SFML/Window/CMakeLists.txt

@@ -182,8 +182,6 @@ elseif(SFML_OS_MACOSX)
         ${SRCROOT}/OSX/WindowImplCocoa.hpp
         ${SRCROOT}/OSX/WindowImplCocoa.mm
         ${SRCROOT}/OSX/WindowImplDelegateProtocol.h
-        ${SRCROOT}/OSX/AutoreleasePoolWrapper.h
-        ${SRCROOT}/OSX/AutoreleasePoolWrapper.mm
     )
     source_group("mac" FILES ${PLATFORM_SRC})
 elseif(SFML_OS_IOS)

src/SFML/Window/OSX/CursorImpl.mm

@@ -28,7 +28,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/OSX/CursorImpl.hpp>
 
-#import <SFML/Window/OSX/AutoreleasePoolWrapper.h>
 #import <SFML/Window/OSX/NSImage+raw.h>
 #import <AppKit/AppKit.h>
 
@@ -53,12 +52,7 @@
 {
 
 ////////////////////////////////////////////////////////////
-CursorImpl::CursorImpl() :
-m_cursor(nil)
-{
-    // Just ask for a pool
-    ensureThreadHasPool();
-}
+CursorImpl::CursorImpl() : m_cursor(nil) {}
 
 
 ////////////////////////////////////////////////////////////

src/SFML/Window/OSX/SFApplication.m

@@ -52,6 +52,8 @@ +(void)processEvent
 ////////////////////////////////////////////////////////
 +(void)setUpMenuBar
 {
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
     [SFApplication sharedApplication]; // Make sure NSApp exists
 
     // Set the main menu bar
@@ -76,6 +78,8 @@ +(void)setUpMenuBar
     NSMenu* windowMenu = [[SFApplication newWindowMenu] autorelease];
     [windowItem setSubmenu:windowMenu];
     [NSApp setWindowsMenu:windowMenu];
+
+    [pool drain];
 }
 
 
@@ -98,6 +102,8 @@ +(NSMenu*)newAppleMenu
     //    --------------------
     //    Quit AppName      Command+Q
 
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
     NSString* appName = [SFApplication applicationName];
 
     // APPLE MENU
@@ -154,6 +160,8 @@ +(NSMenu*)newAppleMenu
                          action:@selector(terminate:)
                   keyEquivalent:@"q"];
 
+    [pool drain];
+
     return appleMenu;
 }
 

src/SFML/Window/OSX/SFContext.mm

@@ -32,8 +32,6 @@
 #include <dlfcn.h>
 #include <stdint.h>
 
-#import <SFML/Window/OSX/AutoreleasePoolWrapper.h>
-
 namespace sf
 {
 namespace priv
@@ -46,9 +44,6 @@
 m_view(0),
 m_window(0)
 {
-    // Ask for a pool.
-    ensureThreadHasPool();
-
     // Create the context
     createContext(shared,
                   VideoMode::getDesktopMode().bitsPerPixel,
@@ -63,9 +58,6 @@
 m_view(0),
 m_window(0)
 {
-    // Ask for a pool.
-    ensureThreadHasPool();
-
     // Create the context.
     createContext(shared, bitsPerPixel, settings);
 
@@ -85,9 +77,6 @@
     // Ensure the process is setup in order to create a valid window.
     WindowImplCocoa::setUpProcess();
 
-    // Ask for a pool.
-    ensureThreadHasPool();
-
     // Create the context.
     createContext(shared, VideoMode::getDesktopMode().bitsPerPixel, settings);
 

src/SFML/Window/OSX/SFWindowController.mm

@@ -168,6 +168,8 @@ -(id)initWithMode:(const sf::VideoMode&)mode andStyle:(unsigned long)style
 ////////////////////////////////////////////////////////
 -(void)setupFullscreenViewWithMode:(const sf::VideoMode&)mode
 {
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
     // Create a screen-sized window on the main display
     sf::VideoMode desktop = sf::VideoMode::getDesktopMode();
     sf::priv::scaleInWidthHeight(desktop, nil);
@@ -231,6 +233,8 @@ -(void)setupFullscreenViewWithMode:(const sf::VideoMode&)mode
     // Populate the window and views
     [masterView addSubview:m_oglView];
     [m_window setContentView:masterView];
+
+    [pool drain];
 }
 
 

src/SFML/Window/OSX/WindowImplCocoa.mm

@@ -29,7 +29,6 @@
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 #include <SFML/System/Err.hpp>
 
-#import <SFML/Window/OSX/AutoreleasePoolWrapper.h>
 #import <SFML/Window/OSX/cpp_objc_conversion.h>
 #import <SFML/Window/OSX/Scaling.h>
 #import <SFML/Window/OSX/SFApplication.h>
@@ -84,9 +83,6 @@ void showMouseCursor()
 WindowImplCocoa::WindowImplCocoa(WindowHandle handle) :
 m_showCursor(true)
 {
-    // Ask for a pool.
-    ensureThreadHasPool();
-
     // Treat the handle as it real type
     id nsHandle = (id)handle;
     if ([nsHandle isKindOfClass:[NSWindow class]])
@@ -129,9 +125,6 @@ void showMouseCursor()
     // Transform the app process.
     setUpProcess();
 
-    // Ask for a pool.
-    ensureThreadHasPool();
-
     // Use backing size
     scaleInWidthHeight(mode, nil);
 
@@ -148,7 +141,10 @@ void showMouseCursor()
 WindowImplCocoa::~WindowImplCocoa()
 {
     [m_delegate closeWindow];
-
+    // Tell the window/view controller (and the OpenGL view) that the delegate
+    // (this object) no longer exists to prevent events being sent to the window
+    // after it has been deleted.
+    [m_delegate setRequesterTo:0];
     [m_delegate release];
 
     // Put the next window in front, if any.
@@ -159,10 +155,6 @@ void showMouseCursor()
         if ([nextWindow isVisible])
             [nextWindow makeKeyAndOrderFront:nil];
     }
-
-    drainThreadPool(); // Make sure everything was freed
-    // This solve some issue when sf::Window::Create is called for the
-    // second time (nothing was render until the function was called again)
 }
 
 
@@ -399,7 +391,6 @@ void showMouseCursor()
 void WindowImplCocoa::processEvents()
 {
     [m_delegate processEvent];
-    drainThreadPool(); // Reduce memory footprint
 }
 
 #pragma mark