X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7eea25638c6535d11e248ef8c4621f6ccd791b..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/osx/cocoa/utils.mm?ds=sidebyside diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 8d74b22883..f4702bb185 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -4,21 +4,20 @@ // 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 ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" -#include "wx/wxprec.h" - #include "wx/utils.h" #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/app.h" #if wxUSE_GUI + #include "wx/dialog.h" #include "wx/toplevel.h" #include "wx/font.h" #endif @@ -38,7 +37,7 @@ #if wxOSX_USE_COCOA -#if wxUSE_BASE +#if wxUSE_GUI // Emit a beeeeeep void wxBell() @@ -46,82 +45,68 @@ void wxBell() NSBeep(); } -// ---------------------------------------------------------------------------- -// Common Event Support -// ---------------------------------------------------------------------------- +@implementation wxNSAppController -void wxMacWakeUp() -{ - // ensure that we have an auto release pool in place because the event will - // be autoreleased from NSEvent:otherEventWithType and we might not have a - // global pool during startup or shutdown and we actually never have it if - // we're called from another thread - // - // FIXME: we can't use wxMacAutoreleasePool here because it's in core and - // we're in base - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSEvent* wakeupEvent = [NSEvent otherEventWithType:NSApplicationDefined - location:NSZeroPoint - modifierFlags:NSAnyEventMask - timestamp:0 - windowNumber:0 - context:nil - subtype:0 - data1:0 - data2:0]; - [NSApp postEvent:wakeupEvent atStart:NO]; - - [pool release]; +- (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 + + 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]; + } -#endif // wxUSE_BASE - -#if wxUSE_GUI - -@interface wxNSAppController : NSObject -{ -} - -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender; -- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; -- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender; -- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename; -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender; -- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event - withReplyEvent:(NSAppleEventDescriptor *)replyEvent; -@end - -@implementation wxNSAppController - -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender +- (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames { wxUnusedVar(sender); - // let wx do this, not cocoa - return NO; + wxArrayString fileList; + size_t i; + const size_t count = [fileNames count]; + for (i = 0; i < count; i++) + { + fileList.Add( wxCFStringRef::AsStringWithNormalizationFormC([fileNames objectAtIndex:i]) ); + } + + wxTheApp->MacOpenFiles(fileList); } -- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; +- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename { wxUnusedVar(sender); wxCFStringRef cf(wxCFRetain(filename)); - wxTheApp->MacOpenFile(cf.AsString()) ; + wxTheApp->MacPrintFile(cf.AsString()) ; return YES; } -- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender; +- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag { + wxUnusedVar(flag); wxUnusedVar(sender); - wxTheApp->MacNewFile() ; + wxTheApp->MacReopenApp() ; return NO; } -- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename +- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event + withReplyEvent:(NSAppleEventDescriptor *)replyEvent { - wxUnusedVar(sender); - wxCFStringRef cf(wxCFRetain(filename)); - wxTheApp->MacPrintFile(cf.AsString()) ; - return YES; + wxUnusedVar(replyEvent); + NSString* url = [[event descriptorAtIndex:1] stringValue]; + wxCFStringRef cf(wxCFRetain(url)); + wxTheApp->MacOpenURL(cf.AsString()) ; +} + +- (void)handleOpenAppEvent:(NSAppleEventDescriptor *)event + withReplyEvent:(NSAppleEventDescriptor *)replyEvent +{ + wxUnusedVar(replyEvent); + wxTheApp->MacNewFile() ; } /* @@ -134,36 +119,71 @@ void wxMacWakeUp() - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender { wxUnusedVar(sender); - wxWindow* win = wxTheApp->GetTopWindow() ; - if ( win ) - { - wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId); - if (!win->GetEventHandler()->ProcessEvent(exitEvent)) - win->Close(true) ; - } - else - { - wxTheApp->ExitMainLoop() ; - } - return NSTerminateCancel; + wxCloseEvent event; + wxTheApp->OnQueryEndSession(event); + if ( event.GetVeto() ) + return NSTerminateCancel; + + return NSTerminateNow; } -- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag +- (void)applicationWillTerminate:(NSNotification *)application { + wxUnusedVar(application); + wxCloseEvent event; + event.SetCanVeto(false); + wxTheApp->OnEndSession(event); +} + +- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender { - wxUnusedVar(flag); wxUnusedVar(sender); - wxTheApp->MacReopenApp() ; + // let wx do this, not cocoa return NO; } -- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event - withReplyEvent:(NSAppleEventDescriptor *)replyEvent +- (void)applicationDidBecomeActive:(NSNotification *)notification { - wxUnusedVar(replyEvent); - NSString* url = [[event descriptorAtIndex:1] stringValue]; - wxCFStringRef cf(wxCFRetain(url)); - wxTheApp->MacOpenURL(cf.AsString()) ; + 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 /* @@ -173,12 +193,18 @@ void wxMacWakeUp() @implementation ModalDialogDelegate - (id)init { - [super init]; + self = [super init]; sheetFinished = NO; resultCode = -1; + impl = 0; return self; } +- (void)setImplementation: (wxDialog *)dialog +{ + impl = dialog; +} + - (BOOL)finished { return sheetFinished; @@ -205,34 +231,83 @@ void wxMacWakeUp() // NSAlerts don't need nor respond to orderOut if ([sheet respondsToSelector:@selector(orderOut:)]) [sheet orderOut: self]; + + if (impl) + impl->ModalFinishedCallback(sheet, returnCode); +} +@end + +// here we subclass NSApplication, for the purpose of being able to override sendEvent. +@interface wxNSApplication : NSApplication +{ +} + +- (void)sendEvent:(NSEvent *)anEvent; + +@end + +@implementation wxNSApplication + +/* This is needed because otherwise we don't receive any key-up events for command-key + combinations (an AppKit bug, apparently) */ +- (void)sendEvent:(NSEvent *)anEvent +{ + if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask)) + [[self keyWindow] sendEvent:anEvent]; + else [super sendEvent:anEvent]; } + @end +WX_NSObject appcontroller = nil; + +NSLayoutManager* gNSLayoutManager = nil; + +WX_NSObject wxApp::OSXCreateAppController() +{ + return [[wxNSAppController alloc] init]; +} + bool wxApp::DoInitGui() { wxMacAutoreleasePool pool; - [NSApplication sharedApplication]; if (!sm_isEmbedded) { - wxNSAppController* controller = [[wxNSAppController alloc] init]; - [[NSApplication sharedApplication] setDelegate:controller]; + [wxNSApplication sharedApplication]; - NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager]; - [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:) - forEventClass:kInternetEventClass andEventID:kAEGetURL]; + appcontroller = OSXCreateAppController(); + [NSApp setDelegate:appcontroller]; + + // 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 [NSApp finishLaunching]; +#endif } + gNSLayoutManager = [[NSLayoutManager alloc] init]; + return true; } void wxApp::DoCleanUp() { + if ( appcontroller != nil ) + { + [NSApp setDelegate:nil]; + [appcontroller release]; + appcontroller = nil; + } + if ( gNSLayoutManager != nil ) + { + [gNSLayoutManager release]; + gNSLayoutManager = nil; + } } void wxClientDisplayRect(int *x, int *y, int *width, int *height) { - NSRect displayRect = [[NSScreen mainScreen] visibleFrame]; + NSRect displayRect = [wxOSXGetMenuScreen() visibleFrame]; wxRect r = wxFromNSRect( NULL, displayRect ); if ( x ) *x = r.x; @@ -254,6 +329,34 @@ void wxGetMousePosition( int* x, int* y ) *y = pt.y; }; +#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 + +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + + wxPoint pt = wxGetMousePosition(); + ms.SetX(pt.x); + ms.SetY(pt.y); + + NSUInteger modifiers = [NSEvent modifierFlags]; + NSUInteger buttons = [NSEvent pressedMouseButtons]; + + ms.SetLeftDown( (buttons & 0x01) != 0 ); + ms.SetMiddleDown( (buttons & 0x04) != 0 ); + ms.SetRightDown( (buttons & 0x02) != 0 ); + + ms.SetRawControlDown(modifiers & NSControlKeyMask); + ms.SetShiftDown(modifiers & NSShiftKeyMask); + ms.SetAltDown(modifiers & NSAlternateKeyMask); + ms.SetControlDown(modifiers & NSCommandKeyMask); + + return ms; +} + + +#endif + wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) { return new wxOSXTimerImpl(timer); @@ -268,6 +371,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(); @@ -284,10 +394,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; } } @@ -306,35 +423,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; }