X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/505f0a85c9b59d8be30f2be1f7cf4fd3d663f721..2c53a80a097697483b10c022febe08f06afe2d3a:/src/cocoa/app.mm diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index d25e9d3230..e2336ca1b1 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -4,25 +4,15 @@ // Author: David Elliott // Modified by: // Created: 2002/11/27 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - #include "wx/wxprec.h" #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" @@ -31,6 +21,9 @@ #include "wx/module.h" #include "wx/cocoa/ObjcPose.h" +#include "wx/cocoa/autorelease.h" +#include "wx/cocoa/mbarman.h" +#include "wx/cocoa/NSApplication.h" #if wxUSE_WX_RESOURCES # include "wx/resource.h" @@ -38,453 +31,276 @@ #import #import -#import - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - +#import +#import +#import +#import +#import + +// ======================================================================== +// wxPoseAsInitializer +// ======================================================================== wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; +static bool sg_needIdle = true; + +// ======================================================================== +// wxPoserNSApplication +// ======================================================================== @interface wxPoserNSApplication : NSApplication { } -- (void)doIdle: (id)data; -- (void)finishLaunching; +- (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag; - (void)sendEvent: (NSEvent*)anEvent; -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication; @end // wxPoserNSApplication +WX_IMPLEMENT_POSER(wxPoserNSApplication); + @implementation wxPoserNSApplication : NSApplication -- (void)doIdle: (id)data +/* NOTE: The old method of idle event handling added the handler using the + [NSRunLoop -performSelector:target:argument:order:modes] which caused + the invocation to occur at the begining of [NSApplication + -nextEventMatchingMask:untilDate:expiration:inMode:dequeue:]. However, + the code would be scheduled for invocation with every iteration of + the event loop. This new method simply overrides the method. The + same caveats apply. In particular, by the time the event loop has + called this method, it usually expects to receive an event. If you + plan on stopping the event loop, it is wise to send an event through + the queue to ensure this method will return. + See wxEventLoop::Exit() for more information. + + Ê ÊRN: We used to use nil as the untilDate in previous versions since nil +Ê Êis a shorter and more concise way of specifying an infinite amount of +ÊÊ Êtime than [NSDate distantPast]. ÊHowever, Apple neglects to mention in +Ê Êtheir documentation that nil is not handled correctly in OSX 10.2 +Ê Ê(and possibly lower) and when the call is reached the system comes to +Ê Êa screeching halt, therefore we need to specify [NSDate distantPast] +Ê Êexplicitly so that wxCocoa will work correctly in OSX 10.2. +*/ + +- (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag { - wxASSERT(wxTheApp); - wxLogDebug("doIdle called"); - NSRunLoop *rl = [NSRunLoop currentRunLoop]; - // runMode: beforeDate returns YES if something was done - while(wxTheApp->ProcessIdle()) // FIXME: AND NO EVENTS ARE PENDING + // Get the same events except don't block + NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag]; + // If we got one, simply return it + if(event) + return event; + // No events, try doing some idle stuff + if(sg_needIdle +#ifdef __WXDEBUG__ + && !wxTheApp->IsInAssert() +#endif + && ([NSDefaultRunLoopMode isEqualToString:mode] || [NSModalPanelRunLoopMode isEqualToString:mode])) { - wxLogDebug("Looping for idle events"); - #if 1 - if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]]) + sg_needIdle = false; + wxLogTrace(wxTRACE_COCOA,wxT("Processing idle events")); + while(wxTheApp->ProcessIdle()) { - wxLogDebug("Found actual work to do"); - break; + // Get the same events except don't block + NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag]; + // If we got one, simply return it + if(event) + return event; + // we didn't get one, do some idle work + wxLogTrace(wxTRACE_COCOA,wxT("Looping idle events")); } - #endif + // No more idle work requested, block + wxLogTrace(wxTRACE_COCOA,wxT("Finished idle processing")); } - wxLogDebug("Idle processing complete, requesting next idle event"); - // Add ourself back into the run loop (on next event) if necessary - wxTheApp->CocoaRequestIdle(); -} - -- (void)finishLaunching -{ - wxLogDebug("finishLaunching"); - bool initsuccess = wxTheApp->OnInit(); - if(!initsuccess) - [super stop: NULL]; - - [super finishLaunching]; + else + wxLogTrace(wxTRACE_COCOA,wxT("Avoiding idle processing sg_needIdle=%d"),sg_needIdle); + return [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:flag]; } - (void)sendEvent: (NSEvent*)anEvent { - wxLogDebug("SendEvent"); - wxTheApp->CocoaInstallRequestedIdleHandler(); + wxLogTrace(wxTRACE_COCOA,wxT("SendEvent")); + sg_needIdle = true; [super sendEvent: anEvent]; } -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication -{ - BOOL ret = wxTheApp->GetExitOnFrameDelete(); - wxLogDebug("applicationShouldTermintaeAfterLastWindowClosed=%d",ret); - return ret; -} - @end // wxPoserNSApplication -WX_IMPLEMENT_POSER(wxPoserNSApplication); - -// ============================================================================ -// functions -// ============================================================================ -//---------------------------------------------------------------------- -// wxEntry -//---------------------------------------------------------------------- +// ======================================================================== +// wxNSApplicationDelegate +// ======================================================================== +@implementation wxNSApplicationDelegate : NSObject -int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char *WXUNUSED(argv)[] ) +// 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 wxApp::Initialize(); + return NO; } -int WXDLLEXPORT wxEntryInitGui() +- (void)applicationWillBecomeActive:(NSNotification *)notification { - return wxTheApp->OnInitGui(); + wxTheApp->CocoaDelegate_applicationWillBecomeActive(); } -void WXDLLEXPORT wxEntryCleanup() +- (void)applicationDidBecomeActive:(NSNotification *)notification { - wxApp::CleanUp(); + wxTheApp->CocoaDelegate_applicationDidBecomeActive(); } -int wxEntry( int argc, char *argv[]) +- (void)applicationWillResignActive:(NSNotification *)notification { - if (!wxEntryStart(argc, argv)) { - return 0; - } - wxLogDebug("Creating application"); - // create the application object or ensure that one already exists - if (!wxTheApp) - { - // The app may have declared a global application object, but we recommend - // the IMPLEMENT_APP macro is used instead, which sets an initializer - // function for delayed, dynamic app object construction. - wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, - wxT("No initializer - use IMPLEMENT_APP macro.") ); - - wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) (); - } - - wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); - - // Mac OS X passes a process serial number command line argument when - // the application is launched from the Finder. This argument must be - // removed from the command line arguments before being handled by the - // application (otherwise applications would need to handle it) - - if (argc > 1) { - char theArg[6] = ""; - strncpy(theArg, argv[1], 5); - - if (strcmp(theArg, "-psn_") == 0) { - // assume the argument is always the only one and remove it - --argc; - } - } - - wxTheApp->argc = argc; - wxTheApp->argv = argv; - - wxLogDebug("initializing gui"); - // GUI-specific initialization, such as creating an app context. - wxEntryInitGui(); - - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - int retValue = 0; - - wxLogDebug("Time to run"); - retValue = wxTheApp->OnRun(); - - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if ( topWindow ) - { - // Forcibly delete the window. - if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - topWindow->Close(TRUE); - } - else - { - delete topWindow; - wxTheApp->SetTopWindow(NULL); - } - } - - wxTheApp->OnExit(); - - wxEntryCleanup(); - - return retValue; + wxTheApp->CocoaDelegate_applicationWillResignActive(); } -void wxApp::Exit() +- (void)applicationDidResignActive:(NSNotification *)notification { - wxApp::CleanUp(); + wxTheApp->CocoaDelegate_applicationDidResignActive(); +} - wxAppConsole::Exit(); +- (void)controlTintChanged:(NSNotification *)notification +{ + wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate")); } -// ============================================================================ -// wxApp implementation -// ============================================================================ +@end // implementation wxNSApplicationDelegate : NSObject + +// ======================================================================== +// wxApp +// ======================================================================== // ---------------------------------------------------------------------------- // wxApp Static member initialization // ---------------------------------------------------------------------------- - -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) + EVT_IDLE(wxAppBase::OnIdle) // EVT_END_SESSION(wxApp::OnEndSession) // EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif // ---------------------------------------------------------------------------- -// wxApp static functions +// wxApp initialization/cleanup // ---------------------------------------------------------------------------- -/*static*/ bool wxApp::Initialize() +bool wxApp::Initialize(int& argc, wxChar **argv) { - wxPoseAsInitializer::InitializePosers(); - wxClassInfo::InitializeClasses(); - -#if wxUSE_THREADS - wxPendingEventsLocker = new wxCriticalSection; -#endif - - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); - - wxInitializeStockLists(); - wxInitializeStockObjects(); - -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif + wxAutoNSAutoreleasePool pool; + m_cocoaMainThread = [NSThread currentThread]; + // Mac OS X passes a process serial number command line argument when + // the application is launched from the Finder. This argument must be + // removed from the command line arguments before being handled by the + // application (otherwise applications would need to handle it) + if ( argc > 1 ) + { + static const wxChar *ARG_PSN = _T("-psn_"); + if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 ) + { + // remove this argument + --argc; + memmove(argv + 1, argv + 2, argc * sizeof(wxChar *)); + } + } - wxBitmap::InitStandardHandlers(); + // Posing must be completed before any instances of the Objective-C + // classes being posed as are created. + wxPoseAsInitializer::InitializePosers(); - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) { - return FALSE; - } - return TRUE; + return wxAppBase::Initialize(argc, argv); } -/*static*/ void wxApp::CleanUp() +void wxApp::CleanUp() { - wxModule::CleanUpModules(); + wxAutoNSAutoreleasePool pool; -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - - wxDeleteStockObjects() ; - - // Destroy all GDI lists, etc. - wxDeleteStockLists(); - - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; - - wxBitmap::CleanUpHandlers(); - - delete wxPendingEvents; - -#if wxUSE_THREADS - delete wxPendingEventsLocker; - // If we don't do the following, we get an apparent memory leak. - ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); -#endif - - wxClassInfo::CleanUpClasses(); - - delete wxTheApp; - wxTheApp = NULL; + wxDC::CocoaShutdownTextSystem(); + wxMenuBarManager::DestroyInstance(); -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft(TRUE) > 0) - { - wxLogDebug(wxT("There were memory leaks.")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - // wxDebugContext::SetStream(NULL, NULL); -#endif + [m_cocoaApp setDelegate:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:m_cocoaAppDelegate + name:NSControlTintDidChangeNotification object:nil]; + [m_cocoaAppDelegate release]; + m_cocoaAppDelegate = NULL; - wxDC::CocoaShutdownTextSystem(); -#if wxUSE_LOG - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG + wxAppBase::CleanUp(); } // ---------------------------------------------------------------------------- // wxApp creation // ---------------------------------------------------------------------------- - wxApp::wxApp() { m_topWindow = NULL; - wxTheApp = this; - m_isIdle = true; #if WXWIN_COMPATIBILITY_2_2 m_wantDebugOutput = TRUE; #endif +#ifdef __WXDEBUG__ + m_isInAssert = FALSE; +#endif // __WXDEBUG__ argc = 0; argv = NULL; m_cocoaApp = NULL; + m_cocoaAppDelegate = NULL; } -void wxApp::CocoaInstallIdleHandler() -{ - 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() +void wxApp::CocoaDelegate_applicationWillBecomeActive() { - if(!wxAppBase::OnInitGui()) - return FALSE; - - // Create the app using the sharedApplication method - m_cocoaApp = [NSApplication sharedApplication]; - 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; } -bool wxApp::OnInit() +void wxApp::CocoaDelegate_applicationDidBecomeActive() { - if(!wxAppBase::OnInit()) - return FALSE; - - return TRUE; } -bool wxApp::Initialized() +void wxApp::CocoaDelegate_applicationWillResignActive() { - if (GetTopWindow()) - return TRUE; - else - return FALSE; + wxTopLevelWindowCocoa::DeactivatePendingWindow(); } -int wxApp::MainLoop() +void wxApp::CocoaDelegate_applicationDidResignActive() { - [m_cocoaApp run]; - return 0; } -// Returns TRUE if more time is needed. -bool wxApp::ProcessIdle() +bool wxApp::OnInitGui() { - wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); - - return event.MoreRequested(); -} + wxAutoNSAutoreleasePool pool; + if(!wxAppBase::OnInitGui()) + return FALSE; -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 terminate: m_cocoaApp]; -} + // Create the app using the sharedApplication method + m_cocoaApp = [NSApplication sharedApplication]; + m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init]; + [m_cocoaApp setDelegate:m_cocoaAppDelegate]; + [[NSNotificationCenter defaultCenter] addObserver:m_cocoaAppDelegate + selector:@selector(controlTintChanged:) + name:NSControlTintDidChangeNotification object:nil]; -// Is a message/event pending? -bool wxApp::Pending() -{ - return 0; -} + wxMenuBarManager::CreateInstance(); -// Dispatch a message. -void wxApp::Dispatch() -{ + wxDC::CocoaInitializeTextSystem(); + return TRUE; } -void wxApp::OnIdle(wxIdleEvent& event) +bool wxApp::CallOnInit() { - wxLogDebug("wxApp::OnIdle"); - static bool s_inOnIdle = FALSE; - - // Avoid recursion (via ProcessEvent default case) - if ( s_inOnIdle ) - return; - s_inOnIdle = TRUE; - - - DeletePendingObjects(); - - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); - - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); - - if (needMore) - event.RequestMore(TRUE); - - s_inOnIdle = FALSE; +// wxAutoNSAutoreleasePool pool; + return OnInit(); } -// Send idle event to all top-level windows -bool wxApp::SendIdleEvents() +bool wxApp::OnInit() { - bool needMore = FALSE; - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; + if(!wxAppBase::OnInit()) + return FALSE; - node = node->GetNext(); - } - return needMore; + return TRUE; } -// Send idle event to window and all subwindows -bool wxApp::SendIdleEvents(wxWindow* win) +void wxApp::Exit() { -// wxLogDebug("SendIdleEvents win=%p",win); - bool needMore = FALSE; - - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); - - if (event.MoreRequested()) - needMore = TRUE; - - wxWindowList::Node* node = win->GetChildren().GetFirst(); - while (node) - { -// wxLogDebug("child=%p",node->Data()); - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; + wxApp::CleanUp(); - node = node->GetNext(); - } - return needMore; + wxAppConsole::Exit(); } // Yield to other processes - bool wxApp::Yield(bool onlyIfNeeded) { // MT-FIXME @@ -508,8 +324,19 @@ bool wxApp::Yield(bool onlyIfNeeded) s_inYield = true; - wxLogDebug("WARNING: SUPPOSED to have yielded!"); - // FIXME: Do something! + // Run the event loop until it is out of events + while(1) + { + wxAutoNSAutoreleasePool pool; + NSEvent *event = [GetNSApplication() + nextEventMatchingMask:NSAnyEventMask + untilDate:[NSDate distantPast] + inMode:NSDefaultRunLoopMode + dequeue: YES]; + if(!event) + break; + [GetNSApplication() sendEvent: event]; + } #if wxUSE_LOG // let the logs be flashed again @@ -521,21 +348,20 @@ bool wxApp::Yield(bool onlyIfNeeded) return true; } -void wxApp::DeletePendingObjects() +void wxApp::WakeUpIdle() { - wxNode *node = wxPendingDelete.GetFirst(); - while (node) - { - wxObject *obj = (wxObject *)node->GetData(); - - delete obj; - - if (wxPendingDelete.Find(obj)) - delete node; - - node = wxPendingDelete.GetFirst(); - } + [m_cocoaApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined + location:NSZeroPoint modifierFlags:NSAnyEventMask + timestamp:0 windowNumber:0 context:nil + subtype:0 data1:0 data2:0] atStart:NO]; } -// platform specifics +#ifdef __WXDEBUG__ +void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) +{ + m_isInAssert = TRUE; + wxAppBase::OnAssert(file, line, cond, msg); + m_isInAssert = FALSE; +} +#endif // __WXDEBUG__