Fix incorrect comparison

[wxWidgets.git] / src / cocoa / app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 2ee2c6bab8f69abeca77e7b9fa5738fdbb90e60b..a246c4c211719a2522930e6671528acd4e36f80b 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -1,30 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxApp
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) David Elliott

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/app.h"
+

 #ifndef WX_PRECOMP
 #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/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"
-

 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/mbarman.h"
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/mbarman.h"

+#include "wx/cocoa/NSApplication.h"

 
 #if wxUSE_WX_RESOURCES
 #  include "wx/resource.h"
 
 #if wxUSE_WX_RESOURCES
 #  include "wx/resource.h"


@@ -32,16 +31,19 @@
 
 #import <AppKit/NSApplication.h>
 #import <Foundation/NSRunLoop.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/NSThread.h>
 #import <AppKit/NSEvent.h>

+#import <Foundation/NSString.h>
+#import <Foundation/NSNotification.h>
+#import <AppKit/NSCell.h>

 
 // ========================================================================
 // wxPoseAsInitializer
 // ========================================================================
 wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 
 
 // ========================================================================
 // wxPoseAsInitializer
 // ========================================================================
 wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 

+static bool sg_needIdle = true;
+

 // ========================================================================
 // wxPoserNSApplication
 // ========================================================================
 // ========================================================================
 // wxPoserNSApplication
 // ========================================================================


@@ -49,7 +51,7 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 {
 }
 
 {
 }
 

-- (void)doIdle: (id)data;
+- (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag;

 - (void)sendEvent: (NSEvent*)anEvent;
 @end // wxPoserNSApplication
 
 - (void)sendEvent: (NSEvent*)anEvent;
 @end // wxPoserNSApplication
 


@@ -57,43 +59,68 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 
 @implementation wxPoserNSApplication : NSApplication
 
 
 @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.
+
+    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

 {
 {

-    wxASSERT(wxTheApp);
-    wxASSERT(wxMenuBarManager::GetInstance());
-    wxMenuBarManager::GetInstance()->CocoaInternalIdle();
-    wxLogDebug("doIdle called");
+    // 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__
 #ifdef __WXDEBUG__

-    if(wxTheApp->IsInAssert())
-    {
-        wxLogDebug("Idle events ignored durring assertion dialog");
-    }
-    else
+        && !wxTheApp->IsInAssert()

 #endif
 #endif

+        && ([NSDefaultRunLoopMode isEqualToString:mode] || [NSModalPanelRunLoopMode isEqualToString:mode]))

     {
     {

-        NSRunLoop *rl = [NSRunLoop currentRunLoop];
-        // runMode: beforeDate returns YES if something was done
-        while(wxTheApp->ProcessIdle()) // FIXME: AND NO EVENTS ARE PENDING
+        sg_needIdle = false;
+        wxLogTrace(wxTRACE_COCOA,wxT("Processing idle events"));
+        while(wxTheApp->ProcessIdle())

         {
         {

-            wxLogDebug("Looping for idle events");
-            #if 1
-            if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]])
-            {
-                wxLogDebug("Found actual work to do");
-                break;
-            }
-            #endif
+            // 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"));

     }
     }

-    wxLogDebug("Idle processing complete, requesting next idle event");
-    // Add ourself back into the run loop (on next event) if necessary
-    wxTheApp->CocoaRequestIdle();
+    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
 {
 }
 
 - (void)sendEvent: (NSEvent*)anEvent
 {

-    wxLogDebug("SendEvent");
-    wxTheApp->CocoaInstallRequestedIdleHandler();
+    wxLogTrace(wxTRACE_COCOA,wxT("SendEvent"));
+    sg_needIdle = true;

     [super sendEvent: anEvent];
 }
 
     [super sendEvent: anEvent];
 }
 


@@ -102,21 +129,10 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 // ========================================================================
 // wxNSApplicationDelegate
 // ========================================================================
 // ========================================================================
 // wxNSApplicationDelegate
 // ========================================================================

-@interface wxNSApplicationDelegate : NSObject
-{
-}
-
-- (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
 
 // NOTE: Terminate means that the event loop does NOT return and thus
 @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
+// cleanup code doesn't properly execute.  Furthermore, wxWidgets has its

 // own exit on frame delete mechanism.
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
 {
 // own exit on frame delete mechanism.
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
 {


@@ -143,6 +159,11 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     wxTheApp->CocoaDelegate_applicationDidResignActive();
 }
 
     wxTheApp->CocoaDelegate_applicationDidResignActive();
 }
 

+- (void)controlTintChanged:(NSNotification *)notification
+{
+    wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));
+}
+

 @end // implementation wxNSApplicationDelegate : NSObject
 
 // ========================================================================
 @end // implementation wxNSApplicationDelegate : NSObject
 
 // ========================================================================


@@ -173,10 +194,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");
     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
         {
             // remove this argument

-            memmove(argv, argv + 1, argc--);
+            --argc;
+            memmove(argv + 1, argv + 2, argc * sizeof(wxChar *));

         }
     }
 
         }
     }
 


@@ -195,6 +217,8 @@ void wxApp::CleanUp()
     wxMenuBarManager::DestroyInstance();
 
     [m_cocoaApp setDelegate:nil];
     wxMenuBarManager::DestroyInstance();
 
     [m_cocoaApp setDelegate:nil];

+    [[NSNotificationCenter defaultCenter] removeObserver:m_cocoaAppDelegate
+        name:NSControlTintDidChangeNotification object:nil];

     [m_cocoaAppDelegate release];
     m_cocoaAppDelegate = NULL;
 
     [m_cocoaAppDelegate release];
     m_cocoaAppDelegate = NULL;
 


@@ -208,12 +232,8 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
 
 {
     m_topWindow = NULL;
 

-    m_isIdle = true;
-#if WXWIN_COMPATIBILITY_2_2
-    m_wantDebugOutput = TRUE;
-#endif

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     argc = 0;
 #endif // __WXDEBUG__
 
     argc = 0;


@@ -222,24 +242,6 @@ wxApp::wxApp()
     m_cocoaAppDelegate = NULL;
 }
 
     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_cocoaApp argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode,*/ NSModalPanelRunLoopMode, /**/NSEventTrackingRunLoopMode,/**/ nil] ];
-}
-

 void wxApp::CocoaDelegate_applicationWillBecomeActive()
 {
 }
 void wxApp::CocoaDelegate_applicationWillBecomeActive()
 {
 }


@@ -250,6 +252,7 @@ void wxApp::CocoaDelegate_applicationDidBecomeActive()
 
 void wxApp::CocoaDelegate_applicationWillResignActive()
 {
 
 void wxApp::CocoaDelegate_applicationWillResignActive()
 {

+    wxTopLevelWindowCocoa::DeactivatePendingWindow();

 }
 
 void wxApp::CocoaDelegate_applicationDidResignActive()
 }
 
 void wxApp::CocoaDelegate_applicationDidResignActive()


@@ -260,23 +263,20 @@ bool wxApp::OnInitGui()
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())
 {
     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];
 
     // 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
+        selector:@selector(controlTintChanged:)
+        name:NSControlTintDidChangeNotification object:nil];

 
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();
 
     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;
+    return true;

 }
 
 bool wxApp::CallOnInit()
 }
 
 bool wxApp::CallOnInit()


@@ -288,9 +288,9 @@ bool wxApp::CallOnInit()
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxApp::Exit()
 }
 
 void wxApp::Exit()


@@ -325,12 +325,16 @@ bool wxApp::Yield(bool onlyIfNeeded)
     s_inYield = true;
 
     // Run the event loop until it is out of events
     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
                 nextEventMatchingMask:NSAnyEventMask
                 untilDate:[NSDate distantPast]
                 inMode:NSDefaultRunLoopMode

-                dequeue: YES])
-    {
+                dequeue: YES];
+        if(!event)
+            break;

         [GetNSApplication() sendEvent: event];
     }
 
         [GetNSApplication() sendEvent: event];
     }
 


@@ -344,12 +348,19 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return true;
 }
 
     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)
 {
 #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);
     wxAppBase::OnAssert(file, line, cond, msg);

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 #endif // __WXDEBUG__
 }
 #endif // __WXDEBUG__

-