// Created: 2002/11/27
// RCS-ID: $Id$
// Copyright: (c) David Elliott
+// Software 2000 Ltd.
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+#include "wx/app.h"
+
#ifndef WX_PRECOMP
- #include "wx/app.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"
#include "wx/cocoa/NSApplication.h"
-#if wxUSE_WX_RESOURCES
-# include "wx/resource.h"
-#endif
-
#import <AppKit/NSApplication.h>
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSThread.h>
#import <Foundation/NSNotification.h>
#import <AppKit/NSCell.h>
-// ========================================================================
-// wxPoseAsInitializer
-// ========================================================================
-wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
+bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin
-static bool sg_needIdle = true;
-
-// ========================================================================
-// wxPoserNSApplication
-// ========================================================================
-@interface wxPoserNSApplication : NSApplication
-{
-}
-
-- (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag;
-- (void)sendEvent: (NSEvent*)anEvent;
-@end // wxPoserNSApplication
-
-WX_IMPLEMENT_POSER(wxPoserNSApplication);
-
-@implementation wxPoserNSApplication : NSApplication
-
-/* 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
-{
- // 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]))
- {
- sg_needIdle = false;
- wxLogTrace(wxTRACE_COCOA,wxT("Processing idle events"));
- while(wxTheApp->ProcessIdle())
- {
- // 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"));
- }
- // No more idle work requested, block
- wxLogTrace(wxTRACE_COCOA,wxT("Finished idle processing"));
- }
- 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
-{
- wxLogTrace(wxTRACE_COCOA,wxT("SendEvent"));
- sg_needIdle = true;
- [super sendEvent: anEvent];
-}
-
-@end // wxPoserNSApplication
+// wxNSApplicationObserver singleton.
+static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[WX_GET_OBJC_CLASS(wxNSApplicationObserver) alloc] init];
// ========================================================================
// wxNSApplicationDelegate
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();
}
+- (void)applicationWillUpdate:(NSNotification *)notification;
+{
+ wxTheApp->CocoaDelegate_applicationWillUpdate();
+}
+
- (void)controlTintChanged:(NSNotification *)notification
{
wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));
}
-@end // implementation wxNSApplicationDelegate : NSObject
+@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
}
}
- // 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];
- [[NSNotificationCenter defaultCenter] removeObserver:m_cocoaAppDelegate
- name:NSControlTintDidChangeNotification object: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();
}
// 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
+
+ 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];
- wxMenuBarManager::CreateInstance();
+ if(!sm_isEmbedded)
+ wxMenuBarManager::CreateInstance();
wxDC::CocoaInitializeTextSystem();
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()
{
// wxAutoNSAutoreleasePool pool;
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)
{
projects / wxWidgets.git / blobdiff