X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a038ddca4ae6ddff438695760d94d6fa935bfd4..bc9d3d911cfb51f612a699d7fb00f57eb5b2097c:/src/osx/cocoa/window.mm diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index f645830968..7b30bf644f 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 2008-06-20 -// RCS-ID: $Id: window.mm 48805 2007-09-19 14:52:25Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,14 +13,18 @@ #ifndef WX_PRECOMP #include "wx/dcclient.h" - #include "wx/nonownedwnd.h" + #include "wx/frame.h" #include "wx/log.h" + #include "wx/textctrl.h" + #include "wx/combobox.h" #endif #ifdef __WXMAC__ #include "wx/osx/private.h" #endif +#include "wx/evtloop.h" + #if wxUSE_CARET #include "wx/caret.h" #endif @@ -29,6 +33,10 @@ #include "wx/dnd.h" #endif +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif + #include // Get the window with the focus @@ -38,7 +46,7 @@ NSView* GetViewFromResponder( NSResponder* responder ) NSView* view = nil; if ( [responder isKindOfClass:[NSTextView class]] ) { - NSView* delegate = [(NSTextView*)responder delegate]; + NSView* delegate = (NSView*) [(NSTextView*)responder delegate]; if ( [delegate isKindOfClass:[NSTextField class] ] ) view = delegate; else @@ -63,7 +71,7 @@ NSView* GetFocusedViewInWindow( NSWindow* keyWindow ) WXWidget wxWidgetImpl::FindFocus() { - return GetFocusedViewInWindow( [[NSApplication sharedApplication] keyWindow] ); + return GetFocusedViewInWindow( [NSApp keyWindow] ); } NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) @@ -79,15 +87,16 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const @interface wxNSView : NSView { - NSTrackingRectTag rectTag; + BOOL _hasToolTip; + NSTrackingRectTag _lastToolTipTrackTag; + id _lastToolTipOwner; + void* _lastUserData; + } -// the tracking tag is needed to track mouse enter / exit events -- (void) setTrackingTag: (NSTrackingRectTag)tag; -- (NSTrackingRectTag) trackingTag; @end // wxNSView -@interface NSView(PossibleMethods) +@interface NSView(PossibleMethods) - (void)setTitle:(NSString *)aString; - (void)setStringValue:(NSString *)aString; - (void)setIntValue:(int)anInt; @@ -114,70 +123,139 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const - (void)setTarget:(id)anObject; - (void)setAction:(SEL)aSelector; - (void)setDoubleAction:(SEL)aSelector; -@end +- (void)setBackgroundColor:(NSColor*)aColor; +- (void)setOpaque:(BOOL)opaque; +- (void)setTextColor:(NSColor *)color; +- (void)setImagePosition:(NSCellImagePosition)aPosition; +@end + +// The following code is a combination of the code listed here: +// http://lists.apple.com/archives/cocoa-dev/2008/Apr/msg01582.html +// (which can't be used because KLGetCurrentKeyboardLayout etc aren't 64-bit) +// and the code here: +// http://inquisitivecocoa.com/category/objective-c/ +@interface NSEvent (OsGuiUtilsAdditions) +- (NSString*) charactersIgnoringModifiersIncludingShift; +@end + +@implementation NSEvent (OsGuiUtilsAdditions) +- (NSString*) charactersIgnoringModifiersIncludingShift { + // First try -charactersIgnoringModifiers and look for keys which UCKeyTranslate translates + // differently than AppKit. + NSString* c = [self charactersIgnoringModifiers]; + if ([c length] == 1) { + unichar codepoint = [c characterAtIndex:0]; + if ((codepoint >= 0xF700 && codepoint <= 0xF8FF) || codepoint == 0x7F) { + return c; + } + } + // This is not a "special" key, so ask UCKeyTranslate to give us the character with no + // modifiers attached. Actually, that's not quite accurate; we attach the Command modifier + // which hints the OS to use Latin characters where possible, which is generally what we want. + NSString* result = @""; + TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource(); + CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData); + CFRelease(currentKeyboard); + if (uchr == NULL) { + // this can happen for some non-U.S. input methods (eg. Romaji or Hiragana) + return c; + } + const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr); + if (keyboardLayout) { + UInt32 deadKeyState = 0; + UniCharCount maxStringLength = 255; + UniCharCount actualStringLength = 0; + UniChar unicodeString[maxStringLength]; + + OSStatus status = UCKeyTranslate(keyboardLayout, + [self keyCode], + kUCKeyActionDown, + cmdKey >> 8, // force the Command key to "on" + LMGetKbdType(), + kUCKeyTranslateNoDeadKeysMask, + &deadKeyState, + maxStringLength, + &actualStringLength, + unicodeString); + + if(status == noErr) + result = [NSString stringWithCharacters:unicodeString length:(NSInteger)actualStringLength]; + } + return result; +} +@end -long wxOSXTranslateCocoaKey( NSEvent* event ) +long wxOSXTranslateCocoaKey( NSEvent* event, int eventType ) { long retval = 0; if ([event type] != NSFlagsChanged) - { - NSString* s = [event charactersIgnoringModifiers]; + { + NSString* s = [event charactersIgnoringModifiersIncludingShift]; // backspace char reports as delete w/modifiers for some reason if ([s length] == 1) { - switch ( [s characterAtIndex:0] ) + if ( eventType == wxEVT_CHAR && ([event modifierFlags] & NSControlKeyMask) && ( [s characterAtIndex:0] >= 'a' && [s characterAtIndex:0] <= 'z' ) ) { - // backspace key - case 0x7F : - case 8 : - retval = WXK_BACK; - break; - case NSUpArrowFunctionKey : - retval = WXK_UP; - break; - case NSDownArrowFunctionKey : - retval = WXK_DOWN; - break; - case NSLeftArrowFunctionKey : - retval = WXK_LEFT; - break; - case NSRightArrowFunctionKey : - retval = WXK_RIGHT; - break; - case NSInsertFunctionKey : - retval = WXK_INSERT; - break; - case NSDeleteFunctionKey : - retval = WXK_DELETE; - break; - case NSHomeFunctionKey : - retval = WXK_HOME; - break; - // case NSBeginFunctionKey : - // retval = WXK_BEGIN; - // break; - case NSEndFunctionKey : - retval = WXK_END; - break; - case NSPageUpFunctionKey : - retval = WXK_PAGEUP; - break; - case NSPageDownFunctionKey : - retval = WXK_PAGEDOWN; - break; - case NSHelpFunctionKey : - retval = WXK_HELP; - break; - default: - int intchar = [s characterAtIndex: 0]; - if ( intchar >= NSF1FunctionKey && intchar <= NSF24FunctionKey ) - retval = WXK_F1 + (intchar - NSF1FunctionKey ); - break; + retval = WXK_CONTROL_A + ([s characterAtIndex:0] - 'a'); + } + else + { + switch ( [s characterAtIndex:0] ) + { + // backspace key + case 0x7F : + case 8 : + retval = WXK_BACK; + break; + case NSUpArrowFunctionKey : + retval = WXK_UP; + break; + case NSDownArrowFunctionKey : + retval = WXK_DOWN; + break; + case NSLeftArrowFunctionKey : + retval = WXK_LEFT; + break; + case NSRightArrowFunctionKey : + retval = WXK_RIGHT; + break; + case NSInsertFunctionKey : + retval = WXK_INSERT; + break; + case NSDeleteFunctionKey : + retval = WXK_DELETE; + break; + case NSHomeFunctionKey : + retval = WXK_HOME; + break; + // case NSBeginFunctionKey : + // retval = WXK_BEGIN; + // break; + case NSEndFunctionKey : + retval = WXK_END; + break; + case NSPageUpFunctionKey : + retval = WXK_PAGEUP; + break; + case NSPageDownFunctionKey : + retval = WXK_PAGEDOWN; + break; + case NSHelpFunctionKey : + retval = WXK_HELP; + break; + default: + int intchar = [s characterAtIndex: 0]; + if ( intchar >= NSF1FunctionKey && intchar <= NSF24FunctionKey ) + retval = WXK_F1 + (intchar - NSF1FunctionKey ); + else if ( intchar > 0 && intchar < 32 ) + retval = intchar; + break; + } } } } - + // Some keys don't seem to have constants. The code mimics the approach // taken by WebKit. See: // http://trac.webkit.org/browser/trunk/WebCore/platform/mac/KeyEventMac.mm @@ -186,7 +264,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event ) // command key case 54: case 55: - retval = WXK_COMMAND; + retval = WXK_CONTROL; break; // caps locks key case 57: // Capslock @@ -205,20 +283,20 @@ long wxOSXTranslateCocoaKey( NSEvent* event ) // ctrl key case 59: // Left Ctrl case 62: // Right Ctrl - retval = WXK_CONTROL; + retval = WXK_RAW_CONTROL; break; // clear key - case 71: + case 71: retval = WXK_CLEAR; break; // tab key - case 48: + case 48: retval = WXK_TAB; break; case 75: // / retval = WXK_NUMPAD_DIVIDE; - break; + break; case 67: // * retval = WXK_NUMPAD_MULTIPLY; break; @@ -271,25 +349,25 @@ long wxOSXTranslateCocoaKey( NSEvent* event ) return retval; } -void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString = NULL ) +void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString) { UInt32 modifiers = [nsEvent modifierFlags] ; int eventType = [nsEvent type]; wxevent.m_shiftDown = modifiers & NSShiftKeyMask; - wxevent.m_controlDown = modifiers & NSControlKeyMask; + wxevent.m_rawControlDown = modifiers & NSControlKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask; - wxevent.m_metaDown = modifiers & NSCommandKeyMask; - + wxevent.m_controlDown = modifiers & NSCommandKeyMask; + wxevent.m_rawCode = [nsEvent keyCode]; wxevent.m_rawFlags = modifiers; - + wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ; wxString chars; if ( eventType != NSFlagsChanged ) { - NSString* nschars = (wxevent.GetEventType() != wxEVT_CHAR) ? [nsEvent charactersIgnoringModifiers] : [nsEvent characters]; + NSString* nschars = [[nsEvent charactersIgnoringModifiersIncludingShift] uppercaseString]; if ( charString ) { // if charString is set, it did not come from key up / key down @@ -301,13 +379,13 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin chars = wxCFStringRef::AsString(nschars); } } - + int aunichar = chars.Length() > 0 ? chars[0] : 0; long keyval = 0; - + if (wxevent.GetEventType() != wxEVT_CHAR) { - keyval = wxOSXTranslateCocoaKey(nsEvent) ; + keyval = wxOSXTranslateCocoaKey(nsEvent, wxevent.GetEventType()) ; switch (eventType) { case NSKeyDown : @@ -328,8 +406,8 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin case WXK_ALT: wxevent.SetEventType( wxevent.m_altDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); break; - case WXK_COMMAND: - wxevent.SetEventType( wxevent.m_metaDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); + case WXK_RAW_CONTROL: + wxevent.SetEventType( wxevent.m_rawControlDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); break; } break; @@ -345,35 +423,78 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin else keyval = aunichar; } - + #if wxUSE_UNICODE - wxevent.m_uniChar = aunichar; + // OS X generates events with key codes in Unicode private use area for + // unprintable symbols such as cursor arrows (WXK_UP is mapped to U+F700) + // and function keys (WXK_F2 is U+F705). We don't want to use them as the + // result of wxKeyEvent::GetUnicodeKey() however as it's supposed to return + // WXK_NONE for "non characters" so explicitly exclude them. + // + // We only exclude the private use area inside the Basic Multilingual Plane + // as key codes beyond it don't seem to be currently used. + if ( !(aunichar >= 0xe000 && aunichar < 0xf900) ) + wxevent.m_uniChar = aunichar; #endif wxevent.m_keyCode = keyval; + + wxWindowMac* peer = GetWXPeer(); + if ( peer ) + { + wxevent.SetEventObject(peer); + wxevent.SetId(peer->GetId()) ; + } } UInt32 g_lastButton = 0 ; bool g_lastButtonWasFakeRight = false ; -void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) +// better scroll wheel support +// see http://lists.apple.com/archives/cocoa-dev/2007/Feb/msg00050.html + +@interface NSEvent (DeviceDelta) +- (CGFloat)deviceDeltaX; +- (CGFloat)deviceDeltaY; + +// 10.7+ +- (BOOL)hasPreciseScrollingDeltas; +- (CGFloat)scrollingDeltaX; +- (CGFloat)scrollingDeltaY; +@end + +void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) { int eventType = [nsEvent type]; UInt32 modifiers = [nsEvent modifierFlags] ; - wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]); + + NSPoint locationInWindow = [nsEvent locationInWindow]; + + // adjust coordinates for the window of the target view + if ( [nsEvent window] != [m_osxView window] ) + { + if ( [nsEvent window] != nil ) + locationInWindow = [[nsEvent window] convertBaseToScreen:locationInWindow]; + + if ( [m_osxView window] != nil ) + locationInWindow = [[m_osxView window] convertScreenToBase:locationInWindow]; + } + + NSPoint locationInView = [m_osxView convertPoint:locationInWindow fromView:nil]; + wxPoint locationInViewWX = wxFromNSPoint( m_osxView, locationInView ); // these parameters are not given for all events UInt32 button = [nsEvent buttonNumber]; UInt32 clickCount = 0; - wxevent.m_x = screenMouseLocation.x; - wxevent.m_y = screenMouseLocation.y; + wxevent.m_x = locationInViewWX.x; + wxevent.m_y = locationInViewWX.y; wxevent.m_shiftDown = modifiers & NSShiftKeyMask; - wxevent.m_controlDown = modifiers & NSControlKeyMask; + wxevent.m_rawControlDown = modifiers & NSControlKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask; - wxevent.m_metaDown = modifiers & NSCommandKeyMask; + wxevent.m_controlDown = modifiers & NSCommandKeyMask; wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ; - UInt32 mouseChord = 0; + UInt32 mouseChord = 0; switch (eventType) { @@ -488,19 +609,59 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSScrollWheel : { + float deltaX = 0.0; + float deltaY = 0.0; + wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; + + if ( UMAGetSystemVersion() >= 0x1070 ) + { + if ( [nsEvent hasPreciseScrollingDeltas] ) + { + deltaX = [nsEvent scrollingDeltaX]; + deltaY = [nsEvent scrollingDeltaY]; + } + else + { + deltaX = [nsEvent scrollingDeltaX] * 10; + deltaY = [nsEvent scrollingDeltaY] * 10; + } + } + else + { + const EventRef cEvent = (EventRef) [nsEvent eventRef]; + // see http://developer.apple.com/qa/qa2005/qa1453.html + // for more details on why we have to look for the exact type + + bool isMouseScrollEvent = false; + if ( cEvent ) + isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll; + + if ( isMouseScrollEvent ) + { + deltaX = [nsEvent deviceDeltaX]; + deltaY = [nsEvent deviceDeltaY]; + } + else + { + deltaX = ([nsEvent deltaX] * 10); + deltaY = ([nsEvent deltaY] * 10); + } + } + wxevent.m_wheelDelta = 10; wxevent.m_linesPerAction = 1; - - if ( fabs([nsEvent deltaX]) > fabs([nsEvent deltaY]) ) + + if ( fabs(deltaX) > fabs(deltaY) ) { - wxevent.m_wheelAxis = 1; - wxevent.m_wheelRotation = (int)([nsEvent deltaX] * 10); + wxevent.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; + wxevent.m_wheelRotation = (int)deltaX; } else { - wxevent.m_wheelRotation = (int)([nsEvent deltaY] * 10); + wxevent.m_wheelRotation = (int)deltaY; } + } break ; @@ -519,9 +680,14 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) default : break ; } - + wxevent.m_clickCount = clickCount; - + wxWindowMac* peer = GetWXPeer(); + if ( peer ) + { + wxevent.SetEventObject(peer); + wxevent.SetId(peer->GetId()) ; + } } @implementation wxNSView @@ -529,23 +695,94 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) + (void)initialize { static BOOL initialized = NO; - if (!initialized) + if (!initialized) { initialized = YES; wxOSXCocoaClassAddWXMethods( self ); } } -- (void) setTrackingTag: (NSTrackingRectTag)tag +/* idea taken from webkit sources: overwrite the methods that (private) NSToolTipManager will use to attach its tracking rectangle + * then when changing the tooltip send fake view-exit and view-enter methods which will lead to a tooltip refresh + */ + + +- (void)_sendToolTipMouseExited +{ + // Nothing matters except window, trackingNumber, and userData. + NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited + location:NSMakePoint(0, 0) + modifierFlags:0 + timestamp:0 + windowNumber:[[self window] windowNumber] + context:NULL + eventNumber:0 + trackingNumber:_lastToolTipTrackTag + userData:_lastUserData]; + [_lastToolTipOwner mouseExited:fakeEvent]; +} + +- (void)_sendToolTipMouseEntered { - rectTag = tag; + // Nothing matters except window, trackingNumber, and userData. + NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered + location:NSMakePoint(0, 0) + modifierFlags:0 + timestamp:0 + windowNumber:[[self window] windowNumber] + context:NULL + eventNumber:0 + trackingNumber:_lastToolTipTrackTag + userData:_lastUserData]; + [_lastToolTipOwner mouseEntered:fakeEvent]; +} + +- (void)setToolTip:(NSString *)string; +{ + if (string) + { + if ( _hasToolTip ) + { + [self _sendToolTipMouseExited]; + } + + [super setToolTip:string]; + _hasToolTip = YES; + [self _sendToolTipMouseEntered]; + } + else + { + if ( _hasToolTip ) + { + [self _sendToolTipMouseExited]; + [super setToolTip:nil]; + _hasToolTip = NO; + } + } } -- (NSTrackingRectTag) trackingTag +- (NSTrackingRectTag)addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)assumeInside { - return rectTag; + NSTrackingRectTag tag = [super addTrackingRect:rect owner:owner userData:data assumeInside:assumeInside]; + if ( owner != self ) + { + _lastUserData = data; + _lastToolTipOwner = owner; + _lastToolTipTrackTag = tag; + } + return tag; } +- (void)removeTrackingRect:(NSTrackingRectTag)tag +{ + if (tag == _lastToolTipTrackTag) + { + _lastUserData = NULL; + _lastToolTipOwner = nil; + _lastToolTipTrackTag = 0; + } + [super removeTrackingRect:tag]; +} @end // wxNSView // @@ -562,7 +799,7 @@ NSDragOperation wxOSX_draggingEntered( id self, SEL _cmd, id sen wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NSDragOperationNone; - + return impl->draggingEntered(sender, self, _cmd); } @@ -571,7 +808,7 @@ void wxOSX_draggingExited( id self, SEL _cmd, id sender ) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return ; - + return impl->draggingExited(sender, self, _cmd); } @@ -580,7 +817,7 @@ NSDragOperation wxOSX_draggingUpdated( id self, SEL _cmd, id sen wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NSDragOperationNone; - + return impl->draggingUpdated(sender, self, _cmd); } @@ -589,45 +826,61 @@ BOOL wxOSX_performDragOperation( id self, SEL _cmd, id sender ) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NSDragOperationNone; - + return impl->performDragOperation(sender, self, _cmd) ? YES:NO ; } #endif -void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) +void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->mouseEvent(event, self, _cmd); } -void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event) +void wxOSX_cursorUpdate(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + + impl->cursorUpdate(event, self, _cmd); +} + +BOOL wxOSX_acceptsFirstMouse(NSView* WXUNUSED(self), SEL WXUNUSED(_cmd), NSEvent *WXUNUSED(event)) +{ + // This is needed to support click through, otherwise the first click on a window + // will not do anything unless it is the active window already. + return YES; +} + +void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return; + impl->keyEvent(event, self, _cmd); } -void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) +void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->insertText(text, self, _cmd); } -BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) +BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->performKeyEquivalent(event, self, _cmd); } @@ -636,7 +889,7 @@ BOOL wxOSX_acceptsFirstResponder(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->acceptsFirstResponder(self, _cmd); } @@ -645,7 +898,7 @@ BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->becomeFirstResponder(self, _cmd); } @@ -654,17 +907,8 @@ BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - - return impl->resignFirstResponder(self, _cmd); -} -void wxOSX_resetCursorRects(NSView* self, SEL _cmd) -{ - wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); - if (impl == NULL) - return; - - impl->resetCursorRects(self, _cmd); + return impl->resignFirstResponder(self, _cmd); } BOOL wxOSX_isFlipped(NSView* self, SEL _cmd) @@ -672,16 +916,58 @@ BOOL wxOSX_isFlipped(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->isFlipped(self, _cmd) ? YES:NO; } +typedef void (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect); + void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + +#if wxUSE_THREADS + // OS X starts a NSUIHeartBeatThread for animating the default button in a + // dialog. This causes a drawRect of the active dialog from outside the + // main UI thread. This causes an occasional crash since the wx drawing + // objects (like wxPen) are not thread safe. + // + // Notice that NSUIHeartBeatThread seems to be undocumented and doing + // [NSWindow setAllowsConcurrentViewDrawing:NO] does not affect it. + if ( !wxThread::IsMain() ) + { + if ( impl->IsUserPane() ) + { + wxWindow* win = impl->GetWXPeer(); + if ( win->UseBgCol() ) + { + + CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; + CGContextSaveGState( context ); + + CGContextSetFillColorWithColor( context, win->GetBackgroundColour().GetCGColor()); + CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); + CGContextFillRect( context, r ); + + CGContextRestoreGState( context ); + } + } + else + { + // just call the superclass handler, we don't need any custom wx drawing + // here and it seems to work fine: + wxOSX_DrawRectHandlerPtr + superimpl = (wxOSX_DrawRectHandlerPtr) + [[self superclass] instanceMethodForSelector:_cmd]; + superimpl(self, _cmd, rect); + } + + return; + } +#endif // wxUSE_THREADS + return impl->drawRect(&rect, self, _cmd); } @@ -690,7 +976,7 @@ void wxOSX_controlAction(NSView* self, SEL _cmd, id sender) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->controlAction(self, _cmd, sender); } @@ -699,7 +985,7 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->controlDoubleAction(self, _cmd, sender); } @@ -708,11 +994,11 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), id sender = (id ) s; NSPasteboard *pboard = [sender draggingPasteboard]; NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; - + wxWindow* wxpeer = GetWXPeer(); if ( wxpeer == NULL ) return NSDragOperationNone; - + wxDropTarget* target = wxpeer->GetDropTarget(); if ( target == NULL ) return NSDragOperationNone; @@ -728,12 +1014,12 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - PasteboardRef pboardRef; + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); result = target->OnEnter(pt.x, pt.y, result); CFRelease(pboardRef); - + NSDragOperation nsresult = NSDragOperationNone; switch (result ) { @@ -753,16 +1039,16 @@ void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget WXUNUSED(slf), void *WX { id sender = (id ) s; NSPasteboard *pboard = [sender draggingPasteboard]; - + wxWindow* wxpeer = GetWXPeer(); if ( wxpeer == NULL ) return; - + wxDropTarget* target = wxpeer->GetDropTarget(); if ( target == NULL ) return; - - PasteboardRef pboardRef; + + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); target->OnLeave(); @@ -774,11 +1060,11 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), id sender = (id ) s; NSPasteboard *pboard = [sender draggingPasteboard]; NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; - + wxWindow* wxpeer = GetWXPeer(); if ( wxpeer == NULL ) return NSDragOperationNone; - + wxDropTarget* target = wxpeer->GetDropTarget(); if ( target == NULL ) return NSDragOperationNone; @@ -793,13 +1079,13 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), result = wxDragCopy; else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - - PasteboardRef pboardRef; + + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); result = target->OnDragOver(pt.x, pt.y, result); CFRelease(pboardRef); - + NSDragOperation nsresult = NSDragOperationNone; switch (result ) { @@ -821,7 +1107,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo NSPasteboard *pboard = [sender draggingPasteboard]; NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; - + wxWindow* wxpeer = GetWXPeer(); wxDropTarget* target = wxpeer->GetDropTarget(); wxDragResult result = wxDragNone; @@ -835,7 +1121,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - PasteboardRef pboardRef; + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); @@ -843,7 +1129,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo result = target->OnData(pt.x, pt.y, result); CFRelease(pboardRef); - + return result != wxDragNone; } @@ -851,29 +1137,65 @@ typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *even typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd); -typedef BOOL (*wxOSX_ResetCursorRectsHandlerPtr)(NSView* self, SEL _cmd); -typedef void (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect); void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd) { if ( !DoHandleMouseEvent(event) ) { // for plain NSView mouse events would propagate to parents otherwise - if (!m_wxPeer->MacIsUserPane()) + if (!IsUserPane()) { wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; superimpl(slf, (SEL)_cmd, event); + + // super of built-ins keeps the mouse up, as wx expects this event, we have to synthesize it + + if ( [ event type] == NSLeftMouseDown ) + { + wxMouseEvent wxevent(wxEVT_LEFT_DOWN); + SetupMouseEvent(wxevent , event) ; + wxevent.SetEventType(wxEVT_LEFT_UP); + + GetWXPeer()->HandleWindowEvent(wxevent); + } } } } +void wxWidgetCocoaImpl::cursorUpdate(WX_NSEvent event, WXWidget slf, void *_cmd) +{ + NSCursor *cursor = (NSCursor*)GetWXPeer()->GetCursor().GetHCURSOR(); + if (cursor == NULL) + { + wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd, event); + } + else + { + [cursor set]; + } +} + + + void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd) { + if ( [event type] == NSKeyDown ) + { + // there are key equivalents that are not command-combos and therefore not handled by cocoa automatically, + // therefore we call the menubar directly here, exit if the menu is handling the shortcut + if ( [[[NSApplication sharedApplication] mainMenu] performKeyEquivalent:event] ) + return; + + m_lastKeyDownEvent = event; + } + if ( GetFocusedViewInWindow([slf window]) != slf || m_hasEditor || !DoHandleKeyEvent(event) ) { wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; superimpl(slf, (SEL)_cmd, event); } + m_lastKeyDownEvent = NULL; } void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd) @@ -883,19 +1205,47 @@ void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd) wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; superimpl(slf, (SEL)_cmd, text); } - m_lastKeyDownEvent = NULL; } bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd) { - wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; - return superimpl(slf, (SEL)_cmd, event); + bool handled = false; + + wxKeyEvent wxevent(wxEVT_KEY_DOWN); + SetupKeyEvent( wxevent, event ); + + // because performKeyEquivalent is going up the entire view hierarchy, we don't have to + // walk up the ancestors ourselves but let cocoa do it + + int command = m_wxPeer->GetAcceleratorTable()->GetCommand( wxevent ); + if (command != -1) + { + wxEvtHandler * const handler = m_wxPeer->GetEventHandler(); + + wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); + command_event.SetEventObject( wxevent.GetEventObject() ); + handled = handler->ProcessEvent( command_event ); + + if ( !handled ) + { + // accelerators can also be used with buttons, try them too + command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED); + handled = handler->ProcessEvent( command_event ); + } + } + + if ( !handled ) + { + wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + return superimpl(slf, (SEL)_cmd, event); + } + return YES; } bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd) { - if ( m_wxPeer->MacIsUserPane() ) + if ( IsUserPane() ) return m_wxPeer->AcceptsFocus(); else { @@ -908,7 +1258,7 @@ bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd) { wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; // get the current focus before running becomeFirstResponder - NSView* otherView = FindFocus(); + NSView* otherView = FindFocus(); wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); BOOL r = superimpl(slf, (SEL)_cmd); @@ -927,8 +1277,17 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd) // get the current focus after running resignFirstResponder // note that this value isn't reliable, it might return the same view that // is resigning - NSView* otherView = FindFocus(); + NSView* otherView = FindFocus(); wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); + + // It doesn't make sense to notify about the loss of focus if we're not + // really losing it and the window which has just gained focus is the same + // one as this window itself. Of course, this should never happen in the + // first place but somehow it does in wxGrid code and without this check we + // enter into an infinite recursion, see #12267. + if ( otherWindow == this ) + return r; + // NSTextViews have an editor as true responder, therefore the might get the // resign notification if their editor takes over, don't trigger any event then if ( r && !m_hasEditor) @@ -938,25 +1297,6 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd) return r; } -void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd) -{ - wxWindow* wxpeer = GetWXPeer(); - if ( wxpeer ) - { - NSCursor *cursor = (NSCursor*)wxpeer->GetCursor().GetHCURSOR(); - if (cursor == NULL) - { - wxOSX_ResetCursorRectsHandlerPtr superimpl = (wxOSX_ResetCursorRectsHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; - superimpl(slf, (SEL)_cmd); - } - else - { - [slf addCursorRect: [slf bounds] - cursor: cursor]; - } - } -} - bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { return m_isFlipped; @@ -967,13 +1307,61 @@ bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd)) { + // preparing the update region + + wxRegion updateRgn; + const NSRect *rects; + NSInteger count; + + [slf getRectsBeingDrawn:&rects count:&count]; + for ( int i = 0 ; i < count ; ++i ) + { + updateRgn.Union(wxFromNSRect(slf, rects[i])); + } + + wxWindow* wxpeer = GetWXPeer(); + + if ( wxpeer->MacGetLeftBorderSize() != 0 || wxpeer->MacGetTopBorderSize() != 0 ) + { + // as this update region is in native window locals we must adapt it to wx window local + updateRgn.Offset( wxpeer->MacGetLeftBorderSize() , wxpeer->MacGetTopBorderSize() ); + } + + // Restrict the update region to the shape of the window, if any, and also + // remember the region that we need to clear later. + wxNonOwnedWindow* const tlwParent = wxpeer->MacGetTopLevelWindow(); + const bool isTopLevel = tlwParent == wxpeer; + wxRegion clearRgn; + if ( tlwParent->GetWindowStyle() & wxFRAME_SHAPED ) + { + if ( isTopLevel ) + clearRgn = updateRgn; + + int xoffset = 0, yoffset = 0; + wxRegion rgn = tlwParent->GetShape(); + wxpeer->MacRootWindowToWindow( &xoffset, &yoffset ); + rgn.Offset( xoffset, yoffset ); + updateRgn.Intersect(rgn); + + if ( isTopLevel ) + { + // Exclude the window shape from the region to be cleared below. + rgn.Xor(wxpeer->GetSize()); + clearRgn.Intersect(rgn); + } + } + + wxpeer->GetUpdateRegion() = updateRgn; + + // setting up the drawing context + CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; CGContextSaveGState( context ); #if OSX_DEBUG_DRAWING CGContextBeginPath( context ); CGContextMoveToPoint(context, 0, 0); - NSRect bounds = [self bounds]; + NSRect bounds = [slf bounds]; CGContextAddLineToPoint(context, 10, 0); CGContextMoveToPoint(context, 0, 0); CGContextAddLineToPoint(context, 0, 10); @@ -984,29 +1372,16 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd)) CGContextClosePath( context ); CGContextStrokePath(context); #endif - + if ( !m_isFlipped ) { CGContextTranslateCTM( context, 0, [m_osxView bounds].size.height ); CGContextScaleCTM( context, 1, -1 ); } - wxRegion updateRgn; - const NSRect *rects; - NSInteger count; - - [slf getRectsBeingDrawn:&rects count:&count]; - for ( int i = 0 ; i < count ; ++i ) - { - updateRgn.Union(wxFromNSRect(slf, rects[i]) ); - } - - wxWindow* wxpeer = GetWXPeer(); - wxpeer->GetUpdateRegion() = updateRgn; wxpeer->MacSetCGContextRef( context ); - + bool handled = wxpeer->MacDoRedraw( 0 ); - CGContextRestoreGState( context ); CGContextSaveGState( context ); @@ -1019,6 +1394,41 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd)) CGContextRestoreGState( context ); CGContextSaveGState( context ); } + // as we called restore above, we have to flip again if necessary + if ( !m_isFlipped ) + { + CGContextTranslateCTM( context, 0, [m_osxView bounds].size.height ); + CGContextScaleCTM( context, 1, -1 ); + } + + if ( isTopLevel ) + { + // We also need to explicitly draw the part of the top level window + // outside of its region with transparent colour to ensure that it is + // really transparent. + if ( clearRgn.IsOk() ) + { + wxMacCGContextStateSaver saveState(context); + wxWindowDC dc(wxpeer); + dc.SetBackground(wxBrush(wxTransparentColour)); + dc.SetDeviceClippingRegion(clearRgn); + dc.Clear(); + } + +#if wxUSE_GRAPHICS_CONTEXT + // If the window shape is defined by a path, stroke the path to show + // the window border. + const wxGraphicsPath& path = tlwParent->GetShapePath(); + if ( !path.IsNull() ) + { + CGContextSetLineWidth(context, 1); + CGContextSetStrokeColorWithColor(context, wxLIGHT_GREY->GetCGColor()); + CGContextAddPath(context, (CGPathRef) path.GetNativePath()); + CGContextStrokePath(context); + } +#endif // wxUSE_GRAPHICS_CONTEXT + } + wxpeer->MacPaintChildrenBorders(); wxpeer->MacSetCGContextRef( NULL ); CGContextRestoreGState( context ); @@ -1035,7 +1445,26 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU { } -// +void wxWidgetCocoaImpl::controlTextDidChange() +{ + wxWindow* wxpeer = (wxWindow*)GetWXPeer(); + if ( wxpeer ) + { + // since native rtti doesn't have to be enabled and wx' rtti is not aware of the mixin wxTextEntry, workaround is needed + wxTextCtrl *tc = wxDynamicCast( wxpeer , wxTextCtrl ); + wxComboBox *cb = wxDynamicCast( wxpeer , wxComboBox ); + if ( tc ) + tc->SendTextUpdatedEventIfAllowed(); + else if ( cb ) + cb->SendTextUpdatedEventIfAllowed(); + else + { + wxFAIL_MSG("Unexpected class for controlTextDidChange event"); + } + } +} + +// #if OBJC_API_VERSION >= 2 @@ -1045,7 +1474,7 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU #else #define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \ - { s, t, i }, + { s, (char*) t, i }, #endif @@ -1070,15 +1499,19 @@ void wxOSXCocoaClassAddWXMethods(Class c) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" ) + + wxOSX_CLASS_ADD_METHOD(c, @selector(acceptsFirstMouse:), (IMP) wxOSX_acceptsFirstMouse, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" ) - + + wxOSX_CLASS_ADD_METHOD(c, @selector(cursorUpdate:), (IMP) wxOSX_cursorUpdate, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(keyUp:), (IMP) wxOSX_keyEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(flagsChanged:), (IMP) wxOSX_keyEvent, "v@:@" ) - + wxOSX_CLASS_ADD_METHOD(c, @selector(insertText:), (IMP) wxOSX_insertText, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "c@:@" ) @@ -1086,7 +1519,6 @@ void wxOSXCocoaClassAddWXMethods(Class c) wxOSX_CLASS_ADD_METHOD(c, @selector(acceptsFirstResponder), (IMP) wxOSX_acceptsFirstResponder, "c@:" ) wxOSX_CLASS_ADD_METHOD(c, @selector(becomeFirstResponder), (IMP) wxOSX_becomeFirstResponder, "c@:" ) wxOSX_CLASS_ADD_METHOD(c, @selector(resignFirstResponder), (IMP) wxOSX_resignFirstResponder, "c@:" ) - wxOSX_CLASS_ADD_METHOD(c, @selector(resetCursorRects), (IMP) wxOSX_resetCursorRects, "v@:" ) wxOSX_CLASS_ADD_METHOD(c, @selector(isFlipped), (IMP) wxOSX_isFlipped, "c@:" ) wxOSX_CLASS_ADD_METHOD(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}" ) @@ -1099,8 +1531,8 @@ void wxOSXCocoaClassAddWXMethods(Class c) wxOSX_CLASS_ADD_METHOD(c, @selector(draggingUpdated:), (IMP) wxOSX_draggingUpdated, "I@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(draggingExited:), (IMP) wxOSX_draggingExited, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(performDragOperation:), (IMP) wxOSX_performDragOperation, "c@:@" ) -#endif - +#endif + #if OBJC_API_VERSION < 2 } ; static int method_count = WXSIZEOF( wxmethods ); @@ -1122,18 +1554,23 @@ void wxOSXCocoaClassAddWXMethods(Class c) IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl ) -wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) : - wxWidgetImpl( peer, isRootControl ) +wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) : + wxWidgetImpl( peer, isRootControl, isUserPane ) { Init(); m_osxView = w; + + // check if the user wants to create the control initially hidden + if ( !peer->IsShown() ) + SetVisibility(false); + // gc aware handling if ( m_osxView ) CFRetain(m_osxView); [m_osxView release]; } -wxWidgetCocoaImpl::wxWidgetCocoaImpl() +wxWidgetCocoaImpl::wxWidgetCocoaImpl() { Init(); } @@ -1160,8 +1597,8 @@ wxWidgetCocoaImpl::~wxWidgetCocoaImpl() if ( m_osxView ) CFRelease(m_osxView); } - -bool wxWidgetCocoaImpl::IsVisible() const + +bool wxWidgetCocoaImpl::IsVisible() const { return [m_osxView isHiddenOrHasHiddenAncestor] == NO; } @@ -1171,14 +1608,365 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible ) [m_osxView setHidden:(visible ? NO:YES)]; } -void wxWidgetCocoaImpl::Raise() +// ---------------------------------------------------------------------------- +// window animation stuff +// ---------------------------------------------------------------------------- + +// define a delegate used to refresh the window during animation +@interface wxNSAnimationDelegate : NSObject wxOSX_10_6_AND_LATER() +{ + wxWindow *m_win; + bool m_isDone; +} + +- (id)init:(wxWindow *)win; + +- (bool)isDone; + +// NSAnimationDelegate methods +- (void)animationDidEnd:(NSAnimation*)animation; +- (void)animation:(NSAnimation*)animation + didReachProgressMark:(NSAnimationProgress)progress; +@end + +@implementation wxNSAnimationDelegate + +- (id)init:(wxWindow *)win +{ + self = [super init]; + + m_win = win; + m_isDone = false; + + return self; +} + +- (bool)isDone +{ + return m_isDone; +} + +- (void)animation:(NSAnimation*)animation + didReachProgressMark:(NSAnimationProgress)progress +{ + wxUnusedVar(animation); + wxUnusedVar(progress); + + m_win->SendSizeEvent(); + m_win->MacOnInternalSize(); +} + +- (void)animationDidEnd:(NSAnimation*)animation +{ + wxUnusedVar(animation); + m_isDone = true; +} + +@end + +/* static */ +bool +wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win, + bool show, + wxShowEffect effect, + unsigned timeout) +{ + // create the dictionary describing the animation to perform on this view + NSObject * const + viewOrWin = static_cast(win->OSXGetViewOrWindow()); + NSMutableDictionary * const + dict = [NSMutableDictionary dictionaryWithCapacity:4]; + [dict setObject:viewOrWin forKey:NSViewAnimationTargetKey]; + + // determine the start and end rectangles assuming we're hiding the window + const wxRect rectOrig = win->GetRect(); + wxRect rectStart, + rectEnd; + rectStart = + rectEnd = rectOrig; + + if ( show ) + { + if ( effect == wxSHOW_EFFECT_ROLL_TO_LEFT || + effect == wxSHOW_EFFECT_SLIDE_TO_LEFT ) + effect = wxSHOW_EFFECT_ROLL_TO_RIGHT; + else if ( effect == wxSHOW_EFFECT_ROLL_TO_RIGHT || + effect == wxSHOW_EFFECT_SLIDE_TO_RIGHT ) + effect = wxSHOW_EFFECT_ROLL_TO_LEFT; + else if ( effect == wxSHOW_EFFECT_ROLL_TO_TOP || + effect == wxSHOW_EFFECT_SLIDE_TO_TOP ) + effect = wxSHOW_EFFECT_ROLL_TO_BOTTOM; + else if ( effect == wxSHOW_EFFECT_ROLL_TO_BOTTOM || + effect == wxSHOW_EFFECT_SLIDE_TO_BOTTOM ) + effect = wxSHOW_EFFECT_ROLL_TO_TOP; + } + + switch ( effect ) + { + case wxSHOW_EFFECT_ROLL_TO_LEFT: + case wxSHOW_EFFECT_SLIDE_TO_LEFT: + rectEnd.width = 0; + break; + + case wxSHOW_EFFECT_ROLL_TO_RIGHT: + case wxSHOW_EFFECT_SLIDE_TO_RIGHT: + rectEnd.x = rectStart.GetRight(); + rectEnd.width = 0; + break; + + case wxSHOW_EFFECT_ROLL_TO_TOP: + case wxSHOW_EFFECT_SLIDE_TO_TOP: + rectEnd.height = 0; + break; + + case wxSHOW_EFFECT_ROLL_TO_BOTTOM: + case wxSHOW_EFFECT_SLIDE_TO_BOTTOM: + rectEnd.y = rectStart.GetBottom(); + rectEnd.height = 0; + break; + + case wxSHOW_EFFECT_EXPAND: + rectEnd.x = rectStart.x + rectStart.width / 2; + rectEnd.y = rectStart.y + rectStart.height / 2; + rectEnd.width = + rectEnd.height = 0; + break; + + case wxSHOW_EFFECT_BLEND: + [dict setObject:(show ? NSViewAnimationFadeInEffect + : NSViewAnimationFadeOutEffect) + forKey:NSViewAnimationEffectKey]; + break; + + case wxSHOW_EFFECT_NONE: + case wxSHOW_EFFECT_MAX: + wxFAIL_MSG( "unexpected animation effect" ); + return false; + + default: + wxFAIL_MSG( "unknown animation effect" ); + return false; + }; + + if ( show ) + { + // we need to restore it to the original rectangle instead of making it + // disappear + wxSwap(rectStart, rectEnd); + + // and as the window is currently hidden, we need to show it for the + // animation to be visible at all (but don't restore it at its full + // rectangle as it shouldn't appear immediately) + win->SetSize(rectStart); + win->Show(); + } + + NSView * const parentView = [viewOrWin isKindOfClass:[NSView class]] + ? [(NSView *)viewOrWin superview] + : nil; + const NSRect rStart = wxToNSRect(parentView, rectStart); + const NSRect rEnd = wxToNSRect(parentView, rectEnd); + + [dict setObject:[NSValue valueWithRect:rStart] + forKey:NSViewAnimationStartFrameKey]; + [dict setObject:[NSValue valueWithRect:rEnd] + forKey:NSViewAnimationEndFrameKey]; + + // create an animation using the values in the above dictionary + NSViewAnimation * const + anim = [[NSViewAnimation alloc] + initWithViewAnimations:[NSArray arrayWithObject:dict]]; + + if ( !timeout ) + { + // what is a good default duration? Windows uses 200ms, Web frameworks + // use anything from 250ms to 1s... choose something in the middle + timeout = 500; + } + + [anim setDuration:timeout/1000.]; // duration is in seconds here + + // if the window being animated changes its layout depending on its size + // (which is almost always the case) we need to redo it during animation + // + // the number of layouts here is arbitrary, but 10 seems like too few (e.g. + // controls in wxInfoBar visibly jump around) + const int NUM_LAYOUTS = 20; + for ( float f = 1./NUM_LAYOUTS; f < 1.; f += 1./NUM_LAYOUTS ) + [anim addProgressMark:f]; + + wxNSAnimationDelegate * const + animDelegate = [[wxNSAnimationDelegate alloc] init:win]; + [anim setDelegate:animDelegate]; + [anim startAnimation]; + + // Cocoa is capable of doing animation asynchronously or even from separate + // thread but wx API doesn't provide any way to be notified about the + // animation end and without this we really must ensure that the window has + // the expected (i.e. the same as if a simple Show() had been used) size + // when we return, so block here until the animation finishes + // + // notice that because the default animation mode is NSAnimationBlocking, + // no user input events ought to be processed from here + { + wxEventLoopGuarantor ensureEventLoopExistence; + wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); + while ( ![animDelegate isDone] ) + loop->Dispatch(); + } + + if ( !show ) + { + // NSViewAnimation is smart enough to hide the NSView being animated at + // the end but we also must ensure that it's hidden for wx too + win->Hide(); + + // and we must also restore its size because it isn't expected to + // change just because the window was hidden + win->SetSize(rectOrig); + } + else + { + // refresh it once again after the end to ensure that everything is in + // place + win->SendSizeEvent(); + win->MacOnInternalSize(); + } + + [anim setDelegate:nil]; + [animDelegate release]; + [anim release]; + + return true; +} + +bool wxWidgetCocoaImpl::ShowWithEffect(bool show, + wxShowEffect effect, + unsigned timeout) { - // Not implemented + return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout); } + +/* note that the drawing order between siblings is not defined under 10.4 */ +/* only starting from 10.5 the subview order is respected */ + +/* NSComparisonResult is typedef'd as an enum pre-Leopard but typedef'd as + * NSInteger post-Leopard. Pre-Leopard the Cocoa toolkit expects a function + * returning int and not NSComparisonResult. Post-Leopard the Cocoa toolkit + * expects a function returning the new non-enum NSComparsionResult. + * Hence we create a typedef named CocoaWindowCompareFunctionResult. + */ +#if defined(NSINTEGER_DEFINED) +typedef NSComparisonResult CocoaWindowCompareFunctionResult; +#else +typedef int CocoaWindowCompareFunctionResult; +#endif + +class CocoaWindowCompareContext +{ + wxDECLARE_NO_COPY_CLASS(CocoaWindowCompareContext); +public: + CocoaWindowCompareContext(); // Not implemented + CocoaWindowCompareContext(NSView *target, NSArray *subviews) + { + m_target = target; + // Cocoa sorts subviews in-place.. make a copy + m_subviews = [subviews copy]; + } + ~CocoaWindowCompareContext() + { // release the copy + [m_subviews release]; + } + NSView* target() + { return m_target; } + + NSArray* subviews() + { return m_subviews; } + + /* Helper function that returns the comparison based off of the original ordering */ + CocoaWindowCompareFunctionResult CompareUsingOriginalOrdering(id first, id second) + { + NSUInteger firstI = [m_subviews indexOfObjectIdenticalTo:first]; + NSUInteger secondI = [m_subviews indexOfObjectIdenticalTo:second]; + // NOTE: If either firstI or secondI is NSNotFound then it will be NSIntegerMax and thus will + // likely compare higher than the other view which is reasonable considering the only way that + // can happen is if the subview was added after our call to subviews but before the call to + // sortSubviewsUsingFunction:context:. Thus we don't bother checking. Particularly because + // that case should never occur anyway because that would imply a multi-threaded GUI call + // which is a big no-no with Cocoa. + + // Subviews are ordered from back to front meaning one that is already lower will have an lower index. + NSComparisonResult result = (firstI < secondI) + ? NSOrderedAscending /* -1 */ + : (firstI > secondI) + ? NSOrderedDescending /* 1 */ + : NSOrderedSame /* 0 */; + + return result; + } +private: + /* The subview we are trying to Raise or Lower */ + NSView *m_target; + /* A copy of the original array of subviews */ + NSArray *m_subviews; +}; + +/* Causes Cocoa to raise the target view to the top of the Z-Order by telling the sort function that + * the target view is always higher than every other view. When comparing two views neither of + * which is the target, it returns the correct response based on the original ordering + */ +static CocoaWindowCompareFunctionResult CocoaRaiseWindowCompareFunction(id first, id second, void *ctx) +{ + CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; + // first should be ordered higher + if(first==compareContext->target()) + return NSOrderedDescending; + // second should be ordered higher + if(second==compareContext->target()) + return NSOrderedAscending; + return compareContext->CompareUsingOriginalOrdering(first,second); +} + +void wxWidgetCocoaImpl::Raise() +{ + NSView* nsview = m_osxView; + + NSView *superview = [nsview superview]; + CocoaWindowCompareContext compareContext(nsview, [superview subviews]); + + [superview sortSubviewsUsingFunction: + CocoaRaiseWindowCompareFunction + context: &compareContext]; + +} + +/* Causes Cocoa to lower the target view to the bottom of the Z-Order by telling the sort function that + * the target view is always lower than every other view. When comparing two views neither of + * which is the target, it returns the correct response based on the original ordering + */ +static CocoaWindowCompareFunctionResult CocoaLowerWindowCompareFunction(id first, id second, void *ctx) +{ + CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; + // first should be ordered lower + if(first==compareContext->target()) + return NSOrderedAscending; + // second should be ordered lower + if(second==compareContext->target()) + return NSOrderedDescending; + return compareContext->CompareUsingOriginalOrdering(first,second); +} + void wxWidgetCocoaImpl::Lower() { - // Not implemented + NSView* nsview = m_osxView; + + NSView *superview = [nsview superview]; + CocoaWindowCompareContext compareContext(nsview, [superview subviews]); + + [superview sortSubviewsUsingFunction: + CocoaLowerWindowCompareFunction + context: &compareContext]; } void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(dx), int WXUNUSED(dy) ) @@ -1200,7 +1988,7 @@ void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(d void wxWidgetCocoaImpl::Move(int x, int y, int width, int height) { wxWindowMac* parent = GetWXPeer()->GetParent(); - // under Cocoa we might have a contentView in the wxParent to which we have to + // under Cocoa we might have a contentView in the wxParent to which we have to // adjust the coordinates if (parent && [m_osxView superview] != parent->GetHandle() ) { @@ -1215,15 +2003,7 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height) [[m_osxView superview] setNeedsDisplayInRect:[m_osxView frame]]; NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) ); [m_osxView setFrame:r]; - [[m_osxView superview] setNeedsDisplayInRect:r]; - - if ([m_osxView respondsToSelector:@selector(trackingTag)] ) - { - if ( [(wxNSView*)m_osxView trackingTag] ) - [m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]]; - - [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]]; - } + [[m_osxView superview] setNeedsDisplayInRect:r]; } void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const @@ -1231,6 +2011,20 @@ void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const wxRect r = wxFromNSRect( [m_osxView superview], [m_osxView frame] ); x = r.GetLeft(); y = r.GetTop(); + + // under Cocoa we might have a contentView in the wxParent to which we have to + // adjust the coordinates + wxWindowMac* parent = GetWXPeer()->GetParent(); + if (parent && [m_osxView superview] != parent->GetHandle() ) + { + int cx = 0,cy = 0,cw = 0,ch = 0; + if ( parent->GetPeer() ) + { + parent->GetPeer()->GetContentArea(cx, cy, cw, ch); + x += cx; + y += cy; + } + } } void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const @@ -1245,10 +2039,10 @@ void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &hei if ( [m_osxView respondsToSelector:@selector(contentView) ] ) { NSView* cv = [m_osxView contentView]; - + NSRect bounds = [m_osxView bounds]; NSRect rect = [cv frame]; - + int y = (int)rect.origin.y; int x = (int)rect.origin.x; if ( ![ m_osxView isFlipped ] ) @@ -1288,16 +2082,38 @@ bool wxWidgetCocoaImpl::HasFocus() const return ( FindFocus() == m_osxView ); } -bool wxWidgetCocoaImpl::SetFocus() +bool wxWidgetCocoaImpl::SetFocus() { - if ( [m_osxView canBecomeKeyView] == NO ) + if ( !CanFocus() ) return false; - + + // TODO remove if no issues arise: should not raise the window, only assign focus + //[[m_osxView window] makeKeyAndOrderFront:nil] ; [[m_osxView window] makeFirstResponder: m_osxView] ; - [[m_osxView window] makeKeyAndOrderFront:nil] ; return true; } +void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target) +{ + [m_osxView unregisterDraggedTypes]; + + if ( target == NULL ) + return; + + wxDataObject* dobj = target->GetDataObject(); + + if( dobj ) + { + CFMutableArrayRef typesarray = CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks); + dobj->AddSupportedTypes(typesarray); + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + [targetView registerForDraggedTypes:(NSArray*)typesarray]; + CFRelease(typesarray); + } +} void wxWidgetCocoaImpl::RemoveFromParent() { @@ -1311,9 +2127,31 @@ void wxWidgetCocoaImpl::Embed( wxWidgetImpl *parent ) [container addSubview:m_osxView]; } -void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &WXUNUSED(col) ) +void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col ) { - // m_osxView.backgroundColor = [[UIColor alloc] initWithCGColor:col.GetCGColor()]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(setBackgroundColor:) ] ) + { + [targetView setBackgroundColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) + green:(CGFloat) (col.Green() / 255.0) + blue:(CGFloat) (col.Blue() / 255.0) + alpha:(CGFloat) (col.Alpha() / 255.0)]]; + } +} + +bool wxWidgetCocoaImpl::SetBackgroundStyle( wxBackgroundStyle style ) +{ + BOOL opaque = ( style == wxBG_STYLE_PAINT ); + + if ( [m_osxView respondsToSelector:@selector(setOpaque:) ] ) + { + [m_osxView setOpaque: opaque]; + } + + return true ; } void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding ) @@ -1329,21 +2167,21 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding [m_osxView setStringValue:cf.AsNSString()]; } } - + void wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to ) { NSPoint p = wxToNSPoint( from->GetWXWidget(), *pt ); - p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; + p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; *pt = wxFromNSPoint( to->GetWXWidget(), p ); } -wxInt32 wxWidgetCocoaImpl::GetValue() const +wxInt32 wxWidgetCocoaImpl::GetValue() const { return [(NSControl*)m_osxView intValue]; } -void wxWidgetCocoaImpl::SetValue( wxInt32 v ) +void wxWidgetCocoaImpl::SetValue( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setIntValue:)] ) { @@ -1359,7 +2197,7 @@ void wxWidgetCocoaImpl::SetValue( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMinValue:)] ) { @@ -1367,7 +2205,7 @@ void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMaxValue:)] ) { @@ -1375,18 +2213,18 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) } } -wxInt32 wxWidgetCocoaImpl::GetMinimum() const +wxInt32 wxWidgetCocoaImpl::GetMinimum() const { - if ( [m_osxView respondsToSelector:@selector(getMinValue:)] ) + if ( [m_osxView respondsToSelector:@selector(minValue)] ) { return (int)[m_osxView minValue]; } return 0; } -wxInt32 wxWidgetCocoaImpl::GetMaximum() const +wxInt32 wxWidgetCocoaImpl::GetMaximum() const { - if ( [m_osxView respondsToSelector:@selector(getMaxValue:)] ) + if ( [m_osxView respondsToSelector:@selector(maxValue)] ) { return (int)[m_osxView maxValue]; } @@ -1410,7 +2248,12 @@ void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap ) { if ( [m_osxView respondsToSelector:@selector(setImage:)] ) { - [m_osxView setImage:bitmap.GetNSImage()]; + if (bitmap.IsOk()) + [m_osxView setImage:bitmap.GetNSImage()]; + else + [m_osxView setImage:nil]; + + [m_osxView setNeedsDisplay:YES]; } } @@ -1468,15 +2311,23 @@ void wxWidgetCocoaImpl::GetBestRect( wxRect *r ) const bool wxWidgetCocoaImpl::IsEnabled() const { - if ( [m_osxView respondsToSelector:@selector(isEnabled) ] ) - return [m_osxView isEnabled]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(isEnabled) ] ) + return [targetView isEnabled]; return true; } void wxWidgetCocoaImpl::Enable( bool enable ) { - if ( [m_osxView respondsToSelector:@selector(setEnabled:) ] ) - [m_osxView setEnabled:enable]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(setEnabled:) ] ) + [targetView setEnabled:enable]; } void wxWidgetCocoaImpl::PulseGauge() @@ -1487,10 +2338,10 @@ void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 WXUNUSED(val), wxInt32 WXUNUSED( { } -void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) +void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) { NSControlSize size = NSRegularControlSize; - + switch ( variant ) { case wxWINDOW_VARIANT_NORMAL : @@ -1515,18 +2366,55 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) } if ( [m_osxView respondsToSelector:@selector(setControlSize:)] ) [m_osxView setControlSize:size]; - else if ([m_osxView respondsToSelector:@selector(cell)]) - { - id cell = [(id)m_osxView cell]; - if ([cell respondsToSelector:@selector(setControlSize:)]) - [cell setControlSize:size]; - } + else if ([m_osxView respondsToSelector:@selector(cell)]) + { + id cell = [(id)m_osxView cell]; + if ([cell respondsToSelector:@selector(setControlSize:)]) + [cell setControlSize:size]; + } + + // we need to propagate this to inner views as well + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + { + NSView* targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(setControlSize:)] ) + [targetView setControlSize:size]; + else if ([targetView respondsToSelector:@selector(cell)]) + { + id cell = [(id)targetView cell]; + if ([cell respondsToSelector:@selector(setControlSize:)]) + [cell setControlSize:size]; + } + } } -void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool) +void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bool) { - if ([m_osxView respondsToSelector:@selector(setFont:)]) - [m_osxView setFont: font.OSXGetNSFont()]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ([targetView respondsToSelector:@selector(setFont:)]) + [targetView setFont: font.OSXGetNSFont()]; + if ([targetView respondsToSelector:@selector(setTextColor:)]) + [targetView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) + green:(CGFloat) (col.Green() / 255.0) + blue:(CGFloat) (col.Blue() / 255.0) + alpha:(CGFloat) (col.Alpha() / 255.0)]]; +} + +void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip) +{ + if ( tooltip ) + { + wxCFStringRef cf( tooltip->GetTip() , m_wxPeer->GetFont().GetEncoding() ); + [m_osxView setToolTip: cf.AsNSString()]; + } + else + { + [m_osxView setToolTip:nil]; + } } void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) @@ -1541,15 +2429,18 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) { [c setDoubleAction: @selector(controlDoubleAction:)]; } - + } -} + NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited|NSTrackingCursorUpdate|NSTrackingMouseMoved|NSTrackingActiveAlways|NSTrackingInVisibleRect; + NSTrackingArea* area = [[NSTrackingArea alloc] initWithRect: NSZeroRect options: options owner: m_osxView userInfo: nil]; + [m_osxView addTrackingArea: area]; + [area release]; + } bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text) { wxKeyEvent wxevent(wxEVT_CHAR); SetupKeyEvent( wxevent, event, text ); - wxevent.SetEventObject(GetWXPeer()); return GetWXPeer()->OSXHandleKeyEvent(wxevent); } @@ -1558,37 +2449,66 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) { wxKeyEvent wxevent(wxEVT_KEY_DOWN); SetupKeyEvent( wxevent, event ); - wxevent.SetEventObject(GetWXPeer()); + + // Generate wxEVT_CHAR_HOOK before sending any other events but only when + // the key is pressed, not when it's released (the type of wxevent is + // changed by SetupKeyEvent() so it can be wxEVT_KEY_UP too by now). + if ( wxevent.GetEventType() == wxEVT_KEY_DOWN ) + { + wxKeyEvent eventHook(wxEVT_CHAR_HOOK, wxevent); + if ( GetWXPeer()->OSXHandleKeyEvent(eventHook) + && !eventHook.IsNextEventAllowed() ) + return true; + } + bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent); // this will fire higher level events, like insertText, to help // us handle EVT_CHAR, etc. - if ( !m_hasEditor && [event type] == NSKeyDown) + + if ( !result ) { - m_lastKeyDownEvent = event; - if ( !result ) + if ( [event type] == NSKeyDown) { - if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) - [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]]; + long keycode = wxOSXTranslateCocoaKey( event, wxEVT_CHAR ); + + if ( (keycode > 0 && keycode < WXK_SPACE) || keycode == WXK_DELETE || keycode >= WXK_START ) + { + // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars + wxKeyEvent wxevent2(wxevent) ; + wxevent2.SetEventType(wxEVT_CHAR); + SetupKeyEvent( wxevent2, event ); + wxevent2.m_keyCode = keycode; + result = GetWXPeer()->OSXHandleKeyEvent(wxevent2); + } + else if (wxevent.CmdDown()) + { + wxKeyEvent wxevent2(wxevent) ; + wxevent2.SetEventType(wxEVT_CHAR); + SetupKeyEvent( wxevent2, event ); + result = GetWXPeer()->OSXHandleKeyEvent(wxevent2); + } else - [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; - result = true; + { + if ( IsUserPane() && !wxevent.CmdDown() ) + { + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]]; + else + [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; + result = true; + } + } } } + return result; } bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event) { - NSPoint clickLocation; - clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil]; - wxPoint pt = wxFromNSPoint( m_osxView, clickLocation ); wxMouseEvent wxevent(wxEVT_LEFT_DOWN); - SetupMouseEvent( wxevent , event ) ; - wxevent.SetEventObject(GetWXPeer()); - wxevent.m_x = pt.x; - wxevent.m_y = pt.y; - + SetupMouseEvent(wxevent , event) ; return GetWXPeer()->HandleWindowEvent(wxevent); } @@ -1625,7 +2545,7 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* oth #endif wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast(thisWindow)); - + wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); event.SetEventObject(thisWindow); if (otherWindow) @@ -1636,25 +2556,29 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* oth void wxWidgetCocoaImpl::SetCursor(const wxCursor& cursor) { - NSPoint location = [NSEvent mouseLocation]; - location = [[m_osxView window] convertScreenToBase:location]; - NSPoint locationInView = [m_osxView convertPoint:location fromView:nil]; - - if( NSMouseInRect(locationInView, [m_osxView bounds], YES) ) + if ( !wxIsBusy() ) { - [(NSCursor*)cursor.GetHCURSOR() set]; + NSPoint location = [NSEvent mouseLocation]; + location = [[m_osxView window] convertScreenToBase:location]; + NSPoint locationInView = [m_osxView convertPoint:location fromView:nil]; + + if( NSMouseInRect(locationInView, [m_osxView bounds], YES) ) + { + [(NSCursor*)cursor.GetHCURSOR() set]; + } } - [[m_osxView window] invalidateCursorRectsForView:m_osxView]; } void wxWidgetCocoaImpl::CaptureMouse() { - [[m_osxView window] disableCursorRects]; + // TODO remove if we don't get into problems with cursor settings + // [[m_osxView window] disableCursorRects]; } void wxWidgetCocoaImpl::ReleaseMouse() { - [[m_osxView window] enableCursorRects]; + // TODO remove if we don't get into problems with cursor settings + // [[m_osxView window] enableCursorRects]; } void wxWidgetCocoaImpl::SetFlipped(bool flipped) @@ -1666,27 +2590,38 @@ void wxWidgetCocoaImpl::SetFlipped(bool flipped) // Factory methods // -wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), +wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size, long WXUNUSED(style), long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxNSView* v = [[wxNSView alloc] initWithFrame:r]; - // temporary hook for dnd - [v registerForDraggedTypes:[NSArray arrayWithObjects: - NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]]; - - wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); + wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v, false, true ); return c; } -wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) +wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) { NSWindow* tlw = now->GetWXWindow(); - wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]]; - wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( now, v, true ); - c->InstallEventHandler(); - [tlw setContentView:v]; + + wxWidgetCocoaImpl* c = NULL; + if ( now->IsNativeWindowWrapper() ) + { + NSView* cv = [tlw contentView]; + c = new wxWidgetCocoaImpl( now, cv, true ); + // increase ref count, because the impl destructor will decrement it again + CFRetain(cv); + if ( !now->IsShown() ) + [cv setHidden:NO]; + + } + else + { + wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]]; + c = new wxWidgetCocoaImpl( now, v, true ); + c->InstallEventHandler(); + [tlw setContentView:v]; + } return c; }