X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/493902ac5be1c347e35c3550cd35d68696d02a61..189da67c55cb8ce76725d77e58b76c1fc666d9a6:/src/cocoa/app.mm?ds=inline diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index 28ef36b30d..565209e5b1 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -1,28 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ +#include "wx/wxprec.h" -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- +#include "wx/app.h" -#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" @@ -32,6 +23,8 @@ #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" @@ -39,100 +32,162 @@ #import #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; +- (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. + + This overridden method calls the superclass method with an untilDate + parameter that indicates nil should be returned if there are no pending + events. That is, nextEventMatchingMask: should not wait for an event. + If nil is returned then idle event processing occurs until the user + does not request anymore idle events or until a real event comes through. + + RN: Even though Apple documentation states that nil can be passed in place + of [NSDate distantPast] in the untilDate parameter, this causes Jaguar (10.2) + to get stuck in some kind of loop deep within nextEventMatchingMask:, thus we + need to explicitly pass [NSDate distantPast] instead. +*/ + +- (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(); + 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]; } +@end // wxPoserNSApplication + +// ======================================================================== +// wxNSApplicationDelegate +// ======================================================================== +@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 { - BOOL ret = wxTheApp->GetExitOnFrameDelete(); - wxLogDebug("applicationShouldTermintaeAfterLastWindowClosed=%d",ret); - return ret; + return NO; } -@end // wxPoserNSApplication -WX_IMPLEMENT_POSER(wxPoserNSApplication); +- (void)applicationWillBecomeActive:(NSNotification *)notification +{ + wxTheApp->CocoaDelegate_applicationWillBecomeActive(); +} -// ============================================================================ -// functions -// ============================================================================ +- (void)applicationDidBecomeActive:(NSNotification *)notification +{ + wxTheApp->CocoaDelegate_applicationDidBecomeActive(); +} -void wxApp::Exit() +- (void)applicationWillResignActive:(NSNotification *)notification { - wxApp::CleanUp(); + wxTheApp->CocoaDelegate_applicationWillResignActive(); +} - wxAppConsole::Exit(); +- (void)applicationDidResignActive:(NSNotification *)notification +{ + wxTheApp->CocoaDelegate_applicationDidResignActive(); +} + +- (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(wxAppBase::OnIdle) // EVT_END_SESSION(wxApp::OnEndSession) // EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif // ---------------------------------------------------------------------------- // wxApp initialization/cleanup // ---------------------------------------------------------------------------- - bool wxApp::Initialize(int& argc, wxChar **argv) { 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 @@ -140,10 +195,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv) 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 - memmove(argv, argv + 1, argc--); + --argc; + memmove(argv + 1, argv + 2, argc * sizeof(wxChar *)); } } @@ -156,7 +212,16 @@ bool wxApp::Initialize(int& argc, wxChar **argv) void wxApp::CleanUp() { + wxAutoNSAutoreleasePool pool; + wxDC::CocoaShutdownTextSystem(); + wxMenuBarManager::DestroyInstance(); + + [m_cocoaApp setDelegate:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:m_cocoaAppDelegate + name:NSControlTintDidChangeNotification object:nil]; + [m_cocoaAppDelegate release]; + m_cocoaAppDelegate = NULL; wxAppBase::CleanUp(); } @@ -164,108 +229,79 @@ void wxApp::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() +void wxApp::CocoaDelegate_applicationWillBecomeActive() +{ +} + +void wxApp::CocoaDelegate_applicationDidBecomeActive() +{ +} + +void wxApp::CocoaDelegate_applicationWillResignActive() +{ + wxTopLevelWindowCocoa::DeactivatePendingWindow(); +} + +void wxApp::CocoaDelegate_applicationDidResignActive() { - // 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()) - return FALSE; + return false; // 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]; + + wxMenuBarManager::CreateInstance(); + 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; } bool wxApp::CallOnInit() { - wxAutoNSAutoreleasePool pool; +// wxAutoNSAutoreleasePool pool; return OnInit(); } bool wxApp::OnInit() { if(!wxAppBase::OnInit()) - return FALSE; - - return TRUE; -} - -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; -} - -int wxApp::MainLoop() -{ - [m_cocoaApp run]; - return 0; -} + 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 stop: m_cocoaApp]; + return true; } -// Is a message/event pending? -bool wxApp::Pending() +void wxApp::Exit() { - return 0; -} + wxApp::CleanUp(); -// Dispatch a message. -void wxApp::Dispatch() -{ + wxAppConsole::Exit(); } // Yield to other processes - bool wxApp::Yield(bool onlyIfNeeded) { // MT-FIXME @@ -289,8 +325,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 @@ -302,3 +349,19 @@ bool wxApp::Yield(bool onlyIfNeeded) 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]; +} + +#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__