use typed containers in wxHtmlParser instead of type-unsafe wxList/wxHashTable

[wxWidgets.git] / src / cocoa / app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 1436da767d686b9b5abad0994ef9bd7c89eaad90..0ac5bca28e2cbb756468c7b14be3a1723f813ca7 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -1,111 +1,97 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/app.mm
+// Name:        src/cocoa/app.mm

 // Purpose:     wxApp
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) David Elliott
 // Purpose:     wxApp
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) David Elliott

-// Licence:     wxWindows licence
+//              Software 2000 Ltd.
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/app.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
-    #include "wx/app.h"
-    #include "wx/frame.h"
-    #include "wx/dialog.h"

     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"
-
-#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/ObjcRef.h"

 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/mbarman.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/mbarman.h"

-
-#if wxUSE_WX_RESOURCES
-#  include "wx/resource.h"
-#endif
+#include "wx/cocoa/NSApplication.h"

 
 #import <AppKit/NSApplication.h>
 #import <Foundation/NSRunLoop.h>
 
 #import <AppKit/NSApplication.h>
 #import <Foundation/NSRunLoop.h>

-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>

 #import <Foundation/NSThread.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSThread.h>
 #import <AppKit/NSEvent.h>

+#import <Foundation/NSString.h>
+#import <Foundation/NSNotification.h>
+#import <AppKit/NSCell.h>
+
+bool      wxApp::sm_isEmbedded = false; // Normally we're not a plugin
+
+// wxNSApplicationObserver singleton.
+static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[WX_GET_OBJC_CLASS(wxNSApplicationObserver) alloc] init];

 
 // ========================================================================
 
 // ========================================================================

-// wxPoseAsInitializer
+// wxNSApplicationDelegate

 // ========================================================================
 // ========================================================================

-wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
+@implementation wxNSApplicationDelegate : NSObject
+
+// NOTE: Terminate means that the event loop does NOT return and thus
+// cleanup code doesn't properly execute.  Furthermore, wxWidgets has its
+// own exit on frame delete mechanism.
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
+{
+    return NO;
+}
+
+@end // implementation wxNSApplicationDelegate : NSObject
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationDelegate,NSObject)

 
 // ========================================================================
 
 // ========================================================================

-// wxPoserNSApplication
+// wxNSApplicationObserver

 // ========================================================================
 // ========================================================================

-@interface wxPoserNSApplication : NSApplication
+@implementation wxNSApplicationObserver : NSObject
+
+- (void)applicationWillBecomeActive:(NSNotification *)notification

 {
 {

+    wxTheApp->CocoaDelegate_applicationWillBecomeActive();

 }
 
 }
 

-- (void)doIdle: (id)data;
-- (void)sendEvent: (NSEvent*)anEvent;
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-@end // wxPoserNSApplication
-
-WX_IMPLEMENT_POSER(wxPoserNSApplication);
+- (void)applicationDidBecomeActive:(NSNotification *)notification
+{
+    wxTheApp->CocoaDelegate_applicationDidBecomeActive();
+}

 
 

-@implementation wxPoserNSApplication : NSApplication
+- (void)applicationWillResignActive:(NSNotification *)notification
+{
+    wxTheApp->CocoaDelegate_applicationWillResignActive();
+}

 
 

-- (void)doIdle: (id)data
+- (void)applicationDidResignActive:(NSNotification *)notification

 {
 {

-    wxASSERT(wxTheApp);
-    wxASSERT(wxMenuBarManager::GetInstance());
-    wxMenuBarManager::GetInstance()->CocoaInternalIdle();
-    wxLogDebug("doIdle called");
-#ifdef __WXDEBUG__
-    if(wxTheApp->IsInAssert())
-    {
-        wxLogDebug("Idle events ignored durring assertion dialog");
-    }
-    else
-#endif
-    {
-        NSRunLoop *rl = [NSRunLoop currentRunLoop];
-        // runMode: beforeDate returns YES if something was done
-        while(wxTheApp->ProcessIdle()) // FIXME: AND NO EVENTS ARE PENDING
-        {
-            wxLogDebug("Looping for idle events");
-            #if 1
-            if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]])
-            {
-                wxLogDebug("Found actual work to do");
-                break;
-            }
-            #endif
-        }
-    }
-    wxLogDebug("Idle processing complete, requesting next idle event");
-    // Add ourself back into the run loop (on next event) if necessary
-    wxTheApp->CocoaRequestIdle();
+    wxTheApp->CocoaDelegate_applicationDidResignActive();

 }
 
 }
 

-- (void)sendEvent: (NSEvent*)anEvent
+- (void)applicationWillUpdate:(NSNotification *)notification;

 {
 {

-    wxLogDebug("SendEvent");
-    wxTheApp->CocoaInstallRequestedIdleHandler();
-    [super sendEvent: anEvent];
+    wxTheApp->CocoaDelegate_applicationWillUpdate();

 }
 
 }
 

-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
+- (void)controlTintChanged:(NSNotification *)notification

 {
 {

-    BOOL ret = wxTheApp->GetExitOnFrameDelete();
-    wxLogDebug("applicationShouldTermintaeAfterLastWindowClosed=%d",ret);
-    return ret;
+    wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));

 }
 
 }
 

-@end // wxPoserNSApplication
+@end // implementation wxNSApplicationObserver : NSObject
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationObserver,NSObject)

 
 // ========================================================================
 // wxApp
 
 // ========================================================================
 // wxApp


@@ -115,11 +101,6 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 // wxApp Static member initialization
 // ----------------------------------------------------------------------------
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 // wxApp Static member initialization
 // ----------------------------------------------------------------------------
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-//    EVT_END_SESSION(wxApp::OnEndSession)
-//    EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
-END_EVENT_TABLE()

 
 // ----------------------------------------------------------------------------
 // wxApp initialization/cleanup
 
 // ----------------------------------------------------------------------------
 // wxApp initialization/cleanup


@@ -135,25 +116,32 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");

-        if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 )
+        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )

         {
             // remove this argument
         {
             // remove this argument

-            memmove(argv, argv + 1, argc--);
+            --argc;
+            memmove(argv + 1, argv + 2, argc * sizeof(wxChar *));

         }
     }
 
         }
     }
 

-    // Posing must be completed before any instances of the Objective-C
-    // classes being posed as are created.
-    wxPoseAsInitializer::InitializePosers();
-

     return wxAppBase::Initialize(argc, argv);
 }
 
 void wxApp::CleanUp()
 {
     return wxAppBase::Initialize(argc, argv);
 }
 
 void wxApp::CleanUp()
 {

+    wxAutoNSAutoreleasePool pool;
+

     wxDC::CocoaShutdownTextSystem();
     wxMenuBarManager::DestroyInstance();
 
     wxDC::CocoaShutdownTextSystem();
     wxMenuBarManager::DestroyInstance();
 

+    [[NSNotificationCenter defaultCenter] removeObserver:sg_cocoaAppObserver];
+    if(!sm_isEmbedded)
+    {
+        [m_cocoaApp setDelegate:nil];
+        [m_cocoaAppDelegate release];
+        m_cocoaAppDelegate = NULL;
+    }
+

     wxAppBase::CleanUp();
 }
 
     wxAppBase::CleanUp();
 }
 


@@ -164,56 +152,91 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
 
 {
     m_topWindow = NULL;
 

-    m_isIdle = true;
-#if WXWIN_COMPATIBILITY_2_2
-    m_wantDebugOutput = TRUE;
-#endif

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     argc = 0;
     argv = NULL;
     m_cocoaApp = NULL;
 #endif // __WXDEBUG__
 
     argc = 0;
     argv = NULL;
     m_cocoaApp = NULL;

+    m_cocoaAppDelegate = NULL;

 }
 
 }
 

-void wxApp::CocoaInstallIdleHandler()
+void wxApp::CocoaDelegate_applicationWillBecomeActive()
+{
+}
+
+void wxApp::CocoaDelegate_applicationDidBecomeActive()
+{
+}
+
+void wxApp::CocoaDelegate_applicationWillResignActive()
+{
+    wxTopLevelWindowCocoa::DeactivatePendingWindow();
+}
+
+void wxApp::CocoaDelegate_applicationDidResignActive()

 {
 {

-    // If we're not the main thread, don't install the idle handler
-    if(m_cocoaMainThread != [NSThread currentThread])
-    {
-        wxLogDebug("Attempt to install idle handler from secondary thread");
-        return;
-    }
-    // If we're supposed to be stopping, don't add more idle events
-    if(![m_cocoaApp isRunning])
-        return;
-    wxLogDebug("wxApp::CocoaInstallIdleHandler");
-    m_isIdle = false;
-    // Call doIdle for EVERYTHING dammit
-// We'd need Foundation/NSConnection.h for this next constant, do we need it?
-    [[ NSRunLoop currentRunLoop ] performSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode,*/ NSModalPanelRunLoopMode, /**/NSEventTrackingRunLoopMode,/**/ nil] ];

 }
 
 bool wxApp::OnInitGui()
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())
 }
 
 bool wxApp::OnInitGui()
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())

-        return FALSE;
+        return false;

 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];
 
 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];
 

-    wxMenuBarManager::CreateInstance();
+    if(!sm_isEmbedded)
+    {
+        // Enable response to application delegate messages
+        m_cocoaAppDelegate = [[WX_GET_OBJC_CLASS(wxNSApplicationDelegate) alloc] init];
+        [m_cocoaApp setDelegate:m_cocoaAppDelegate];
+    }
+
+    // Enable response to "delegate" messages on the notification observer
+    [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+        selector:@selector(applicationWillBecomeActive:)
+        name:NSApplicationWillBecomeActiveNotification object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+        selector:@selector(applicationDidBecomeActive:)
+        name:NSApplicationDidBecomeActiveNotification object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+        selector:@selector(applicationWillResignActive:)
+        name:NSApplicationWillResignActiveNotification object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+        selector:@selector(applicationDidResignActive:)
+        name:NSApplicationDidResignActiveNotification object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+        selector:@selector(applicationWillUpdate:)
+        name:NSApplicationWillUpdateNotification object:nil];
+
+    // Enable response to system notifications
+    [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+        selector:@selector(controlTintChanged:)
+        name:NSControlTintDidChangeNotification object:nil];
+
+    if(!sm_isEmbedded)
+        wxMenuBarManager::CreateInstance();

 
     wxDC::CocoaInitializeTextSystem();
 
     wxDC::CocoaInitializeTextSystem();

-//    [ m_cocoaApp setDelegate:m_cocoaApp ];
-    #if 0
-    wxLogDebug("Just for kicks");
-    [ m_cocoaApp performSelector:@selector(doIdle:) withObject:NULL ];
-    wxLogDebug("okay.. done now");
-    #endif
-    return TRUE;
+    return true;
+}
+
+wxApp::~wxApp()
+{
+    if(m_cfRunLoopIdleObserver != NULL)
+    {
+        // Invalidate the observer which also removes it from the run loop.
+        CFRunLoopObserverInvalidate(m_cfRunLoopIdleObserver);
+        // Release the ref as we don't need it anymore.
+        m_cfRunLoopIdleObserver.reset();
+    }

 }
 
 bool wxApp::CallOnInit()
 }
 
 bool wxApp::CallOnInit()


@@ -225,17 +248,9 @@ bool wxApp::CallOnInit()
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())

-        return FALSE;
-
-    return TRUE;
-}
+        return false;

 
 

-bool wxApp::Initialized()
-{
-  if (GetTopWindow())
-    return TRUE;
-  else
-    return FALSE;
+    return true;

 }
 
 void wxApp::Exit()
 }
 
 void wxApp::Exit()


@@ -245,39 +260,6 @@ void wxApp::Exit()
     wxAppConsole::Exit();
 }
 
     wxAppConsole::Exit();
 }
 

-int wxApp::MainLoop()
-{
-    [m_cocoaApp run];
-    return 0;
-}
-
-void wxApp::ExitMainLoop()
-{
-    wxLogDebug("wxApp::ExitMailLoop m_isIdle=%d, isRunning=%d",(int)m_isIdle,(int)[m_cocoaApp isRunning]);
-//    CocoaInstallRequestedIdleHandler();
-//    if(m_isIdle)
-//        [[ NSRunLoop currentRunLoop ] performSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode, NSModalPanelRunLoopMode, NSEventTrackingRunLoopMode,*/ nil] ];
-// actually.. we WANT the idle event
-// or not
-#if 0
-    if(!m_isIdle)
-        [[ NSRunLoop currentRunLoop ] cancelPerformSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL];
-#endif
-    [m_cocoaApp stop: m_cocoaApp];
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    return 0;
-}
-
-// Dispatch a message.
-bool wxApp::Dispatch()
-{
-    return true;
-}
-

 // Yield to other processes
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 // Yield to other processes
 bool wxApp::Yield(bool onlyIfNeeded)
 {


@@ -303,12 +285,16 @@ bool wxApp::Yield(bool onlyIfNeeded)
     s_inYield = true;
 
     // Run the event loop until it is out of events
     s_inYield = true;
 
     // Run the event loop until it is out of events

-    while(NSEvent *event = [GetNSApplication()
+    while(1)
+    {
+        wxAutoNSAutoreleasePool pool;
+        NSEvent *event = [GetNSApplication()

                 nextEventMatchingMask:NSAnyEventMask
                 untilDate:[NSDate distantPast]
                 inMode:NSDefaultRunLoopMode
                 nextEventMatchingMask:NSAnyEventMask
                 untilDate:[NSDate distantPast]
                 inMode:NSDefaultRunLoopMode

-                dequeue: YES])
-    {
+                dequeue: YES];
+        if(!event)
+            break;

         [GetNSApplication() sendEvent: event];
     }
 
         [GetNSApplication() sendEvent: event];
     }
 


@@ -322,12 +308,93 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return true;
 }
 
     return true;
 }
 

+void wxApp::WakeUpIdle()
+{
+    [m_cocoaApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
+            location:NSZeroPoint modifierFlags:NSAnyEventMask
+            timestamp:0 windowNumber:0 context:nil
+            subtype:0 data1:0 data2:0] atStart:NO];
+}
+
+extern "C" static void ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info);
+extern "C" static void ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info)
+{
+    static_cast<wxApp*>(info)->CF_ObserveMainRunLoopBeforeWaiting(observer, activity);
+}
+
+#if 0
+static int sg_cApplicationWillUpdate = 0;
+#endif
+
+void wxApp::CocoaDelegate_applicationWillUpdate()
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("applicationWillUpdate"));
+
+//    CFRunLoopRef cfRunLoop = [[NSRunLoop currentRunLoop] getCFRunLoop];
+    CFRunLoopRef cfRunLoop = CFRunLoopGetCurrent();
+    wxCFRef<CFStringRef> cfRunLoopMode(CFRunLoopCopyCurrentMode(cfRunLoop));
+
+    if(m_cfRunLoopIdleObserver != NULL && m_cfObservedRunLoopMode != cfRunLoopMode)
+    {
+        CFRunLoopObserverInvalidate(m_cfRunLoopIdleObserver);
+        m_cfRunLoopIdleObserver.reset();
+    }
+#if 0
+    ++sg_cApplicationWillUpdate;
+#endif
+    if(m_cfRunLoopIdleObserver == NULL)
+    {
+        // Enable idle event handling
+        CFRunLoopObserverContext observerContext =
+        {   0
+        ,   this
+        ,   NULL
+        ,   NULL
+        ,   NULL
+        };
+        m_cfRunLoopIdleObserver.reset(CFRunLoopObserverCreate(kCFAllocatorDefault, kCFRunLoopBeforeWaiting, /*repeats*/FALSE, /*priority*/0, ObserveMainRunLoopBeforeWaiting, &observerContext));
+        m_cfObservedRunLoopMode = cfRunLoopMode;
+        CFRunLoopAddObserver(cfRunLoop, m_cfRunLoopIdleObserver, m_cfObservedRunLoopMode);
+    }
+}
+
+static inline bool FakeNeedMoreIdle()
+{
+#if 0
+// Return true on every 10th call.
+    static int idleCount = 0;
+    return ++idleCount % 10;
+#else
+    return false;
+#endif
+}
+
+void wxApp::CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, int activity)
+{
+    // Ensure that the app knows we've been invalidated
+    m_cfRunLoopIdleObserver.reset();
+#if 0
+    wxLogTrace(wxTRACE_COCOA,wxT("Idle BEGIN (%d)"), sg_cApplicationWillUpdate);
+    sg_cApplicationWillUpdate = 0;
+#else
+    wxLogTrace(wxTRACE_COCOA,wxT("Idle BEGIN"));
+#endif
+    if( ProcessIdle() || FakeNeedMoreIdle() )
+    {
+        wxLogTrace(wxTRACE_COCOA, wxT("Idle REQUEST MORE"));
+        [NSApp setWindowsNeedUpdate:YES];
+    }
+    else
+    {
+        wxLogTrace(wxTRACE_COCOA, wxT("Idle END"));
+    }
+}
+

 #ifdef __WXDEBUG__
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
 #ifdef __WXDEBUG__
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {

-    m_isInAssert = TRUE;
+    m_isInAssert = true;

     wxAppBase::OnAssert(file, line, cond, msg);
     wxAppBase::OnAssert(file, line, cond, msg);

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 #endif // __WXDEBUG__
 }
 #endif // __WXDEBUG__

-