More work on python lifecycle

Author: kunitoki

modules/yup_core/logging/yup_Logger.cpp

@@ -69,6 +69,10 @@ void YUP_API YUP_CALLTYPE logAssertion (const char* const filename, const int li
     String m ("YUP Assertion failure in ");
     m << File::createFileWithoutCheckingPath (CharPointer_UTF8 (filename)).getFileName() << ':' << lineNum;
 
+#if YUP_ASSERT_INCLUDE_STACKTRACE
+    m << newLine << SystemStats::getStackBacktrace();
+#endif
+
 #if YUP_LOG_ASSERTIONS
     Logger::writeToLog (m);
 #else
@@ -81,6 +85,10 @@ void YUP_API YUP_CALLTYPE logAssertion (const wchar_t* const filename, const int
     String m ("YUP Assertion failure in ");
     m << File::createFileWithoutCheckingPath (filename).getFileName() << ':' << lineNum;
 
+#if YUP_ASSERT_INCLUDE_STACKTRACE
+    m << newLine << SystemStats::getStackBacktrace();
+#endif
+
 #if YUP_LOG_ASSERTIONS
     Logger::writeToLog (m);
 #else

modules/yup_core/yup_core.h

@@ -105,6 +105,18 @@
 #endif
 #endif
 
+//==============================================================================
+/** Config: YUP_ASSERT_INCLUDE_STACKTRACE
+
+    If this flag is enabled, the jassert and jassertfalse macros will include
+    a stack trace when an assertion happens.
+
+    @see YUP_LOG_ASSERTIONS, jassert, jassertfalse
+*/
+#ifndef YUP_ASSERT_INCLUDE_STACKTRACE
+#define YUP_ASSERT_INCLUDE_STACKTRACE 1
+#endif
+
 //==============================================================================
 /** Config: YUP_CHECK_MEMORY_LEAKS
 

modules/yup_events/messages/yup_DeletedAtShutdown.cpp

@@ -40,7 +40,11 @@
 namespace yup
 {
 
-static SpinLock deletedAtShutdownLock; // use a spin lock because it can be statically initialised
+static SpinLock& getDeletedAtShutdownSpinLock()
+{
+    static SpinLock deletedAtShutdownLock;
+    return deletedAtShutdownLock;
+}
 
 static Array<DeletedAtShutdown*>& getDeletedAtShutdownObjects()
 {
@@ -50,13 +54,13 @@ static Array<DeletedAtShutdown*>& getDeletedAtShutdownObjects()
 
 DeletedAtShutdown::DeletedAtShutdown()
 {
-    const SpinLock::ScopedLockType sl (deletedAtShutdownLock);
+    const SpinLock::ScopedLockType sl (getDeletedAtShutdownSpinLock());
     getDeletedAtShutdownObjects().add (this);
 }
 
 DeletedAtShutdown::~DeletedAtShutdown()
 {
-    const SpinLock::ScopedLockType sl (deletedAtShutdownLock);
+    const SpinLock::ScopedLockType sl (getDeletedAtShutdownSpinLock());
     getDeletedAtShutdownObjects().removeFirstMatchingValue (this);
 }
 
@@ -71,7 +75,7 @@ void DeletedAtShutdown::deleteAll()
     Array<DeletedAtShutdown*> localCopy;
 
     {
-        const SpinLock::ScopedLockType sl (deletedAtShutdownLock);
+        const SpinLock::ScopedLockType sl (getDeletedAtShutdownSpinLock());
         localCopy = getDeletedAtShutdownObjects();
     }
 
@@ -83,7 +87,7 @@ void DeletedAtShutdown::deleteAll()
 
             // double-check that it's not already been deleted during another object's destructor.
             {
-                const SpinLock::ScopedLockType sl (deletedAtShutdownLock);
+                const SpinLock::ScopedLockType sl (getDeletedAtShutdownSpinLock());
 
                 if (! getDeletedAtShutdownObjects().contains (deletee))
                     deletee = nullptr;

modules/yup_events/native/yup_MessageManager_ios.mm

@@ -70,7 +70,9 @@ void runNSApplication()
     if (!SystemStats::isRunningInAppExtensionSandbox())
         [[[UIApplication sharedApplication] delegate] applicationWillTerminate:[UIApplication sharedApplication]];
 
+#if YUP_SHUTDOWN_APP_ON_MESSAGEMANAGER_QUIT
     exit(0); // iOS apps get no mercy..
+#endif
 }
 
 #if YUP_MODAL_LOOPS_PERMITTED

modules/yup_events/native/yup_MessageManager_mac.mm

@@ -387,7 +387,7 @@ static bool runNSApplication(int millisecondsToRunFor, Atomic<int>& quitMessageP
             @try
             {
 #endif
-                CFRunLoopRunInMode(kCFRunLoopCommonModes, jmin(1.0, msRemaining * 0.001), true);
+                CFRunLoopRunInMode(kCFRunLoopDefaultMode, jmin(1.0, msRemaining * 0.001), true);
 
 #if YUP_CATCH_UNHANDLED_EXCEPTIONS
             }
@@ -444,7 +444,9 @@ static void shutdownNSApp()
         for (const auto& func : shutdownCallbacks)
             func();
 
+#if YUP_SHUTDOWN_APP_ON_MESSAGEMANAGER_QUIT
         shutdownNSApp();
+#endif
     }
     else
     {

modules/yup_events/timers/yup_Timer.cpp

@@ -40,8 +40,7 @@
 namespace yup
 {
 
-class Timer::TimerThread final : private Thread
-    , private DeletedAtShutdown
+class Timer::TimerThread final : private Thread, private DeletedAtShutdown
 {
     static inline constexpr int maxTimeoutMilliseconds = 10;
 

modules/yup_events/timers/yup_Timer.h

@@ -137,9 +137,7 @@ class YUP_API Timer
     static void YUP_CALLTYPE callAfterDelay (int milliseconds, std::function<void()> functionToCall);
 
     //==============================================================================
-    /** For internal use only: invokes any timers that need callbacks.
-        Don't call this unless you really know what you're doing!
-    */
+    /** @internal Invokes any timers that need callbacks. Don't call this unless you really know what you're doing! */
     static void YUP_CALLTYPE callPendingTimersSynchronously();
 
 private:

modules/yup_events/yup_events.h

@@ -71,6 +71,15 @@
 #define YUP_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0
 #endif
 
+//==============================================================================
+/** Config: YUP_SHUTDOWN_APP_ON_MESSAGEMANAGER_QUIT
+
+    Will shutdown the application when the MessageManager is quit.
+*/
+#ifndef YUP_SHUTDOWN_APP_ON_MESSAGEMANAGER_QUIT
+#define YUP_SHUTDOWN_APP_ON_MESSAGEMANAGER_QUIT 1
+#endif
+
 #if YUP_WINDOWS && YUP_EVENTS_INCLUDE_WINRT_WRAPPER
 // If this header file is missing then you are probably attempting to use WinRT
 // functionality without the WinRT libraries installed on your system. Try installing

modules/yup_graphics/graphics/yup_Color.h

@@ -792,6 +792,28 @@ class YUP_API Color
         };
     }
 
+    //==============================================================================
+
+    static Color fromRGB (uint8 r, uint8 g, uint8 b) noexcept
+    {
+        return { 255, r, g, b };
+    }
+
+    static Color fromRGBA (uint8 r, uint8 g, uint8 b, uint8 a) noexcept
+    {
+        return { a, r, g, b };
+    }
+
+    static Color fromARGB (uint8 a, uint8 r, uint8 g, uint8 b) noexcept
+    {
+        return { a, r, g, b };
+    }
+
+    static Color fromBGRA (uint8 b, uint8 g, uint8 r, uint8 a) noexcept
+    {
+        return { a, r, g, b };
+    }
+
     //==============================================================================
     // TODO - doxygen
     String toString() const;

modules/yup_gui/native/yup_Windowing_sdl2.cpp

@@ -1649,7 +1649,8 @@ void shutdownYup_Windowing()
 
     // Shutdown desktop
     SDL_DelEventWatch (displayEventDispatcher, Desktop::getInstance());
-    Desktop::getInstance()->deleteInstance();
+    if (auto desktop = Desktop::getInstanceWithoutCreating())
+        desktop->deleteInstance();
 
     // Unregister theme
     {
@@ -1658,7 +1659,8 @@ void shutdownYup_Windowing()
     }
 
     // Unregister event loop
-    MessageManager::getInstance()->registerEventLoopCallback (nullptr);
+    if (auto messageManager = MessageManager::getInstanceWithoutCreating())
+        messageManager->registerEventLoopCallback (nullptr);
 
     // Quit SDL
     SDL_Quit();