/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
+#include "wx/app.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"
+#include "wx/cocoa/ObjcRef.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 <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>
-// ========================================================================
-// wxPoseAsInitializer
-// ========================================================================
-wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
-
-// ========================================================================
-// wxPoserNSApplication
-// ========================================================================
-@interface wxPoserNSApplication : NSApplication
-{
-}
-
-- (void)sendEvent: (NSEvent*)anEvent;
-@end // wxPoserNSApplication
-
-WX_IMPLEMENT_POSER(wxPoserNSApplication);
+bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin
-@implementation wxPoserNSApplication : NSApplication
-
-- (void)sendEvent: (NSEvent*)anEvent
-{
- wxLogDebug("SendEvent");
- wxTheApp->CocoaInstallRequestedIdleHandler();
- [super sendEvent: anEvent];
-}
-
-@end // wxPoserNSApplication
+// wxNSApplicationObserver singleton.
+static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[WX_GET_OBJC_CLASS(wxNSApplicationObserver) alloc] init];
// ========================================================================
// wxNSApplicationDelegate
// ========================================================================
-@interface wxNSApplicationDelegate : NSObject
-{
-}
-
-- (void)doIdle: (id)data;
-// Delegate methods
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-- (void)applicationWillBecomeActive:(NSNotification *)notification;
-- (void)applicationDidBecomeActive:(NSNotification *)notification;
-- (void)applicationWillResignActive:(NSNotification *)notification;
-- (void)applicationDidResignActive:(NSNotification *)notification;
-@end // interface wxNSApplicationDelegate : NSObject
-
@implementation wxNSApplicationDelegate : NSObject
-- (void)doIdle: (id)data
-{
- wxASSERT(wxTheApp);
- wxASSERT(wxMenuBarManager::GetInstance());
- 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();
-}
-
// NOTE: Terminate means that the event loop does NOT return and thus
-// cleanup code doesn't properly execute. Furthermore, wxWindows has its
+// 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)
+
+// ========================================================================
+// wxNSApplicationObserver
+// ========================================================================
+@implementation wxNSApplicationObserver : NSObject
+
- (void)applicationWillBecomeActive:(NSNotification *)notification
{
wxTheApp->CocoaDelegate_applicationWillBecomeActive();
wxTheApp->CocoaDelegate_applicationDidResignActive();
}
-@end // implementation wxNSApplicationDelegate : NSObject
+- (void)applicationWillUpdate:(NSNotification *)notification;
+{
+ wxTheApp->CocoaDelegate_applicationWillUpdate();
+}
+
+- (void)controlTintChanged:(NSNotification *)notification
+{
+ wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));
+}
+
+@end // implementation wxNSApplicationObserver : NSObject
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationObserver,NSObject)
// ========================================================================
// wxApp
// 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
if ( argc > 1 )
{
static const wxChar *ARG_PSN = _T("-psn_");
- if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
+ if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
{
// remove this argument
--argc;
- memmove(argv + 1, argv + 2, argc * sizeof(char *));
+ 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);
}
wxDC::CocoaShutdownTextSystem();
wxMenuBarManager::DestroyInstance();
- [m_cocoaApp setDelegate:nil];
- [m_cocoaAppDelegate release];
- m_cocoaAppDelegate = NULL;
+ [[NSNotificationCenter defaultCenter] removeObserver:sg_cocoaAppObserver];
+ if(!sm_isEmbedded)
+ {
+ [m_cocoaApp setDelegate:nil];
+ [m_cocoaAppDelegate release];
+ m_cocoaAppDelegate = NULL;
+ }
wxAppBase::CleanUp();
}
{
m_topWindow = NULL;
- m_isIdle = true;
-#if WXWIN_COMPATIBILITY_2_2
- m_wantDebugOutput = TRUE;
-#endif
#ifdef __WXDEBUG__
- m_isInAssert = FALSE;
+ m_isInAssert = false;
#endif // __WXDEBUG__
argc = 0;
m_cocoaAppDelegate = NULL;
}
-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
-// We'd need Foundation/NSConnection.h for this next constant, do we need it?
- [[ NSRunLoop currentRunLoop ] performSelector:@selector(doIdle:) target:m_cocoaAppDelegate argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode,*/ NSModalPanelRunLoopMode, /**/NSEventTrackingRunLoopMode,/**/ nil] ];
- /* Notes:
- In the Mac OS X implementation of Cocoa, the above method schedules
- doIdle: to be called from *within* [NSApplication
- -nextEventMatchingMask:untilDate:inMode:dequeue:]. That is, no
- NSEvent object is generated and control does not return from that
- method. In fact, control will only return from that method for the
- usual reasons (e.g. a real event is received or the untilDate is reached).
- This has implications when trying to stop the event loop and return to
- its caller. See wxEventLoop::Exit
- */
-}
-
void wxApp::CocoaDelegate_applicationWillBecomeActive()
{
}
{
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];
- 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();
-// [ m_cocoaApp setDelegate:m_cocoaApp ];
- #if 0
- wxLogDebug("Just for kicks");
- [ m_cocoaAppDelegate 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::OnInit()
{
if(!wxAppBase::OnInit())
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
void wxApp::Exit()
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
- dequeue: YES])
- {
+ dequeue: YES];
+ if(!event)
+ break;
[GetNSApplication() sendEvent: event];
}
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;
+ m_isInAssert = true;
wxAppBase::OnAssert(file, line, cond, msg);
- m_isInAssert = FALSE;
+ m_isInAssert = false;
}
#endif // __WXDEBUG__
-
projects / wxWidgets.git / blobdiff