X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89e92728495341a97be57248620f5a12c1ccab1e..0b2e45b16264cf196e069adb1137cd47e426284d:/src/mac/carbon/toplevel.cpp diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 44af089624..69708ed1a3 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -6,7 +6,7 @@ // Created: 24.09.01 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -59,14 +59,290 @@ wxWindowList wxModelessWindows; static Point gs_lastWhere; static long gs_lastWhen = 0; -// cursor stuff -extern int wxBusyCursorCount; - - // ============================================================================ // wxTopLevelWindowMac implementation // ============================================================================ +// --------------------------------------------------------------------------- +// Carbon Events +// --------------------------------------------------------------------------- + +#if TARGET_CARBON + +extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; + +static const EventTypeSpec eventList[] = +{ + { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , + + { kEventClassKeyboard, kEventRawKeyDown } , + { kEventClassKeyboard, kEventRawKeyRepeat } , + { kEventClassKeyboard, kEventRawKeyUp } , + { kEventClassKeyboard, kEventRawKeyModifiersChanged } , + + { kEventClassWindow , kEventWindowUpdate } , + { kEventClassWindow , kEventWindowActivated } , + { kEventClassWindow , kEventWindowDeactivated } , + { kEventClassWindow , kEventWindowBoundsChanging } , + { kEventClassWindow , kEventWindowBoundsChanged } , + { kEventClassWindow , kEventWindowClose } , + + { kEventClassMouse , kEventMouseDown } , + { kEventClassMouse , kEventMouseUp } , + { kEventClassMouse , kEventMouseMoved } , + { kEventClassMouse , kEventMouseDragged } , + +} ; + +static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + wxWindow* focus = wxWindow::FindFocus() ; + char charCode ; + UInt32 keyCode ; + UInt32 modifiers ; + Point point ; + UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; + + EventRef rawEvent ; + + GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ; + + GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); + GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); + GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); + GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, + sizeof( Point ), NULL, &point ); + + UInt32 message = (keyCode << 8) + charCode; + + switch ( GetEventKind( event ) ) + { + case kEventTextInputUnicodeForKeyEvent : + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( + focus , message , modifiers , when , point.h , point.v ) ) + { + result = noErr ; + } + break ; + } + + return result ; +} + +static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + wxWindow* focus = wxWindow::FindFocus() ; + char charCode ; + UInt32 keyCode ; + UInt32 modifiers ; + Point point ; + UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; + + GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); + GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); + GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); + GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, + sizeof( Point ), NULL, &point ); + + UInt32 message = (keyCode << 8) + charCode; + switch( GetEventKind( event ) ) + { + case kEventRawKeyRepeat : + case kEventRawKeyDown : + if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( + focus , message , modifiers , when , point.h , point.v ) ) + { + result = noErr ; + } + break ; + case kEventRawKeyUp : + if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent( + focus , message , modifiers , when , point.h , point.v ) ) + { + result = noErr ; + } + break ; + case kEventRawKeyModifiersChanged : + { + wxKeyEvent event(wxEVT_KEY_DOWN); + + event.m_shiftDown = modifiers & shiftKey; + event.m_controlDown = modifiers & controlKey; + event.m_altDown = modifiers & optionKey; + event.m_metaDown = modifiers & cmdKey; + + event.m_x = point.h; + event.m_y = point.v; + event.m_timeStamp = when; + wxWindow* focus = wxWindow::FindFocus() ; + event.SetEventObject(focus); + + if ( (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey ) + { + event.m_keyCode = WXK_CONTROL ; + event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; + focus->GetEventHandler()->ProcessEvent( event ) ; + } + if ( (modifiers ^ wxTheApp->s_lastModifiers ) & shiftKey ) + { + event.m_keyCode = WXK_SHIFT ; + event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; + focus->GetEventHandler()->ProcessEvent( event ) ; + } + if ( (modifiers ^ wxTheApp->s_lastModifiers ) & optionKey ) + { + event.m_keyCode = WXK_ALT ; + event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; + focus->GetEventHandler()->ProcessEvent( event ) ; + } + wxTheApp->s_lastModifiers = modifiers ; + } + break ; + } + + return result ; +} + +static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; + Point point ; + UInt32 modifiers = 0; + EventMouseButton button = 0 ; + UInt32 click = 0 ; + + GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, + sizeof( Point ), NULL, &point ); + GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, + sizeof( UInt32 ), NULL, &modifiers ); + GetEventParameter( event, kEventParamMouseButton, typeMouseButton, NULL, + sizeof( EventMouseButton ), NULL, &button ); + GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL, + sizeof( UInt32 ), NULL, &click ); + + if ( button == 0 || GetEventKind( event ) == kEventMouseUp ) + modifiers += btnState ; + + WindowRef window ; + short windowPart = ::FindWindow(point, &window); + + if ( IsWindowActive(window) && windowPart == inContent ) + { + switch ( GetEventKind( event ) ) + { + case kEventMouseDown : + toplevelWindow->MacFireMouseEvent( mouseDown , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ; + result = noErr ; + break ; + case kEventMouseUp : + toplevelWindow->MacFireMouseEvent( mouseUp , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ; + result = noErr ; + break ; + case kEventMouseMoved : + toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ; + result = noErr ; + break ; + case kEventMouseDragged : + toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ; + result = noErr ; + break ; + default : + break ; + } + } + + return result ; + + +} +static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + OSStatus err = noErr ; + + UInt32 attributes; + WindowRef windowRef ; + wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; + + GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL, + sizeof( WindowRef ), NULL, &windowRef ); + + switch( GetEventKind( event ) ) + { + case kEventWindowUpdate : + if ( !wxPendingDelete.Member(toplevelWindow) ) + toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ; + result = noErr ; + break ; + case kEventWindowActivated : + toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ; + result = noErr ; + break ; + case kEventWindowDeactivated : + toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ; + result = noErr ; + break ; + case kEventWindowClose : + toplevelWindow->Close() ; + result = noErr ; + break ; + case kEventWindowBoundsChanged : + err = GetEventParameter( event, kEventParamAttributes, typeUInt32, + NULL, sizeof( UInt32 ), NULL, &attributes ); + if ( err == noErr ) + { + Rect newContentRect ; + + GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL, + sizeof( newContentRect ), NULL, &newContentRect ); + + toplevelWindow->SetSize( newContentRect.left , newContentRect.top , + newContentRect.right - newContentRect.left , + newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING); + + result = noErr; + } + break ; + default : + break ; + } + return result ; +} + +pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + switch ( GetEventClass( event ) ) + { + case kEventClassKeyboard : + result = KeyboardEventHandler( handler, event , data ) ; + break ; + case kEventClassTextInput : + result = TextInputEventHandler( handler, event , data ) ; + break ; + case kEventClassWindow : + result = WindowEventHandler( handler, event , data ) ; + break ; + case kEventClassMouse : + result = MouseEventHandler( handler, event , data ) ; + break ; + default : + break ; + } + return result ; +} + +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) + +#endif + // --------------------------------------------------------------------------- // wxWindowMac utility functions // --------------------------------------------------------------------------- @@ -79,7 +355,7 @@ wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef) wxNode *node = wxWinMacWindowList->Find((long)inWindowRef); if (!node) return NULL; - return (wxTopLevelWindowMac *)node->Data(); + return (wxTopLevelWindowMac *)node->GetData(); } void wxAssociateWinWithMacWindow(WXWindow inWindowRef, wxTopLevelWindowMac *win) @@ -111,7 +387,9 @@ void wxTopLevelWindowMac::Init() m_macNoEraseUpdateRgn = NewRgn() ; m_macNeedsErasing = false ; m_macWindow = NULL ; +#if TARGET_CARBON m_macEventHandler = NULL ; + #endif } class wxMacDeferredWindowDeleter : public wxObject @@ -162,30 +440,19 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; } - #if TARGET_CARBON +#if TARGET_CARBON if ( m_macEventHandler ) { ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); m_macEventHandler = NULL ; } #endif - wxRemoveMacWindowAssociation( this ) ; - wxTopLevelWindows.DeleteObject(this); + wxRemoveMacWindowAssociation( this ) ; if ( wxModelessWindows.Find(this) ) wxModelessWindows.DeleteObject(this); - // If this is the last top-level window, exit. - if ( wxTheApp && (wxTopLevelWindows.Number() == 0) ) - { - wxTheApp->SetTopWindow(NULL); - - if ( wxTheApp->GetExitOnFrameDelete() ) - { - wxTheApp->ExitMainLoop() ; - } - } DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ; } @@ -230,96 +497,38 @@ void wxTopLevelWindowMac::SetIcon(const wxIcon& icon) wxTopLevelWindowBase::SetIcon(icon); } -#if TARGET_CARBON - -EventHandlerUPP wxMacWindowEventHandlerUPP = NULL ; - -extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; - -pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) -{ - OSStatus result = eventNotHandledErr ; - EventRecord rec ; - switch ( GetEventClass( event ) ) - { - case kEventClassTextInput : - if ( wxMacConvertEventToRecord( event , &rec ) ) - { - short keycode ; - short keychar ; - keychar = short(rec.message & charCodeMask); - keycode = short(rec.message & keyCodeMask) >> 8 ; - long keyval = wxMacTranslateKey(keychar, keycode) ; - wxWindow* focus = wxWindow::FindFocus() ; - - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , keyval , rec.modifiers , rec.when , rec.where.h , rec.where.v ) ) - { - // was handled internally - result = noErr ; - } - } - break ; - default : - break ; - } - return result ; -} - -#endif - -void wxTopLevelWindowMac::MacInstallEventHandler() -{ -#if TARGET_CARBON - if ( wxMacWindowEventHandlerUPP == NULL ) - { - wxMacWindowEventHandlerUPP = NewEventHandlerUPP( wxMacWindowEventHandler ) ; - } - - static const EventTypeSpec eventList[] = - { - { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } - } ; - if ( m_macEventHandler ) - { - ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); - m_macEventHandler = NULL ; - } - InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); -#endif -} - void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - SetName(name); - m_windowStyle = style; - m_isShown = FALSE; - - // create frame. - + SetName(name); + m_windowStyle = style; + m_isShown = FALSE; + + // create frame. + Rect theBoundsRect; - - m_x = (int)pos.x; - m_y = (int)pos.y; - if ( m_y < 50 ) - m_y = 50 ; - if ( m_x < 20 ) - m_x = 20 ; - m_width = size.x; + m_x = (int)pos.x; + m_y = (int)pos.y; + if ( m_y < 50 ) + m_y = 50 ; + if ( m_x < 20 ) + m_x = 20 ; + + m_width = size.x; if (m_width == -1) m_width = 20; - m_height = size.y; + m_height = size.y; if (m_height == -1) m_height = 20; - + ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); - + // translate the window attributes in the appropriate window class and attributes - + WindowClass wclass = 0; WindowAttributes attr = kWindowNoAttributes ; @@ -329,7 +538,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) || HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) - ) + ) { wclass = kFloatingWindowClass ; if ( HasFlag(wxTINY_CAPTION_VERT) ) @@ -339,30 +548,31 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } else { +#if TARGET_CARBON wclass = kPlainWindowClass ; +#else + wclass = kFloatingWindowClass ; +#endif } } else if ( HasFlag( wxCAPTION ) ) { - if ( HasFlag( wxDIALOG_MODAL ) ) - { - wclass = kDocumentWindowClass ; // kMovableModalWindowClass ; - } - else - { - wclass = kDocumentWindowClass ; - } + wclass = kDocumentWindowClass ; } else { if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || - HasFlag( wxSYSTEM_MENU ) ) + HasFlag( wxSYSTEM_MENU ) ) { wclass = kDocumentWindowClass ; } else { +#if TARGET_CARBON wclass = kPlainWindowClass ; +#else + wclass = kModalWindowClass ; +#endif } } @@ -389,8 +599,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, label = title ; UMASetWTitleC( (WindowRef)m_macWindow , label ) ; ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ; - MacInstallEventHandler() ; - +#if TARGET_CARBON + InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; + InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); +#endif m_macFocus = NULL ; } @@ -408,7 +621,7 @@ void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR cli void wxTopLevelWindowMac::Clear() { - wxWindow::Clear() ; + wxWindow::Clear() ; } WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() @@ -419,7 +632,6 @@ WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() void wxTopLevelWindowMac::MacUpdate( long timestamp) { - wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; BeginUpdate( (WindowRef)m_macWindow ) ; @@ -448,7 +660,7 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp) // Raise the window to the top of the Z order void wxTopLevelWindowMac::Raise() { - ::BringToFront( (WindowRef)m_macWindow ) ; + ::SelectWindow( (WindowRef)m_macWindow ) ; } // Lower the window to the bottom of the Z order @@ -457,26 +669,26 @@ void wxTopLevelWindowMac::Lower() ::SendBehind( (WindowRef)m_macWindow , NULL ) ; } -void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) +void wxTopLevelWindowMac::MacFireMouseEvent( + wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) { - EventRecord *ev = (EventRecord*) evr ; wxMouseEvent event(wxEVT_LEFT_DOWN); - bool isDown = !(ev->modifiers & btnState) ; // 1 is for up - bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse + bool isDown = !(modifiers & btnState) ; // 1 is for up + bool controlDown = modifiers & controlKey ; // for simulating right mouse event.m_leftDown = isDown && !controlDown; event.m_middleDown = FALSE; event.m_rightDown = isDown && controlDown; - if ( ev->what == mouseDown ) + if ( kind == mouseDown ) { if ( controlDown ) event.SetEventType(wxEVT_RIGHT_DOWN ) ; else event.SetEventType(wxEVT_LEFT_DOWN ) ; } - else if ( ev->what == mouseUp ) + else if ( kind == mouseUp ) { if ( controlDown ) event.SetEventType(wxEVT_RIGHT_UP ) ; @@ -488,12 +700,14 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) event.SetEventType(wxEVT_MOTION ) ; } - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; + event.m_shiftDown = modifiers & shiftKey; + event.m_controlDown = modifiers & controlKey; + event.m_altDown = modifiers & optionKey; + event.m_metaDown = modifiers & cmdKey; - Point localwhere = ev->where ; + Point localwhere ; + localwhere.h = x ; + localwhere.v = y ; GrafPtr port ; ::GetPort( &port ) ; @@ -501,9 +715,9 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) ::GlobalToLocal( &localwhere ) ; ::SetPort( port ) ; - if ( ev->what == mouseDown ) + if ( kind == mouseDown ) { - if ( ev->when - gs_lastWhen <= GetDblTime() ) + if ( timestamp - gs_lastWhen <= GetDblTime() ) { if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 ) { @@ -519,7 +733,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) } else { - gs_lastWhen = ev->when ; + gs_lastWhen = timestamp ; } gs_lastWhere = localwhere ; } @@ -529,7 +743,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) event.m_x += m_x; event.m_y += m_y; - event.m_timeStamp = ev->when; + event.m_timeStamp = timestamp; event.SetEventObject(this); if ( wxTheApp->s_captureWindow ) { @@ -541,10 +755,10 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) event.SetEventObject( wxTheApp->s_captureWindow ) ; wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; - if ( ev->what == mouseUp ) + if ( kind == mouseUp ) { wxTheApp->s_captureWindow = NULL ; - if ( wxBusyCursorCount == 0 ) + if ( !wxIsBusy() ) { m_cursor.MacInstall() ; } @@ -556,9 +770,12 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) } } +#if !TARGET_CARBON + void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part) { - MacFireMouseEvent( ev ) ; + MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part) @@ -567,7 +784,8 @@ void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part) { case inContent: { - MacFireMouseEvent( ev ) ; + MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } break ; } @@ -579,28 +797,42 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part) { case inContent: { - MacFireMouseEvent( ev ) ; + MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , + ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ; } break ; } } -void wxTopLevelWindowMac::MacActivate( WXEVENTREF ev , bool inIsActivating ) + +#endif + +void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) { wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); - event.m_timeStamp = ((EventRecord*)ev)->when ; + event.m_timeStamp = timestamp ; event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ; - MacSuperEnabled( inIsActivating ) ; + // Early versions of MacOS X don't refresh backgrounds properly, + // so refresh the whole window on activation and deactivation. + long osVersion = UMAGetSystemVersion(); + if (osVersion >= 0x1000 && osVersion < 0x1020) + Refresh(TRUE); + else + MacSuperEnabled( inIsActivating ) ; } +#if !TARGET_CARBON + void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) { } +#endif + void wxTopLevelWindowMac::SetTitle(const wxString& title) { wxWindow::SetTitle( title ) ; @@ -621,8 +853,8 @@ bool wxTopLevelWindowMac::Show(bool show) return FALSE; if (show) - { - ::ShowWindow( (WindowRef)m_macWindow ) ; + { + ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); ::SelectWindow( (WindowRef)m_macWindow ) ; // no need to generate events here, they will get them triggered by macos // actually they should be , but apparently they are not @@ -633,7 +865,7 @@ bool wxTopLevelWindowMac::Show(bool show) } else { - ::HideWindow( (WindowRef)m_macWindow ) ; + ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil); } if ( !show ) @@ -654,11 +886,11 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) int former_w = m_width ; int former_h = m_height ; - int actualWidth = width; - int actualHeight = height; - int actualX = x; - int actualY = y; - + int actualWidth = width; + int actualHeight = height; + int actualX = x; + int actualY = y; + if ((m_minWidth != -1) && (actualWidth < m_minWidth)) actualWidth = m_minWidth; if ((m_minHeight != -1) && (actualHeight < m_minHeight)) @@ -692,9 +924,13 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) if ( doResize ) ::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true); + + // the OS takes care of invalidating and erasing the new area so we only have to + // take care of refreshing for full repaints + + if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) + Refresh() ; - // the OS takes care of invalidating and erasing the new area - // we have erased the old one if ( IsKindOf( CLASSINFO( wxFrame ) ) ) { @@ -741,51 +977,51 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) { - GrafPtr formerPort ; - GetPort( &formerPort ) ; - SetPortWindowPort( (WindowRef)m_macWindow ) ; - - m_macNeedsErasing |= eraseBackground ; - - // if we already know that we will have to erase, there's no need to track the rest - if ( !m_macNeedsErasing) - { - // we end only here if eraseBackground is false - // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn - // we will have to erase anyway - - RgnHandle updateRgn = NewRgn(); - RgnHandle diffRgn = NewRgn() ; - if ( updateRgn && diffRgn ) + GrafPtr formerPort ; + GetPort( &formerPort ) ; + SetPortWindowPort( (WindowRef)m_macWindow ) ; + + m_macNeedsErasing |= eraseBackground ; + + // if we already know that we will have to erase, there's no need to track the rest + if ( !m_macNeedsErasing) { - GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn ); - Point pt = {0,0} ; - LocalToGlobal( &pt ) ; - OffsetRgn( updateRgn , -pt.h , -pt.v ) ; - DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ; - if ( !EmptyRgn( diffRgn ) ) + // we end only here if eraseBackground is false + // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn + // we will have to erase anyway + + RgnHandle updateRgn = NewRgn(); + RgnHandle diffRgn = NewRgn() ; + if ( updateRgn && diffRgn ) + { + GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn ); + Point pt = {0,0} ; + LocalToGlobal( &pt ) ; + OffsetRgn( updateRgn , -pt.h , -pt.v ) ; + DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ; + if ( !EmptyRgn( diffRgn ) ) + { + m_macNeedsErasing = true ; + } + } + if ( updateRgn ) + DisposeRgn( updateRgn ); + if ( diffRgn ) + DisposeRgn( diffRgn ); + + if ( !m_macNeedsErasing ) { - m_macNeedsErasing = true ; + RgnHandle rectRgn = NewRgn() ; + SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ; + UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ; + DisposeRgn( rectRgn ) ; } } - if ( updateRgn ) - DisposeRgn( updateRgn ); - if ( diffRgn ) - DisposeRgn( diffRgn ); - - if ( !m_macNeedsErasing ) - { - RgnHandle rectRgn = NewRgn() ; - SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ; - UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ; - DisposeRgn( rectRgn ) ; - } - } - InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ; - // turn this on to debug the refreshing cycle + InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ; + // turn this on to debug the refreshing cycle #if wxMAC_DEBUG_REDRAW - PaintRect( rect ) ; + PaintRect( rect ) ; #endif - SetPort( formerPort ) ; + SetPort( formerPort ) ; }