X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbbb040c9ffd6633e68bc15d0176fddacf54a824..60372b0d54379701d62edf5595a7dc25c48330e1:/src/osx/cocoa/utils.mm diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index ea7f08edd0..ac0909b64d 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: utils.mm 48805 2007-09-19 14:52:25Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -49,42 +49,36 @@ void wxBell() #if wxUSE_GUI -@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER() -{ -} - -- (void)applicationWillFinishLaunching:(NSApplication *)sender; - -- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; -- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender; -- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename; -- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event - withReplyEvent:(NSAppleEventDescriptor *)replyEvent; - -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender; -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender; -- (void)applicationWillTerminate:(NSApplication *)sender; -@end - @implementation wxNSAppController -- (void)applicationWillFinishLaunching:(NSApplication *)application { +- (void)applicationWillFinishLaunching:(NSNotification *)application { wxUnusedVar(application); -} + + // we must install our handlers later than setting the app delegate, because otherwise our handlers + // get overwritten in the meantime -- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename -{ - wxUnusedVar(sender); - wxCFStringRef cf(wxCFRetain(filename)); - wxTheApp->MacOpenFile(cf.AsString()) ; - return YES; + NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager]; + + [appleEventManager setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:) + forEventClass:kInternetEventClass andEventID:kAEGetURL]; + + [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:) + forEventClass:kCoreEventClass andEventID:kAEOpenApplication]; + } -- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender +- (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames { wxUnusedVar(sender); - wxTheApp->MacNewFile() ; - return NO; + wxArrayString fileList; + size_t i; + const size_t count = [fileNames count]; + for (i = 0; i < count; i++) + { + fileList.Add( wxCFStringRef::AsString([fileNames objectAtIndex:i]) ); + } + + wxTheApp->MacOpenFiles(fileList); } - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename @@ -112,6 +106,13 @@ void wxBell() wxTheApp->MacOpenURL(cf.AsString()) ; } +- (void)handleOpenAppEvent:(NSAppleEventDescriptor *)event + withReplyEvent:(NSAppleEventDescriptor *)replyEvent +{ + wxUnusedVar(replyEvent); + wxTheApp->MacNewFile() ; +} + /* Allowable return values are: NSTerminateNow - it is ok to proceed with termination @@ -130,7 +131,7 @@ void wxBell() return NSTerminateNow; } -- (void)applicationWillTerminate:(NSApplication *)application { +- (void)applicationWillTerminate:(NSNotification *)application { wxUnusedVar(application); wxCloseEvent event; event.SetCanVeto(false); @@ -144,6 +145,49 @@ void wxBell() return NO; } +- (void)applicationDidBecomeActive:(NSNotification *)notification +{ + wxUnusedVar(notification); + + for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), + end = wxTopLevelWindows.end(); + i != end; + ++i ) + { + wxTopLevelWindow * const win = static_cast(*i); + wxNonOwnedWindowImpl* winimpl = win ? win->GetNonOwnedPeer() : NULL; + WXWindow nswindow = win ? win->GetWXWindow() : nil; + + if ( nswindow && [nswindow hidesOnDeactivate] == NO && winimpl) + winimpl->RestoreWindowLevel(); + } + if ( wxTheApp ) + wxTheApp->SetActive( true , NULL ) ; +} + +- (void)applicationWillResignActive:(NSNotification *)notification +{ + wxUnusedVar(notification); + for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), + end = wxTopLevelWindows.end(); + i != end; + ++i ) + { + wxTopLevelWindow * const win = static_cast(*i); + WXWindow nswindow = win ? win->GetWXWindow() : nil; + + if ( nswindow && [nswindow level] == kCGFloatingWindowLevel && [nswindow hidesOnDeactivate] == NO ) + [nswindow setLevel:kCGNormalWindowLevel]; + } +} + +- (void)applicationDidResignActive:(NSNotification *)notification +{ + wxUnusedVar(notification); + if ( wxTheApp ) + wxTheApp->SetActive( false , NULL ) ; +} + @end /* @@ -153,7 +197,7 @@ void wxBell() @implementation ModalDialogDelegate - (id)init { - [super init]; + self = [super init]; sheetFinished = NO; resultCode = -1; impl = 0; @@ -207,10 +251,6 @@ bool wxApp::DoInitGui() wxNSAppController* controller = [[wxNSAppController alloc] init]; [NSApp setDelegate:controller]; - NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager]; - [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:) - forEventClass:kInternetEventClass andEventID:kAEGetURL]; - // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads // to the duplication of menus under 10.5 and a warning under 10.6 #if 0 @@ -265,10 +305,10 @@ wxMouseState wxGetMouseState() ms.SetMiddleDown( (buttons & 0x04) != 0 ); ms.SetRightDown( (buttons & 0x02) != 0 ); - ms.SetControlDown(modifiers & NSControlKeyMask); + ms.SetRawControlDown(modifiers & NSControlKeyMask); ms.SetShiftDown(modifiers & NSShiftKeyMask); ms.SetAltDown(modifiers & NSAlternateKeyMask); - ms.SetMetaDown(modifiers & NSCommandKeyMask); + ms.SetControlDown(modifiers & NSCommandKeyMask); return ms; } @@ -290,6 +330,13 @@ void wxBeginBusyCursor(const wxCursor *cursor) { if (gs_wxBusyCursorCount++ == 0) { + NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator]; + id object; + + while ((object = [enumerator nextObject])) { + [(NSWindow*) object disableCursorRects]; + } + gMacStoredActiveCursor = gMacCurrentCursor; cursor->MacInstall(); @@ -306,10 +353,17 @@ void wxEndBusyCursor() if (--gs_wxBusyCursorCount == 0) { - gMacStoredActiveCursor.MacInstall(); - gMacStoredActiveCursor = wxNullCursor; + NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator]; + id object; + + while ((object = [enumerator nextObject])) { + [(NSWindow*) object enableCursorRects]; + } wxSetCursor(wxNullCursor); + + gMacStoredActiveCursor.MacInstall(); + gMacStoredActiveCursor = wxNullCursor; } } @@ -328,35 +382,33 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const wxSize sz = m_window->GetSize(); - int left = subrect != NULL ? subrect->x : 0 ; - int top = subrect != NULL ? subrect->y : 0 ; int width = subrect != NULL ? subrect->width : sz.x; int height = subrect != NULL ? subrect->height : sz.y ; - NSRect rect = NSMakeRect(left, top, width, height ); - NSView* view = (NSView*) m_window->GetHandle(); - [view lockFocus]; - // we use this method as other methods force a repaint, and this method can be - // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow) - NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain]; - [view unlockFocus]; - wxBitmap bitmap(width, height); - if ( [rep respondsToSelector:@selector(CGImage)] ) - { - CGImageRef cgImageRef = (CGImageRef)[rep CGImage]; - CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) ); - // since our context is upside down we dont use CGContextDrawImage - wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ; - CGImageRelease(cgImageRef); - cgImageRef = NULL; - } - else + NSView* view = (NSView*) m_window->GetHandle(); + if ( [view isHiddenOrHasHiddenAncestor] == NO ) { - // TODO for 10.4 in case we can support this for osx_cocoa + [view lockFocus]; + // we use this method as other methods force a repaint, and this method can be + // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow) + NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]]; + [view unlockFocus]; + if ( [rep respondsToSelector:@selector(CGImage)] ) + { + CGImageRef cgImageRef = (CGImageRef)[rep CGImage]; + + CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) ); + // since our context is upside down we dont use CGContextDrawImage + wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ; + } + else + { + // TODO for 10.4 in case we can support this for osx_cocoa + } + [rep release]; } - [rep release]; return bitmap; }