From 69dbb7098b59ec49cb9693f14404e30ac1dca8eb Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 14 Apr 2003 03:54:32 +0000 Subject: [PATCH] Added InitMouseEvent helper method (like wxMSW) Implemented the following mouse handlers: mouseDown, mouseDragged, mouseUp, mouseMoved Added stubs for the following mouse handlers: mouseEntered, mouseExited, rightMouseDown, rightMouseDragged, rightMouseUp, otherMouseDown, otherMouseDragged, otherMouseUp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/window.h | 13 ++++++ src/cocoa/window.mm | 98 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index 760d6661a6..71ff892724 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -54,8 +54,21 @@ public: void CocoaAddChild(wxWindowCocoa *child); void CocoaRemoveFromParent(void); protected: + void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent); virtual void Cocoa_FrameChanged(void); virtual bool Cocoa_drawRect(const NSRect &rect); + virtual bool Cocoa_mouseDown(WX_NSEvent theEvent); + virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent); + virtual bool Cocoa_mouseUp(WX_NSEvent theEvent); + virtual bool Cocoa_mouseMoved(WX_NSEvent theEvent); + virtual bool Cocoa_mouseEntered(WX_NSEvent theEvent); + virtual bool Cocoa_mouseExited(WX_NSEvent theEvent); + virtual bool Cocoa_rightMouseDown(WX_NSEvent theEvent); + virtual bool Cocoa_rightMouseDragged(WX_NSEvent theEvent); + virtual bool Cocoa_rightMouseUp(WX_NSEvent theEvent); + virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent); + virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent); + virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent); void SetNSView(WX_NSView cocoaNSView); WX_NSView m_cocoaNSView; WX_NSView m_dummyNSView; diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 7e5b33f2df..d32720d412 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -13,6 +13,7 @@ #include "wx/log.h" #import +#import // normally the base classes aren't included, but wxWindow is special #ifdef __WXUNIVERSAL__ @@ -125,6 +126,99 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) return GetEventHandler()->ProcessEvent(event); } +void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent) +{ + NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView; + wxASSERT_MSG([nsview window]==[cocoaEvent window],"Mouse event for different NSWindow"); + NSPoint cocoaPoint = [nsview convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil]; + NSRect cocoaRect = [nsview frame]; + const wxPoint &clientorigin = GetClientAreaOrigin(); + event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x; + event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y; + + event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask; + event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask; + event.m_altDown = [cocoaEvent modifierFlags] & NSAlternateKeyMask; + event.m_metaDown = [cocoaEvent modifierFlags] & NSCommandKeyMask; + + // TODO: set timestamp? + event.SetEventObject(this); + event.SetId(GetId()); +} + +bool wxWindowCocoa::Cocoa_mouseMoved(WX_NSEvent theEvent) +{ + wxMouseEvent event(wxEVT_MOTION); + InitMouseEvent(event,theEvent); + wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y); + return GetEventHandler()->ProcessEvent(event); +} + +bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent) +{ + return false; +} + +bool wxWindowCocoa::Cocoa_mouseExited(WX_NSEvent theEvent) +{ + return false; +} + +bool wxWindowCocoa::Cocoa_mouseDown(WX_NSEvent theEvent) +{ + wxMouseEvent event([theEvent clickCount]<2?wxEVT_LEFT_DOWN:wxEVT_LEFT_DCLICK); + InitMouseEvent(event,theEvent); + wxLogDebug("Mouse Down @%d,%d num clicks=%d",event.m_x,event.m_y,[theEvent clickCount]); + return GetEventHandler()->ProcessEvent(event); +} + +bool wxWindowCocoa::Cocoa_mouseDragged(WX_NSEvent theEvent) +{ + wxMouseEvent event(wxEVT_MOTION); + InitMouseEvent(event,theEvent); + event.m_leftDown = true; + wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y); + return GetEventHandler()->ProcessEvent(event); +} + +bool wxWindowCocoa::Cocoa_mouseUp(WX_NSEvent theEvent) +{ + wxMouseEvent event(wxEVT_LEFT_UP); + InitMouseEvent(event,theEvent); + wxLogDebug("Mouse Up @%d,%d",event.m_x,event.m_y); + return GetEventHandler()->ProcessEvent(event); +} + +bool wxWindowCocoa::Cocoa_rightMouseDown(WX_NSEvent theEvent) +{ + return false; +} + +bool wxWindowCocoa::Cocoa_rightMouseDragged(WX_NSEvent theEvent) +{ + return false; +} + +bool wxWindowCocoa::Cocoa_rightMouseUp(WX_NSEvent theEvent) +{ + return false; +} + +bool wxWindowCocoa::Cocoa_otherMouseDown(WX_NSEvent theEvent) +{ + return false; +} + +bool wxWindowCocoa::Cocoa_otherMouseDragged(WX_NSEvent theEvent) +{ + return false; +} + +bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent) +{ + return false; +} + void wxWindowCocoa::Cocoa_FrameChanged(void) { wxLogDebug("Cocoa_FrameChanged"); @@ -155,8 +249,10 @@ bool wxWindow::Show(bool show) [m_cocoaNSView retain]; [[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView]; // But since we also retained it ourselves + wxASSERT(![m_dummyNSView superview]); [m_dummyNSView release]; m_dummyNSView = nil; + wxASSERT([m_cocoaNSView superview]); } else { @@ -165,6 +261,8 @@ bool wxWindow::Show(bool show) // NOTE: replaceSubView will cause m_cocaNSView to be released [[m_cocoaNSView superview] replaceSubview:m_cocoaNSView with:m_dummyNSView]; // m_coocaNSView is now only retained by us + wxASSERT([m_dummyNSView superview]); + wxASSERT(![m_cocoaNSView superview]); } m_isShown = show; return true;