/////////////////////////////////////////////////////////////////////////////
-// 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
+// Software 2000 Ltd.
+// 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"
+ #include "wx/module.h"
#endif
-#include "wx/module.h"
-
-#include "wx/cocoa/ObjcPose.h"
-
-#if wxUSE_WX_RESOURCES
-# include "wx/resource.h"
-#endif
+#include "wx/cocoa/ObjcRef.h"
+#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/mbarman.h"
+#include "wx/cocoa/NSApplication.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/NSString.h>
+#import <Foundation/NSNotification.h>
+#import <AppKit/NSCell.h>
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
+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 *wxPoseAsInitializer::sm_first = NULL;
+// ========================================================================
+// wxNSApplicationDelegate
+// ========================================================================
+@implementation wxNSApplicationDelegate : NSObject
-@interface wxPoserNSApplication : NSApplication
+// 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;
}
-- (void)doIdle: (id)data;
-- (void)sendEvent: (NSEvent*)anEvent;
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-@end // wxPoserNSApplication
+@end // implementation wxNSApplicationDelegate : NSObject
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationDelegate,NSObject)
-@implementation wxPoserNSApplication : NSApplication
+// ========================================================================
+// wxNSApplicationObserver
+// ========================================================================
+@implementation wxNSApplicationObserver : NSObject
-- (void)doIdle: (id)data
+- (void)applicationWillBecomeActive:(NSNotification *)notification
{
- 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
- {
- 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_applicationWillBecomeActive();
}
-- (void)sendEvent: (NSEvent*)anEvent
+- (void)applicationDidBecomeActive:(NSNotification *)notification
{
- wxLogDebug("SendEvent");
- wxTheApp->CocoaInstallRequestedIdleHandler();
- [super sendEvent: anEvent];
+ wxTheApp->CocoaDelegate_applicationDidBecomeActive();
}
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
+- (void)applicationWillResignActive:(NSNotification *)notification
{
- BOOL ret = wxTheApp->GetExitOnFrameDelete();
- wxLogDebug("applicationShouldTermintaeAfterLastWindowClosed=%d",ret);
- return ret;
+ wxTheApp->CocoaDelegate_applicationWillResignActive();
}
-@end // wxPoserNSApplication
-WX_IMPLEMENT_POSER(wxPoserNSApplication);
-
-class wxAutoNSAutoreleasePool
+- (void)applicationDidResignActive:(NSNotification *)notification
{
-public:
- wxAutoNSAutoreleasePool()
- {
- m_pool = [[NSAutoreleasePool alloc] init];
- }
- ~wxAutoNSAutoreleasePool()
- {
- [m_pool release];
- }
-protected:
- NSAutoreleasePool *m_pool;
-};
-
-// ============================================================================
-// functions
-// ============================================================================
+ wxTheApp->CocoaDelegate_applicationDidResignActive();
+}
-void wxApp::Exit()
+- (void)applicationWillUpdate:(NSNotification *)notification;
{
- wxApp::CleanUp();
+ wxTheApp->CocoaDelegate_applicationWillUpdate();
+}
- wxAppConsole::Exit();
+- (void)controlTintChanged:(NSNotification *)notification
+{
+ wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));
}
-// ============================================================================
-// wxApp implementation
-// ============================================================================
+@end // implementation wxNSApplicationObserver : NSObject
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationObserver,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
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 *));
}
}
- // 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()
{
+ wxAutoNSAutoreleasePool pool;
+
wxDC::CocoaShutdownTextSystem();
+ wxMenuBarManager::DestroyInstance();
+
+ [[NSNotificationCenter defaultCenter] removeObserver:sg_cocoaAppObserver];
+ if(!sm_isEmbedded)
+ {
+ [m_cocoaApp setDelegate:nil];
+ [m_cocoaAppDelegate release];
+ m_cocoaAppDelegate = NULL;
+ }
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::CocoaDelegate_applicationWillBecomeActive()
+{
+}
+
+void wxApp::CocoaDelegate_applicationDidBecomeActive()
+{
+}
+
+void wxApp::CocoaDelegate_applicationWillResignActive()
+{
+ wxTopLevelWindowCocoa::DeactivatePendingWindow();
}
-void wxApp::CocoaInstallIdleHandler()
+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];
- 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::CallOnInit()
-{
- wxAutoNSAutoreleasePool pool;
- return OnInit();
-}
+ if(!sm_isEmbedded)
+ {
+ // Enable response to application delegate messages
+ m_cocoaAppDelegate = [[WX_GET_OBJC_CLASS(wxNSApplicationDelegate) alloc] init];
+ [m_cocoaApp setDelegate:m_cocoaAppDelegate];
+ }
-bool wxApp::OnInit()
-{
- if(!wxAppBase::OnInit())
- return FALSE;
+ // Enable response to "delegate" messages on the notification observer
+ [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+ selector:@selector(applicationWillBecomeActive:)
+ name:NSApplicationWillBecomeActiveNotification object:nil];
- return TRUE;
-}
+ [[NSNotificationCenter defaultCenter] addObserver:sg_cocoaAppObserver
+ selector:@selector(applicationDidBecomeActive:)
+ name:NSApplicationDidBecomeActiveNotification object:nil];
-bool wxApp::Initialized()
-{
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
+ [[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();
+ return true;
}
-int wxApp::MainLoop()
+wxApp::~wxApp()
{
- [m_cocoaApp run];
- return 0;
+ 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();
+ }
}
-void wxApp::ExitMainLoop()
+bool wxApp::CallOnInit()
{
- 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];
+// wxAutoNSAutoreleasePool pool;
+ return OnInit();
}
-// Is a message/event pending?
-bool wxApp::Pending()
+bool wxApp::OnInit()
{
- return 0;
+ if(!wxAppBase::OnInit())
+ return false;
+
+ return true;
}
-// Dispatch a message.
-void wxApp::Dispatch()
+void wxApp::Exit()
{
+ wxApp::CleanUp();
+
+ wxAppConsole::Exit();
}
// Yield to other processes
-
bool wxApp::Yield(bool onlyIfNeeded)
{
// MT-FIXME
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
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)
+{
+ m_isInAssert = true;
+ wxAppBase::OnAssert(file, line, cond, msg);
+ m_isInAssert = false;
+}
+#endif // __WXDEBUG__
projects / wxWidgets.git / blobdiff