// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/defs.h"
#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"
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSThread.h>
+#import <AppKit/NSEvent.h>
+#import <Foundation/NSString.h>
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
+// ========================================================================
+// 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.
+*/
+
+- (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:nil/* equivalent to [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;
+ wxLogDebug(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:nil/* equivalent to [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
+ wxLogDebug(wxT("Looping idle events"));
}
- #endif
+ // No more idle work requested, block
+ wxLogDebug(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
+ wxLogDebug(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();
+ wxLogDebug(wxT("SendEvent"));
+ sg_needIdle = true;
[super sendEvent: anEvent];
}
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
+@end // wxPoserNSApplication
+
+// ========================================================================
+// wxNSApplicationDelegate
+// ========================================================================
+@interface wxNSApplicationDelegate : NSObject
{
- BOOL ret = wxTheApp->GetExitOnFrameDelete();
- wxLogDebug("applicationShouldTermintaeAfterLastWindowClosed=%d",ret);
- return ret;
}
-@end // wxPoserNSApplication
-WX_IMPLEMENT_POSER(wxPoserNSApplication);
+// 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
-class wxAutoNSAutoreleasePool
+@implementation wxNSApplicationDelegate : NSObject
+
+// NOTE: Terminate means that the event loop does NOT return and thus
+// cleanup code doesn't properly execute. Furthermore, wxWindows has its
+// own exit on frame delete mechanism.
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
{
-public:
- wxAutoNSAutoreleasePool()
- {
- m_pool = [[NSAutoreleasePool alloc] init];
- }
- ~wxAutoNSAutoreleasePool()
- {
- [m_pool release];
- }
-protected:
- NSAutoreleasePool *m_pool;
-};
+ return NO;
+}
-// ============================================================================
-// functions
-// ============================================================================
+- (void)applicationWillBecomeActive:(NSNotification *)notification
+{
+ wxTheApp->CocoaDelegate_applicationWillBecomeActive();
+}
-void wxApp::Exit()
+- (void)applicationDidBecomeActive:(NSNotification *)notification
{
- wxApp::CleanUp();
+ wxTheApp->CocoaDelegate_applicationDidBecomeActive();
+}
- wxAppConsole::Exit();
+- (void)applicationWillResignActive:(NSNotification *)notification
+{
+ wxTheApp->CocoaDelegate_applicationWillResignActive();
+}
+
+- (void)applicationDidResignActive:(NSNotification *)notification
+{
+ wxTheApp->CocoaDelegate_applicationDidResignActive();
}
-// ============================================================================
-// 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(wxApp::OnIdle)
+ 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 *));
}
}
void wxApp::CleanUp()
{
+ wxAutoNSAutoreleasePool pool;
+
wxDC::CocoaShutdownTextSystem();
+ wxMenuBarManager::DestroyInstance();
+
+ [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::CocoaInstallIdleHandler()
+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()
// Create the app using the sharedApplication method
m_cocoaApp = [NSApplication sharedApplication];
+ m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init];
+ [m_cocoaApp setDelegate:m_cocoaAppDelegate];
+
+ 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;
}
bool wxApp::CallOnInit()
{
- wxAutoNSAutoreleasePool pool;
+// wxAutoNSAutoreleasePool pool;
return OnInit();
}
return TRUE;
}
-bool wxApp::Initialized()
-{
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
-}
-
-int wxApp::MainLoop()
-{
- [m_cocoaApp run];
- return 0;
-}
-
-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];
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
- return 0;
-}
-
-// Dispatch a message.
-void wxApp::Dispatch()
-{
-}
-
-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::Exit()
{
- wxLogDebug("wxApp::OnIdle");
-#if 0
- static bool s_inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if ( s_inOnIdle )
- return;
- s_inOnIdle = TRUE;
-#endif
-
-
- DeletePendingObjects();
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
-#if 0
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-
- if (needMore)
- event.RequestMore(TRUE);
+ wxApp::CleanUp();
- s_inOnIdle = FALSE;
-#endif
+ 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(NSEvent *event = [GetNSApplication()
+ nextEventMatchingMask:NSAnyEventMask
+ untilDate:[NSDate distantPast]
+ inMode:NSDefaultRunLoopMode
+ dequeue: YES])
+ {
+ [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];
+}
+
+#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