X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/215bd0e12bfd457e01a408ddf6e7de43200c278e..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/osx/cocoa/window.mm?ds=sidebyside diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 44b70b7f01..9b2cfd9b55 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -12,18 +12,25 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP + #include "wx/dcclient.h" #include "wx/nonownedwnd.h" #include "wx/log.h" #endif #ifdef __WXMAC__ -#include "wx/osx/private.h" + #include "wx/osx/private.h" #endif #if wxUSE_CARET #include "wx/caret.h" #endif +#if wxUSE_DRAG_AND_DROP + #include "wx/dnd.h" +#endif + +#include + NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) { int x, y, w, h ; @@ -37,19 +44,16 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const @interface wxNSView : NSView { - WXCOCOAIMPL_COMMON_MEMBERS + NSTrackingRectTag rectTag; } -- (void)drawRect: (NSRect) rect; - -WXCOCOAIMPL_COMMON_INTERFACE - - (BOOL) canBecomeKeyView; - +// the tracking tag is needed to track mouse enter / exit events +- (void) setTrackingTag: (NSTrackingRectTag)tag; +- (NSTrackingRectTag) trackingTag; @end // wxNSView @interface NSView(PossibleMethods) -- (void)setImplementation:(wxWidgetCocoaImpl *)theImplementation; - (void)setTitle:(NSString *)aString; - (void)setStringValue:(NSString *)aString; - (void)setIntValue:(int)anInt; @@ -70,59 +74,119 @@ WXCOCOAIMPL_COMMON_INTERFACE - (void)setControlSize:(NSControlSize)size; - (id)contentView; + +- (void)setTarget:(id)anObject; +- (void)setAction:(SEL)aSelector; +- (void)setDoubleAction:(SEL)aSelector; @end -long wxOSXTranslateCocoaKey( int unichar ) +long wxOSXTranslateCocoaKey( NSEvent* event ) { - long retval = unichar; - switch( unichar ) + long retval = 0; + + if ([event type] != NSFlagsChanged) + { + NSString* s = [event charactersIgnoringModifiers]; + // backspace char reports as delete w/modifiers for some reason + if ([s length] == 1) + { + 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 = [[event characters] characterAtIndex: 0]; + if ( intchar >= NSF1FunctionKey && intchar >= NSF24FunctionKey ) + retval = WXK_F1 + (intchar - NSF1FunctionKey ); + 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 + switch( [event keyCode] ) { - case NSUpArrowFunctionKey : - retval = WXK_UP; - break; - case NSDownArrowFunctionKey : - retval = WXK_DOWN; - break; - case NSLeftArrowFunctionKey : - retval = WXK_LEFT; + // command key + case 54: + case 55: + retval = WXK_COMMAND; break; - case NSRightArrowFunctionKey : - retval = WXK_RIGHT; + // caps locks key + case 57: // Capslock + retval = WXK_CAPITAL; break; - case NSInsertFunctionKey : - retval = WXK_INSERT; + // shift key + case 56: // Left Shift + case 60: // Right Shift + retval = WXK_SHIFT; break; - case NSDeleteFunctionKey : - retval = WXK_DELETE; + // alt key + case 58: // Left Alt + case 61: // Right Alt + retval = WXK_ALT; break; - case NSHomeFunctionKey : - retval = WXK_HOME; + // ctrl key + case 59: // Left Ctrl + case 62: // Right Ctrl + retval = WXK_CONTROL; break; -// case NSBeginFunctionKey : -// retval = WXK_BEGIN; -// break; - case NSEndFunctionKey : - retval = WXK_END; + // clear key + case 71: + retval = WXK_CLEAR; break; - case NSPageUpFunctionKey : - retval = WXK_PAGEUP; - break; - case NSPageDownFunctionKey : - retval = WXK_PAGEDOWN; - break; - case NSHelpFunctionKey : - retval = WXK_HELP; + // tab key + case 48: + retval = WXK_TAB; break; default : - if ( unichar >= NSF1FunctionKey && unichar >= NSF24FunctionKey ) - retval = WXK_F1 + (unichar - NSF1FunctionKey ); break; } return retval; } -void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent ) +void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString = NULL ) { UInt32 modifiers = [nsEvent modifierFlags] ; int eventType = [nsEvent type]; @@ -155,20 +219,36 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent ) if ( eventType != NSFlagsChanged ) { NSString* nschars = [nsEvent characters]; - if ( nschars ) + if ( charString ) + { + // if charString is set, it did not come from key up / key down + wxevent.SetEventType( wxEVT_CHAR ); + wxCFStringRef cfchars((CFStringRef)[charString retain]); + chars = cfchars.AsString(); + } + else if ( nschars ) { wxCFStringRef cfchars((CFStringRef)[nschars retain]); chars = cfchars.AsString(); } } - int unichar = chars.Length() > 0 ? chars[0] : 0; - long keyval = wxOSXTranslateCocoaKey(unichar) ; - if ( keyval == unichar && ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN ) ) - keyval = wxToupper( keyval ) ; + int aunichar = chars.Length() > 0 ? chars[0] : 0; + long keyval = 0; + + if (wxevent.GetEventType() != wxEVT_CHAR) + keyval = wxOSXTranslateCocoaKey(nsEvent) ; + if ( !keyval ) + { + if ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN ) + keyval = wxToupper( aunichar ) ; + else + keyval = aunichar; + } + #if wxUSE_UNICODE - wxevent.m_uniChar = unichar; + wxevent.m_uniChar = aunichar; #endif wxevent.m_keyCode = keyval; } @@ -178,12 +258,15 @@ bool g_lastButtonWasFakeRight = false ; void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) { + int eventType = [nsEvent type]; UInt32 modifiers = [nsEvent modifierFlags] ; wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]); // these parameters are not given for all events UInt32 button = [nsEvent buttonNumber]; - UInt32 clickCount = [nsEvent clickCount]; + UInt32 clickCount = 0; + if ( [nsEvent respondsToSelector:@selector(clickCount:)] ) + [nsEvent clickCount]; wxevent.m_x = screenMouseLocation.x; wxevent.m_y = screenMouseLocation.y; @@ -195,7 +278,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ; UInt32 mouseChord = 0; - int eventType = [nsEvent type]; switch (eventType) { @@ -309,20 +391,27 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSScrollWheel : { wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; - /* - EventMouseWheelAxis axis = cEvent.GetParameter(kEventParamMouseWheelAxis, typeMouseWheelAxis) ; - SInt32 delta = cEvent.GetParameter(kEventParamMouseWheelDelta, typeSInt32) ; - */ - wxevent.m_wheelRotation = 10; // delta; - wxevent.m_wheelDelta = 1; + wxevent.m_wheelDelta = 10; wxevent.m_linesPerAction = 1; - if ( 0 /* axis == kEventMouseWheelAxisX*/ ) + NSLog(@"deltaX %f, deltaY %f",[nsEvent deltaX], [nsEvent deltaY]); + if ( abs([nsEvent deltaX]) > abs([nsEvent deltaY]) ) + { wxevent.m_wheelAxis = 1; + wxevent.m_wheelRotation = [nsEvent deltaX] * 10.0; + } + else + { + wxevent.m_wheelRotation = [nsEvent deltaY] * 10.0; + } } break ; case NSMouseEntered : + wxevent.SetEventType( wxEVT_ENTER_WINDOW ) ; + break; case NSMouseExited : + wxevent.SetEventType( wxEVT_LEAVE_WINDOW ) ; + break; case NSLeftMouseDragged : case NSRightMouseDragged : case NSOtherMouseDragged : @@ -336,87 +425,583 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) @implementation wxNSView -#define OSX_DEBUG_DRAWING 0 ++ (void)initialize +{ + static BOOL initialized = NO; + if (!initialized) + { + initialized = YES; + wxOSXCocoaClassAddWXMethods( self ); + } +} + +- (BOOL) canBecomeKeyView +{ + return YES; +} + +- (void) setTrackingTag: (NSTrackingRectTag)tag +{ + rectTag = tag; +} + +- (NSTrackingRectTag) trackingTag +{ + return rectTag; +} + +@end // wxNSView + +// +// event handlers +// + +#if wxUSE_DRAG_AND_DROP -- (void)drawRect: (NSRect) rect +// see http://lists.apple.com/archives/Cocoa-dev/2005/Jul/msg01244.html +// for details on the NSPasteboard -> PasteboardRef conversion + +NSDragOperation wxOSX_draggingEntered( id self, SEL _cmd, id sender ) { - if ( impl ) + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return NSDragOperationNone; + + return impl->draggingEntered(sender, self, _cmd); +} + +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); +} + +NSDragOperation wxOSX_draggingUpdated( id self, SEL _cmd, id sender ) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return NSDragOperationNone; + + return impl->draggingUpdated(sender, self, _cmd); +} + +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 ; +} + +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) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return; + + impl->keyEvent(event, self, _cmd); +} + +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) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return NO; + + return impl->performKeyEquivalent(event, self, _cmd); +} + +BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return NO; + + return impl->becomeFirstResponder(self, _cmd); +} + +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); +} + +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; +} + +void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return; + + return impl->drawRect(&rect, self, _cmd); +} + +void wxOSX_controlAction(NSView* self, SEL _cmd, id sender) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return; + + impl->controlAction(self, _cmd, sender); +} + +void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return; + + impl->controlDoubleAction(self, _cmd, sender); +} + +unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cmd) +{ + 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; + + wxDragResult result = wxDragNone; + wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + + if ( sourceDragMask & NSDragOperationLink ) + result = wxDragLink; + else if ( sourceDragMask & NSDragOperationCopy ) + result = wxDragCopy; + else if ( sourceDragMask & NSDragOperationMove ) + result = wxDragMove; + + 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 ) { - CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; - CGContextSaveGState( context ); -#if OSX_DEBUG_DRAWING - CGContextBeginPath( context ); - CGContextMoveToPoint(context, 0, 0); - NSRect bounds = [self bounds]; - CGContextAddLineToPoint(context, 10, 0); - CGContextMoveToPoint(context, 0, 0); - CGContextAddLineToPoint(context, 0, 10); - CGContextMoveToPoint(context, bounds.size.width, bounds.size.height); - CGContextAddLineToPoint(context, bounds.size.width, bounds.size.height-10); - CGContextMoveToPoint(context, bounds.size.width, bounds.size.height); - CGContextAddLineToPoint(context, bounds.size.width-10, bounds.size.height); - CGContextClosePath( context ); - CGContextStrokePath(context); + case wxDragLink: + nsresult = NSDragOperationLink; + case wxDragMove: + nsresult = NSDragOperationMove; + case wxDragCopy: + nsresult = NSDragOperationCopy; + default : + break; + } + return nsresult; +} + +void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget slf, void *_cmd) +{ + 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; + PasteboardCreate((CFStringRef)[pboard name], &pboardRef); + target->SetCurrentDragPasteboard(pboardRef); + target->OnLeave(); + CFRelease(pboardRef); + } + +unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cmd) +{ + 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; + + wxDragResult result = wxDragNone; + wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + + if ( sourceDragMask & NSDragOperationLink ) + result = wxDragLink; + else if ( sourceDragMask & NSDragOperationCopy ) + result = wxDragCopy; + else if ( sourceDragMask & NSDragOperationMove ) + result = wxDragMove; + + 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 ) + { + case wxDragLink: + nsresult = NSDragOperationLink; + case wxDragMove: + nsresult = NSDragOperationMove; + case wxDragCopy: + nsresult = NSDragOperationCopy; + default : + break; + } + return nsresult; +} + +bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget slf, void *_cmd) +{ + id sender = (id ) s; + + NSPasteboard *pboard = [sender draggingPasteboard]; + NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; + + wxWindow* wxpeer = GetWXPeer(); + wxDropTarget* target = wxpeer->GetDropTarget(); + wxDragResult result = wxDragNone; + wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + + if ( sourceDragMask & NSDragOperationLink ) + result = wxDragLink; + else if ( sourceDragMask & NSDragOperationCopy ) + result = wxDragCopy; + else if ( sourceDragMask & NSDragOperationMove ) + result = wxDragMove; + + PasteboardRef pboardRef; + PasteboardCreate((CFStringRef)[pboard name], &pboardRef); + target->SetCurrentDragPasteboard(pboardRef); + result = target->OnData(pt.x, pt.y, result); + CFRelease(pboardRef); + + return result != wxDragNone; +} + #endif - if ( [ self isFlipped ] == NO ) +typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event); +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 BOOL (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect); + +void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd) +{ + if ( !DoHandleMouseEvent(event) ) + { + wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd, event); + } +} + +void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd) +{ + if ( [[slf window] firstResponder] != slf || !DoHandleKeyEvent(event) ) + { + wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd, event); + } +} + +void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd) +{ + if (m_lastKeyDownEvent && !DoHandleCharEvent(m_lastKeyDownEvent, text) ) + { + 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 wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd) +{ + wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + BOOL r = superimpl(slf, (SEL)_cmd); + if ( r ) + DoNotifyFocusEvent( true ); + return r; +} + +bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd) +{ + wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + BOOL r = superimpl(slf, (SEL)_cmd); + if ( r ) + DoNotifyFocusEvent( false ); + return r; +} + +void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd) +{ + wxWindow* wxpeer = GetWXPeer(); + if ( wxpeer ) + { + NSCursor *cursor = (NSCursor*)wxpeer->GetCursor().GetHCURSOR(); + if (cursor == NULL) { - CGContextTranslateCTM( context, 0, [self bounds].size.height ); - CGContextScaleCTM( context, 1, -1 ); + wxOSX_ResetCursorRectsHandlerPtr superimpl = (wxOSX_ResetCursorRectsHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd); } - - wxRegion updateRgn; - const NSRect *rects; - NSInteger count; - - [self getRectsBeingDrawn:&rects count:&count]; - for ( int i = 0 ; i < count ; ++i ) + else { - updateRgn.Union(wxFromNSRect(self, rects[i]) ); + [slf addCursorRect: [slf bounds] + cursor: cursor]; } + } +} + +bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd) +{ + return m_isFlipped; +} - wxWindow* wxpeer = impl->GetWXPeer(); - wxpeer->GetUpdateRegion() = updateRgn; - wxpeer->MacSetCGContextRef( context ); - - wxPaintEvent event; - event.SetTimestamp(0); // todo - event.SetEventObject(wxpeer); - wxpeer->HandleWindowEvent(event); - + +#define OSX_DEBUG_DRAWING 0 + +void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) +{ + CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; + CGContextSaveGState( context ); + +#if OSX_DEBUG_DRAWING + CGContextBeginPath( context ); + CGContextMoveToPoint(context, 0, 0); + NSRect bounds = [self bounds]; + CGContextAddLineToPoint(context, 10, 0); + CGContextMoveToPoint(context, 0, 0); + CGContextAddLineToPoint(context, 0, 10); + CGContextMoveToPoint(context, bounds.size.width, bounds.size.height); + CGContextAddLineToPoint(context, bounds.size.width, bounds.size.height-10); + CGContextMoveToPoint(context, bounds.size.width, bounds.size.height); + CGContextAddLineToPoint(context, bounds.size.width-10, bounds.size.height); + 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 ); + if ( !handled ) + { + // call super + SEL _cmd = @selector(drawRect:); + wxOSX_DrawRectHandlerPtr superimpl = (wxOSX_DrawRectHandlerPtr) [[slf superclass] instanceMethodForSelector:_cmd]; + superimpl(slf, _cmd, *(NSRect*)rect); CGContextRestoreGState( context ); + CGContextSaveGState( context ); } + wxpeer->MacPaintChildrenBorders(); + wxpeer->MacSetCGContextRef( NULL ); + CGContextRestoreGState( context ); +} + +void wxWidgetCocoaImpl::controlAction( WXWidget slf, void *_cmd, void *sender) +{ + wxWindow* wxpeer = (wxWindow*) GetWXPeer(); + if ( wxpeer ) + wxpeer->OSXHandleClicked(0); } -WXCOCOAIMPL_COMMON_IMPLEMENTATION +void wxWidgetCocoaImpl::controlDoubleAction( WXWidget slf, void *_cmd, void *sender) +{ +} -- (BOOL) canBecomeKeyView +// + +#if OBJC_API_VERSION >= 2 + +#define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \ + class_addMethod(c, s, i, t ); + +#else + +#define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \ + { s, t, i }, + +#endif + +void wxOSXCocoaClassAddWXMethods(Class c) { - return YES; + +#if OBJC_API_VERSION < 2 + static objc_method wxmethods[] = + { +#endif + + wxOSX_CLASS_ADD_METHOD(c, @selector(mouseDown:), (IMP) wxOSX_mouseEvent, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseDown:), (IMP) wxOSX_mouseEvent, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseDown:), (IMP) wxOSX_mouseEvent, "v@:@" ) + + wxOSX_CLASS_ADD_METHOD(c, @selector(mouseUp:), (IMP) wxOSX_mouseEvent, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseUp:), (IMP) wxOSX_mouseEvent, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseUp:), (IMP) wxOSX_mouseEvent, "v@:@" ) + + wxOSX_CLASS_ADD_METHOD(c, @selector(mouseMoved:), (IMP) wxOSX_mouseEvent, "v@:@" ) + + 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(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(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, "v@:@" ) + + 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}}" ) + + wxOSX_CLASS_ADD_METHOD(c, @selector(controlAction:), (IMP) wxOSX_controlAction, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(controlDoubleAction:), (IMP) wxOSX_controlDoubleAction, "v@:@" ) + +#if wxUSE_DRAG_AND_DROP + wxOSX_CLASS_ADD_METHOD(c, @selector(draggingEntered:), (IMP) wxOSX_draggingEntered, "I@:@" ) + 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 + +#if OBJC_API_VERSION < 2 + } ; + static int method_count = WXSIZEOF( wxmethods ); + static objc_method_list *wxmethodlist = NULL; + if ( wxmethodlist == NULL ) + { + wxmethodlist = (objc_method_list*) malloc(sizeof(objc_method_list) + sizeof(wxmethods) ); + memcpy( &wxmethodlist->method_list[0], &wxmethods[0], sizeof(wxmethods) ); + wxmethodlist->method_count = method_count; + wxmethodlist->obsolete = 0; + } + class_addMethods( c, wxmethodlist ); +#endif } -@end // wxNSView +// +// C++ implementation class +// IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl ) wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) : - wxWidgetImpl( peer, isRootControl ), m_osxView(w) + wxWidgetImpl( peer, isRootControl ) { + Init(); + m_osxView = w; } wxWidgetCocoaImpl::wxWidgetCocoaImpl() { + Init(); } void wxWidgetCocoaImpl::Init() { m_osxView = NULL; + m_isFlipped = true; + m_lastKeyDownEvent = NULL; } wxWidgetCocoaImpl::~wxWidgetCocoaImpl() { - if ( [m_osxView respondsToSelector:@selector(setImplementation:) ] ) - [m_osxView setImplementation:NULL]; + RemoveAssociations( this ); + if ( !IsRootControl() ) { NSView *sv = [m_osxView superview]; @@ -467,12 +1052,24 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height) // adjust the coordinates if (parent) { - wxPoint pt(parent->GetClientAreaOrigin()); - x -= pt.x; - y -= pt.y; + int cx = 0,cy = 0,cw = 0,ch = 0; + if ( parent->GetPeer() ) + { + parent->GetPeer()->GetContentArea(cx, cy, cw, ch); + x -= cx; + y -= cy; + } } NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) ); [m_osxView setFrame: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]]; + } } void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const @@ -571,6 +1168,11 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() ); [m_osxView setTitle:cf.AsNSString()]; } + else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] ) + { + wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() ); + [m_osxView setStringValue:cf.AsNSString()]; + } } @@ -722,14 +1324,43 @@ void wxWidgetCocoaImpl::SetFont(wxFont const&, wxColour const&, long, bool) void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) { + WXWidget c = control ? control : (WXWidget) m_osxView; + wxWidgetImpl::Associate( c, this ) ; + if ([c respondsToSelector:@selector(setAction:)]) + { + [c setTarget: c]; + [c setAction: @selector(controlAction:)]; + if ([c respondsToSelector:@selector(setDoubleAction:)]) + { + [c setDoubleAction: @selector(controlDoubleAction:)]; + } + + } +} + +bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text) +{ + wxKeyEvent wxevent(wxEVT_KEY_DOWN); + SetupKeyEvent( wxevent, event, text ); + + return GetWXPeer()->OSXHandleKeyEvent(wxevent); } bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) { wxKeyEvent wxevent(wxEVT_KEY_DOWN); SetupKeyEvent( wxevent, event ); + + bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent); - return GetWXPeer()->OSXHandleKeyEvent(wxevent); + // this will fire higher level events, like insertText, to help + // us handle EVT_CHAR, etc. + if ([event type] == NSKeyDown) + { + m_lastKeyDownEvent = event; + [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; + } + return result; } bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event) @@ -810,6 +1441,11 @@ void wxWidgetCocoaImpl::ReleaseMouse() [[m_osxView window] enableCursorRects]; } +void wxWidgetCocoaImpl::SetFlipped(bool flipped) +{ + m_isFlipped = flipped; +} + // // Factory methods // @@ -817,13 +1453,14 @@ void wxWidgetCocoaImpl::ReleaseMouse() wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, long extraStyle) { - NSView* sv = (wxpeer->GetParent()->GetHandle() ); - NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxNSView* v = [[wxNSView alloc] initWithFrame:r]; - [sv addSubview:v]; + + // temporary hook for dnd + [v registerForDraggedTypes:[NSArray arrayWithObjects: + NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]]; + wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); - [v setImplementation:c]; return c; } @@ -832,7 +1469,7 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) NSWindow* tlw = now->GetWXWindow(); wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]]; wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( now, v, true ); - [v setImplementation:c]; + c->InstallEventHandler(); [tlw setContentView:v]; return c; }