X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9482617091b084d4ee006679a450176715d465e0..560e2916a9c790150fab69be3e4fb74909a76cbc:/src/cocoa/app.mm?ds=sidebyside diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index 8532a12f94..1436da767d 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -4,19 +4,11 @@ // Author: David Elliott // Modified by: // Created: 2002/11/27 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/defs.h" @@ -31,6 +23,8 @@ #include "wx/module.h" #include "wx/cocoa/ObjcPose.h" +#include "wx/cocoa/autorelease.h" +#include "wx/cocoa/mbarman.h" #if wxUSE_WX_RESOURCES # include "wx/resource.h" @@ -39,57 +33,64 @@ #import #import #import +#import +#import +#import -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - +// ======================================================================== +// wxPoseAsInitializer +// ======================================================================== wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; +// ======================================================================== +// wxPoserNSApplication +// ======================================================================== @interface wxPoserNSApplication : NSApplication { } - (void)doIdle: (id)data; -- (void)finishLaunching; - (void)sendEvent: (NSEvent*)anEvent; - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication; @end // wxPoserNSApplication +WX_IMPLEMENT_POSER(wxPoserNSApplication); + @implementation wxPoserNSApplication : NSApplication - (void)doIdle: (id)data { wxASSERT(wxTheApp); + wxASSERT(wxMenuBarManager::GetInstance()); + wxMenuBarManager::GetInstance()->CocoaInternalIdle(); wxLogDebug("doIdle called"); - NSRunLoop *rl = [NSRunLoop currentRunLoop]; - // runMode: beforeDate returns YES if something was done - while(wxTheApp->ProcessIdle()) // FIXME: AND NO EVENTS ARE PENDING +#ifdef __WXDEBUG__ + if(wxTheApp->IsInAssert()) { - wxLogDebug("Looping for idle events"); - #if 1 - if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]]) + 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("Found actual work to do"); - break; + wxLogDebug("Looping for idle events"); + #if 1 + if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]]) + { + wxLogDebug("Found actual work to do"); + break; + } + #endif } - #endif } 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]; -} - - (void)sendEvent: (NSEvent*)anEvent { wxLogDebug("SendEvent"); @@ -105,139 +106,44 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; } @end // wxPoserNSApplication -WX_IMPLEMENT_POSER(wxPoserNSApplication); - -// ============================================================================ -// functions -// ============================================================================ - -//---------------------------------------------------------------------- -// wxEntry -//---------------------------------------------------------------------- - -int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char *WXUNUSED(argv)[] ) -{ - return wxApp::Initialize(); -} - -int WXDLLEXPORT wxEntryInitGui() -{ - return wxTheApp->OnInitGui(); -} - -void WXDLLEXPORT wxEntryCleanup() -{ - wxApp::CleanUp(); -} - -int wxEntry( int argc, char *argv[]) -{ - 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; -} - -void wxApp::Exit() -{ - wxApp::CleanUp(); - - wxAppConsole::Exit(); -} -// ============================================================================ -// wxApp implementation -// ============================================================================ +// ======================================================================== +// 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 // ---------------------------------------------------------------------------- - -bool wxApp::Initialize(int argc, wxChar **argv) +bool wxApp::Initialize(int& argc, wxChar **argv) { - // VZ: apparently this needs to be done a.s.a.p., right? it is done after - // wxClassInfo::InitializeClasses() now but usd to be done before, I - // hope it's not a problem -- if it is, please let me know, David (if - // it isn't, just remove this comment :-) + 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, sizeof(ARG_PSN) - 1) == 0 ) + { + // remove this argument + memmove(argv, argv + 1, argc--); + } + } + + // Posing must be completed before any instances of the Objective-C + // classes being posed as are created. wxPoseAsInitializer::InitializePosers(); return wxAppBase::Initialize(argc, argv); @@ -246,6 +152,7 @@ bool wxApp::Initialize(int argc, wxChar **argv) void wxApp::CleanUp() { wxDC::CocoaShutdownTextSystem(); + wxMenuBarManager::DestroyInstance(); wxAppBase::CleanUp(); } @@ -253,16 +160,17 @@ 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; @@ -271,6 +179,15 @@ wxApp::wxApp() void wxApp::CocoaInstallIdleHandler() { + // 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 @@ -280,11 +197,15 @@ void wxApp::CocoaInstallIdleHandler() bool wxApp::OnInitGui() { + wxAutoNSAutoreleasePool pool; if(!wxAppBase::OnInitGui()) return FALSE; // Create the app using the sharedApplication method m_cocoaApp = [NSApplication sharedApplication]; + + wxMenuBarManager::CreateInstance(); + wxDC::CocoaInitializeTextSystem(); // [ m_cocoaApp setDelegate:m_cocoaApp ]; #if 0 @@ -295,6 +216,12 @@ bool wxApp::OnInitGui() return TRUE; } +bool wxApp::CallOnInit() +{ +// wxAutoNSAutoreleasePool pool; + return OnInit(); +} + bool wxApp::OnInit() { if(!wxAppBase::OnInit()) @@ -311,20 +238,17 @@ bool wxApp::Initialized() return FALSE; } -int wxApp::MainLoop() +void wxApp::Exit() { - [m_cocoaApp run]; - return 0; + wxApp::CleanUp(); + + wxAppConsole::Exit(); } -// Returns TRUE if more time is needed. -bool wxApp::ProcessIdle() +int wxApp::MainLoop() { - wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); - - return event.MoreRequested(); + [m_cocoaApp run]; + return 0; } void wxApp::ExitMainLoop() @@ -339,7 +263,7 @@ void wxApp::ExitMainLoop() if(!m_isIdle) [[ NSRunLoop currentRunLoop ] cancelPerformSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL]; #endif - [m_cocoaApp terminate: m_cocoaApp]; + [m_cocoaApp stop: m_cocoaApp]; } // Is a message/event pending? @@ -349,81 +273,12 @@ bool wxApp::Pending() } // Dispatch a message. -void wxApp::Dispatch() +bool wxApp::Dispatch() { -} - -void wxApp::OnIdle(wxIdleEvent& event) -{ - 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; -} - -// Send idle event to all top-level windows -bool wxApp::SendIdleEvents() -{ - bool needMore = FALSE; - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->GetNext(); - } - return needMore; -} - -// Send idle event to window and all subwindows -bool wxApp::SendIdleEvents(wxWindow* win) -{ -// 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; - - node = node->GetNext(); - } - return needMore; + return true; } // Yield to other processes - bool wxApp::Yield(bool onlyIfNeeded) { // MT-FIXME @@ -447,8 +302,15 @@ 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(NSEvent *event = [GetNSApplication() + nextEventMatchingMask:NSAnyEventMask + untilDate:[NSDate distantPast] + inMode:NSDefaultRunLoopMode + dequeue: YES]) + { + [GetNSApplication() sendEvent: event]; + } #if wxUSE_LOG // let the logs be flashed again @@ -460,3 +322,12 @@ bool wxApp::Yield(bool onlyIfNeeded) return true; } +#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__ +