X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52c3df9930f6ad6062bf85761f1744bf693ef6d0..787f0fc4f3eb08f1065d86e44ace8d7453e1b1b3:/src/mac/carbon/toplevel.cpp?ds=sidebyside diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 253a6e7019..778bd56588 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -24,9 +24,10 @@ #pragma hdrstop #endif +#include "wx/toplevel.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/toplevel.h" #include "wx/frame.h" #include "wx/string.h" #include "wx/log.h" @@ -38,9 +39,9 @@ #include "wx/mac/uma.h" #include "wx/mac/aga.h" -#include "wx/app.h" #include "wx/tooltip.h" #include "wx/dnd.h" + #if wxUSE_SYSTEM_OPTIONS #include "wx/sysopt.h" #endif @@ -49,13 +50,16 @@ #include #endif -//For targeting OSX +// for targeting OSX #include "wx/mac/private.h" // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- +// unified title and toolbar constant - not in Tiger headers, so we duplicate it here +#define kWindowUnifiedTitleAndToolbarAttribute (1 << 7) + // trace mask for activation tracing messages static const wxChar *TRACE_ACTIVATE = _T("activation"); @@ -75,24 +79,21 @@ static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 BEGIN_EVENT_TABLE(wxTopLevelWindowMac, wxTopLevelWindowBase) END_EVENT_TABLE() - // --------------------------------------------------------------------------- // Carbon Events // --------------------------------------------------------------------------- -extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; - static const EventTypeSpec eventList[] = { - // TODO remove control related event like key and mouse (except for WindowLeave events) -#if 1 - { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , + // TODO: remove control related event like key and mouse (except for WindowLeave events) { kEventClassKeyboard, kEventRawKeyDown } , { kEventClassKeyboard, kEventRawKeyRepeat } , { kEventClassKeyboard, kEventRawKeyUp } , { kEventClassKeyboard, kEventRawKeyModifiersChanged } , -#endif + + { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , + { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } , { kEventClassWindow , kEventWindowShown } , { kEventClassWindow , kEventWindowActivated } , @@ -100,9 +101,10 @@ static const EventTypeSpec eventList[] = { kEventClassWindow , kEventWindowBoundsChanging } , { kEventClassWindow , kEventWindowBoundsChanged } , { kEventClassWindow , kEventWindowClose } , + { kEventClassWindow , kEventWindowGetRegion } , - // we have to catch these events on the toplevel window level, as controls don't get the - // raw mouse events anymore + // we have to catch these events on the toplevel window level, + // as controls don't get the raw mouse events anymore { kEventClassMouse , kEventMouseDown } , { kEventClassMouse , kEventMouseUp } , @@ -111,106 +113,58 @@ static const EventTypeSpec eventList[] = { kEventClassMouse , kEventMouseDragged } , } ; -static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) -{ - OSStatus result = eventNotHandledErr ; - - wxWindow* focus = wxWindow::FindFocus() ; - unsigned char charCode ; - UInt32 keyCode ; - UInt32 modifiers ; - Point point ; - - 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 ); - - switch ( GetEventKind( event ) ) - { - case kEventTextInputUnicodeForKeyEvent : - // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not - // get its own kEventTextInputUnicodeForKeyEvent, so we route back the - wxControl* control = wxDynamicCast( focus , wxControl ) ; - if ( control ) - { - ControlRef macControl = (ControlRef) control->GetHandle() ; - if ( macControl ) - { - ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ; - result = noErr ; - } - } - -#if 0 - // this may lead to double events sent to a window in case all handlers have skipped the key down event - UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; - UInt32 message = (keyCode << 8) + charCode; - - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( - focus , message , modifiers , when , point.h , point.v ) ) - { - result = noErr ; - } -#endif - break ; - - default: - break ; - } - - return result ; -} - static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { OSStatus result = eventNotHandledErr ; // call DoFindFocus instead of FindFocus, because for Composite Windows(like WxGenericListCtrl) - // FindFocus does not return the actual focus window,but the enclosing window + // FindFocus does not return the actual focus window, but the enclosing window wxWindow* focus = wxWindow::DoFindFocus(); if ( focus == NULL ) focus = (wxTopLevelWindowMac*) data ; unsigned char charCode ; - wxChar uniChar = 0 ; + wxChar uniChar[2] ; + uniChar[0] = 0; + uniChar[1] = 0; + UInt32 keyCode ; UInt32 modifiers ; Point point ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; #if wxUSE_UNICODE - UInt32 dataSize = 0 ; - if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize , NULL ) == noErr ) + ByteCount dataSize = 0 ; + if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr ) { UniChar buf[2] ; + int numChars = dataSize / sizeof( UniChar) + 1; UniChar* charBuf = buf ; - if ( dataSize > 4 ) - charBuf = new UniChar[ dataSize / sizeof( UniChar) ] ; + if ( numChars * 2 > 4 ) + charBuf = new UniChar[ numChars ] ; GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ; + charBuf[ numChars - 1 ] = 0; + #if SIZEOF_WCHAR_T == 2 uniChar = charBuf[0] ; #else wxMBConvUTF16 converter ; - converter.MB2WC( &uniChar , (const char*)charBuf , 1 ) ; + converter.MB2WC( uniChar , (const char*)charBuf , 2 ) ; #endif - if ( dataSize > 4 ) + + if ( numChars * 2 > 4 ) delete[] charBuf ; } #endif - GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); + 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 ) ) + switch ( GetEventKind( event ) ) { case kEventRawKeyRepeat : case kEventRawKeyDown : @@ -219,7 +173,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ; wxTheApp->MacSetCurrentEvent( event , handler ) ; if ( /* focus && */ wxTheApp->MacSendKeyDownEvent( - focus , message , modifiers , when , point.h , point.v , uniChar ) ) + focus , message , modifiers , when , point.h , point.v , uniChar[0] ) ) { result = noErr ; } @@ -229,7 +183,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event case kEventRawKeyUp : if ( /* focus && */ wxTheApp->MacSendKeyUpEvent( - focus , message , modifiers , when , point.h , point.v , uniChar ) ) + focus , message , modifiers , when , point.h , point.v , uniChar[0] ) ) { result = noErr ; } @@ -243,11 +197,13 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event event.m_controlDown = modifiers & controlKey; event.m_altDown = modifiers & optionKey; event.m_metaDown = modifiers & cmdKey; -#if wxUSE_UNICODE - event.m_uniChar = uniChar ; -#endif event.m_x = point.h; event.m_y = point.v; + +#if wxUSE_UNICODE + event.m_uniChar = uniChar[0] ; +#endif + event.SetTimestamp(when); event.SetEventObject(focus); @@ -275,6 +231,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; focus->GetEventHandler()->ProcessEvent( event ) ; } + wxApp::s_lastModifiers = modifiers ; } break ; @@ -294,18 +251,23 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event wxWindow* g_MacLastWindow = NULL ; -static EventMouseButton lastButton = 0 ; +EventMouseButton g_lastButton = 0 ; +bool g_lastButtonWasFakeRight = false ; -static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) +void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) { UInt32 modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; Point screenMouseLocation = cEvent.GetParameter(kEventParamMouseLocation) ; - // this parameter are not given for all events + // these parameters are not given for all events EventMouseButton button = 0 ; UInt32 clickCount = 0 ; - cEvent.GetParameter(kEventParamMouseButton, typeMouseButton , &button) ; - cEvent.GetParameter(kEventParamClickCount, typeUInt32 , &clickCount ) ; + UInt32 mouseChord = 0; + + cEvent.GetParameter( kEventParamMouseButton, typeMouseButton , &button ) ; + cEvent.GetParameter( kEventParamClickCount, typeUInt32 , &clickCount ) ; + // the chord is the state of the buttons pressed currently + cEvent.GetParameter( kEventParamMouseChord, typeUInt32 , &mouseChord ) ; wxevent.m_x = screenMouseLocation.h; wxevent.m_y = screenMouseLocation.v; @@ -313,49 +275,51 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) wxevent.m_controlDown = modifiers & controlKey; wxevent.m_altDown = modifiers & optionKey; wxevent.m_metaDown = modifiers & cmdKey; + wxevent.m_clickCount = clickCount; wxevent.SetTimestamp( cEvent.GetTicks() ) ; - // a control click is interpreted as a right click + // a control click is interpreted as a right click + bool thisButtonIsFakeRight = false ; if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) ) + { button = kEventMouseButtonSecondary ; + thisButtonIsFakeRight = true ; + } // otherwise we report double clicks by connecting a left click with a ctrl-left click - if ( clickCount > 1 && button != lastButton ) + if ( clickCount > 1 && button != g_lastButton ) clickCount = 1 ; // we must make sure that our synthetic 'right' button corresponds in // mouse down, moved and mouse up, and does not deliver a right down and left up if ( cEvent.GetKind() == kEventMouseDown ) - lastButton = button ; + { + g_lastButton = button ; + g_lastButtonWasFakeRight = thisButtonIsFakeRight ; + } if ( button == 0 ) - lastButton = 0 ; - else if ( lastButton ) - button = lastButton ; - - // determinate the correct down state, wx does not want a 'down' for a mouseUp event, while mac delivers - // this button - if ( button != 0 && cEvent.GetKind() != kEventMouseUp ) { - switch( button ) - { - case kEventMouseButtonPrimary : - wxevent.m_leftDown = true ; - break ; + g_lastButton = 0 ; + g_lastButtonWasFakeRight = false ; + } + else if ( g_lastButton == kEventMouseButtonSecondary && g_lastButtonWasFakeRight ) + button = g_lastButton ; - case kEventMouseButtonSecondary : - wxevent.m_rightDown = true ; - break ; + // Adjust the chord mask to remove the primary button and add the + // secondary button. It is possible that the secondary button is + // already pressed, e.g. on a mouse connected to a laptop, but this + // possibility is ignored here: + if( thisButtonIsFakeRight && ( mouseChord & 1U ) ) + mouseChord = ((mouseChord & ~1U) | 2U); - case kEventMouseButtonTertiary : + if(mouseChord & 1U) + wxevent.m_leftDown = true ; + if(mouseChord & 2U) + wxevent.m_rightDown = true ; + if(mouseChord & 4U) wxevent.m_middleDown = true ; - break ; - - default: - break ; - } - } // translate into wx types switch ( cEvent.GetKind() ) @@ -364,7 +328,7 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) switch ( button ) { case kEventMouseButtonPrimary : - wxevent.SetEventType(clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ; + wxevent.SetEventType( clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ; break ; case kEventMouseButtonSecondary : @@ -372,7 +336,7 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) break ; case kEventMouseButtonTertiary : - wxevent.SetEventType(clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ; + wxevent.SetEventType( clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ; break ; default: @@ -402,86 +366,36 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) case kEventMouseWheelMoved : { - wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ; + wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; - // EventMouseWheelAxis axis = cEvent.GetParameter(kEventParamMouseWheelAxis, typeMouseWheelAxis) ; - SInt32 delta = cEvent.GetParameter(kEventParamMouseWheelDelta, typeLongInteger) ; + EventMouseWheelAxis axis = cEvent.GetParameter(kEventParamMouseWheelAxis, typeMouseWheelAxis) ; + SInt32 delta = cEvent.GetParameter(kEventParamMouseWheelDelta, typeSInt32) ; wxevent.m_wheelRotation = delta; wxevent.m_wheelDelta = 1; wxevent.m_linesPerAction = 1; + if ( axis == kEventMouseWheelAxisX ) + wxevent.m_wheelAxis = 1; } break ; + case kEventMouseEntered : + case kEventMouseExited : + case kEventMouseDragged : + case kEventMouseMoved : + wxevent.SetEventType( wxEVT_MOTION ) ; + break; default : - wxevent.SetEventType(wxEVT_MOTION ) ; break ; } } -ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, const Point& location , ControlRef superControl , ControlPartCode *outPart ) -{ - if ( superControl ) - { - UInt16 childrenCount = 0 ; - OSStatus err = CountSubControls( superControl , &childrenCount ) ; - if ( err == errControlIsNotEmbedder ) - return NULL ; - wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; - - for ( UInt16 i = childrenCount ; i >=1 ; --i ) - { - ControlHandle sibling ; - err = GetIndexedSubControl( superControl , i , & sibling ) ; - if ( err == errControlIsNotEmbedder ) - return NULL ; - - wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; - if ( IsControlVisible( sibling ) ) - { - Rect r ; - UMAGetControlBoundsInWindowCoords( sibling , &r ) ; - if ( MacPtInRect( location , &r ) ) - { - ControlHandle child = wxMacFindSubControl( toplevelWindow , location , sibling , outPart ) ; - if ( child ) - return child ; - else - { - Point testLocation = location ; - - if ( toplevelWindow && toplevelWindow->MacUsesCompositing() ) - { - testLocation.h -= r.left ; - testLocation.v -= r.top ; - } - - *outPart = TestControl( sibling , testLocation ) ; - return sibling ; - } - } - } - } - } - - return NULL ; -} - -ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , const Point& location , WindowRef window , ControlPartCode *outPart ) -{ -#if TARGET_API_MAC_OSX - if ( UMAGetSystemVersion() >= 0x1030 && ( toplevelWindow == 0 || toplevelWindow->MacUsesCompositing() ) ) - return FindControlUnderMouse( location , window , outPart ) ; -#endif - ControlRef rootControl = NULL ; - verify_noerr( GetRootControl( window , &rootControl ) ) ; - return wxMacFindSubControl( toplevelWindow , location , rootControl , outPart ) ; - -} - #define NEW_CAPTURE_HANDLING 1 -pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +pascal OSStatus +wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler), + EventRef event, + void *data) { wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; @@ -492,7 +406,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev Point screenMouseLocation = cEvent.GetParameter(kEventParamMouseLocation) ; Point windowMouseLocation = screenMouseLocation ; - WindowRef window ; + WindowRef window = NULL; short windowPart = ::FindWindow(screenMouseLocation, &window); wxWindow* currentMouseWindow = NULL ; @@ -508,7 +422,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev if ( window ) { - QDGlobalToLocalPoint( UMAGetWindowPort(window ) , &windowMouseLocation ) ; + wxMacGlobalToLocal( window, &windowMouseLocation ) ; if ( wxApp::s_captureWindow #if !NEW_CAPTURE_HANDLING @@ -521,13 +435,16 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev else if ( (IsWindowActive(window) && windowPart == inContent) ) { ControlPartCode part ; - control = wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &part ) ; + control = FindControlUnderMouse( windowMouseLocation , window , &part ) ; // if there is no control below the mouse position, send the event to the toplevel window itself if ( control == 0 ) + { currentMouseWindow = (wxWindow*) data ; + } else { - currentMouseWindow = wxFindControlFromMacControl( control ) ; + currentMouseWindow = (wxWindow*) wxFindControlFromMacControl( control ) ; +#ifndef __WXUNIVERSAL__ if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved ) { #if wxUSE_TOOLBAR @@ -535,12 +452,17 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev // instead of its children (wxToolBarTools) ControlRef parent ; GetSuperControl(control, &parent ); - wxWindow *wxParent = wxFindControlFromMacControl( parent ) ; + wxWindow *wxParent = (wxWindow*) wxFindControlFromMacControl( parent ) ; if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) ) currentMouseWindow = wxParent ; #endif } +#endif } + + // disabled windows must not get any input messages + if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() ) + currentMouseWindow = NULL; } } @@ -558,9 +480,11 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev g_MacLastWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y ); eventleave.SetEventObject( g_MacLastWindow ) ; wxevent.SetId( g_MacLastWindow->GetId() ) ; + #if wxUSE_TOOLTIPS wxToolTip::RelayEvent( g_MacLastWindow , eventleave); -#endif // wxUSE_TOOLTIPS +#endif + g_MacLastWindow->GetEventHandler()->ProcessEvent(eventleave); } @@ -571,9 +495,11 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y ); evententer.SetEventObject( currentMouseWindow ) ; wxevent.SetId( currentMouseWindow->GetId() ) ; + #if wxUSE_TOOLTIPS - wxToolTip::RelayEvent( currentMouseWindow , evententer); -#endif // wxUSE_TOOLTIPS + wxToolTip::RelayEvent( currentMouseWindow , evententer ); +#endif + currentMouseWindow->GetEventHandler()->ProcessEvent(evententer); } @@ -586,6 +512,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev if ( cEvent.GetKind() == kEventMouseDown ) { ::MenuSelect( screenMouseLocation ) ; + ::HiliteMenu(0); result = noErr ; } } @@ -600,12 +527,11 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev // make tooltips current - #if wxUSE_TOOLTIPS - if ( wxevent.GetEventType() == wxEVT_MOTION - || wxevent.GetEventType() == wxEVT_ENTER_WINDOW - || wxevent.GetEventType() == wxEVT_LEAVE_WINDOW ) - wxToolTip::RelayEvent( currentMouseWindow , wxevent); - #endif // wxUSE_TOOLTIPS +#if wxUSE_TOOLTIPS + if ( wxevent.GetEventType() == wxEVT_MOTION ) + wxToolTip::RelayEvent( currentMouseWindow , wxevent ); +#endif + if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) ) { if ((currentMouseWindowParent != NULL) && @@ -621,39 +547,9 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN ) { // ... that is set focus to this window - if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow) + if (currentMouseWindow->CanAcceptFocus() && wxWindow::FindFocus()!=currentMouseWindow) currentMouseWindow->SetFocus(); } - - ControlPartCode dummyPart ; - // if built-in find control is finding the wrong control (ie static box instead of overlaid - // button, we cannot let the standard handler do its job, but must handle manually - - if ( ( cEvent.GetKind() == kEventMouseDown ) -#ifdef __WXMAC_OSX__ - && - (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) != - wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &dummyPart ) ) -#endif - ) - { - if ( currentMouseWindow->MacIsReallyEnabled() ) - { - EventModifiers modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; - Point clickLocation = windowMouseLocation ; - - if ( toplevelWindow->MacUsesCompositing() ) - currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ; - - HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation , - modifiers , (ControlActionUPP ) -1 ) ; - - if ((currentMouseWindowParent != NULL) && - (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL)) - currentMouseWindow = NULL; - } - result = noErr ; - } } if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow ) @@ -674,8 +570,8 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev cursorPoint += cursorTarget->GetPosition(); } - } // else if ( currentMouseWindow ) - else + } + else // currentMouseWindow == NULL { // don't mess with controls we don't know about // for some reason returning eventNotHandledErr does not lead to the correct behaviour @@ -684,26 +580,26 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev { EventModifiers modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; Point clickLocation = windowMouseLocation ; - if ( toplevelWindow->MacUsesCompositing() ) - { -#ifdef __WXMAC_OSX__ - HIPoint hiPoint ; - hiPoint.x = clickLocation.h ; - hiPoint.y = clickLocation.v ; - HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control ) ; - clickLocation.h = (int)hiPoint.x ; - clickLocation.v = (int)hiPoint.y ; -#endif - } + + HIPoint hiPoint ; + hiPoint.x = clickLocation.h ; + hiPoint.y = clickLocation.v ; + HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control ) ; + clickLocation.h = (int)hiPoint.x ; + clickLocation.v = (int)hiPoint.y ; HandleControlClick( control , clickLocation , modifiers , (ControlActionUPP ) -1 ) ; result = noErr ; } } + return result ; } -static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +static pascal OSStatus +wxMacTopLevelWindowEventHandler(EventHandlerCallRef WXUNUSED(handler), + EventRef event, + void *data) { OSStatus result = eventNotHandledErr ; @@ -753,19 +649,15 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand wxRect r( newRect.left , newRect.top , newRect.right - newRect.left , newRect.bottom - newRect.top ) ; if ( attributes & kWindowBoundsChangeSizeChanged ) { +#ifndef __WXUNIVERSAL__ // according to the other ports we handle this within the OS level // resize event, not within a wxSizeEvent wxFrame *frame = wxDynamicCast( toplevelWindow , wxFrame ) ; if ( frame ) { -#if wxUSE_STATUSBAR - frame->PositionStatusBar(); -#endif -#if wxUSE_TOOLBAR - frame->PositionToolBar(); -#endif + frame->PositionBars(); } - +#endif wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ; event.SetEventObject( toplevelWindow ) ; @@ -826,6 +718,36 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand } break ; + case kEventWindowGetRegion : + { + if ( toplevelWindow->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT ) + { + WindowRegionCode windowRegionCode ; + + // Fetch the region code that is being queried + GetEventParameter( event, + kEventParamWindowRegionCode, + typeWindowRegionCode, NULL, + sizeof windowRegionCode, NULL, + &windowRegionCode ) ; + + // If it is the opaque region code then set the + // region to empty and return noErr to stop event + // propagation + if ( windowRegionCode == kWindowOpaqueRgn ) { + RgnHandle region; + GetEventParameter( event, + kEventParamRgnHandle, + typeQDRgnHandle, NULL, + sizeof region, NULL, + ®ion) ; + SetEmptyRgn(region) ; + result = noErr ; + } + } + } + break ; + default : break ; } @@ -833,18 +755,21 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand return result ; } +// mix this in from window.cpp +pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ; + pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { OSStatus result = eventNotHandledErr ; switch ( GetEventClass( event ) ) { - case kEventClassKeyboard : - result = KeyboardEventHandler( handler, event , data ) ; + case kEventClassTextInput : + result = wxMacUnicodeTextEventHandler( handler, event , data ) ; break ; - case kEventClassTextInput : - result = TextInputEventHandler( handler, event , data ) ; + case kEventClassKeyboard : + result = KeyboardEventHandler( handler, event , data ) ; break ; case kEventClassWindow : @@ -915,8 +840,8 @@ typedef struct { wxPoint m_position ; wxSize m_size ; -} -FullScreenData ; + bool m_wasResizable ; +} FullScreenData ; void wxTopLevelWindowMac::Init() { @@ -924,32 +849,19 @@ void wxTopLevelWindowMac::Init() m_maximizeOnShow = false; m_macWindow = NULL ; -#if TARGET_API_MAC_OSX - m_macUsesCompositing = ( UMAGetSystemVersion() >= 0x1030 ); -#else - m_macUsesCompositing = false; -#endif - m_macEventHandler = NULL ; m_macFullScreenData = NULL ; } -class wxMacDeferredWindowDeleter : public wxObject +wxMacDeferredWindowDeleter::wxMacDeferredWindowDeleter( WindowRef windowRef ) { -public : - wxMacDeferredWindowDeleter( WindowRef windowRef ) - { - m_macWindow = windowRef ; - } - - virtual ~wxMacDeferredWindowDeleter() - { - UMADisposeWindow( (WindowRef) m_macWindow ) ; - } + m_macWindow = windowRef ; +} -protected : - WindowRef m_macWindow ; -} ; +wxMacDeferredWindowDeleter::~wxMacDeferredWindowDeleter() +{ + DisposeWindow( (WindowRef) m_macWindow ) ; +} bool wxTopLevelWindowMac::Create(wxWindow *parent, wxWindowID id, @@ -969,9 +881,9 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent, m_windowId = id == -1 ? NewControlId() : id; wxWindow::SetLabel( title ) ; - MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; + DoMacCreateRealWindow( parent, title, pos , size , style , name ) ; - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE )); if (GetExtraStyle() & wxFRAME_EX_METAL) MacSetMetalAppearance(true); @@ -1008,6 +920,10 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() FullScreenData *data = (FullScreenData *) m_macFullScreenData ; delete data ; m_macFullScreenData = NULL ; + + // avoid dangling refs + if ( s_macDeactivateWindow == this ) + s_macDeactivateWindow = NULL; } @@ -1017,26 +933,28 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() void wxTopLevelWindowMac::Maximize(bool maximize) { - // TODO Check, is this still necessary -#if 0 - wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; - wxMacWindowClipper clip (this); -#endif - - if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) ) + Point idealSize = { 0 , 0 } ; + if ( maximize ) { - Rect rect; - GetWindowBounds((WindowRef)m_macWindow, kWindowGlobalPortRgn, &rect); - SetWindowIdealUserState((WindowRef)m_macWindow, &rect); - SetWindowUserState((WindowRef)m_macWindow, &rect); +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + HIRect bounds ; + HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal, + &bounds); + idealSize.h = bounds.size.width; + idealSize.v = bounds.size.height; +#else + Rect rect ; + GetAvailableWindowPositioningBounds(GetMainDevice(),&rect) ; + idealSize.h = rect.right - rect.left ; + idealSize.v = rect.bottom - rect.top ; +#endif } - - ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ; + ZoomWindowIdeal( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , &idealSize ) ; } bool wxTopLevelWindowMac::IsMaximized() const { - return IsWindowInStandardState( (WindowRef)m_macWindow , NULL , NULL ) ; + return IsWindowInStandardState( (WindowRef)m_macWindow , NULL , NULL ) ; } void wxTopLevelWindowMac::Iconize(bool iconize) @@ -1067,20 +985,28 @@ wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const return wxPoint(0, 0) ; } -void wxTopLevelWindowMac::SetIcon(const wxIcon& icon) -{ - // this sets m_icon - wxTopLevelWindowBase::SetIcon(icon); -} - -void wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) +bool wxTopLevelWindowMac::SetBackgroundColour(const wxColour& col ) { - wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ; - - if ( m_macBackgroundBrush.Ok() && m_macBackgroundBrush.GetStyle() != wxTRANSPARENT && m_macBackgroundBrush.MacGetBrushKind() == kwxMacBrushTheme ) + if ( !wxTopLevelWindowBase::SetBackgroundColour(col) && m_hasBgCol ) + return false ; + + if ( col == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) || col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDocumentWindowBackground)) ) + { + SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDocumentWindowBackground, false ) ; + SetBackgroundStyle(wxBG_STYLE_CUSTOM); + } + else if ( col == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) || col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDialogBackgroundActive)) ) { - SetThemeWindowBackground( (WindowRef) m_macWindow , m_macBackgroundBrush.MacGetTheme() , false ) ; + SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDialogBackgroundActive, false ) ; + SetBackgroundStyle(wxBG_STYLE_CUSTOM); } + return true; +} + +void wxTopLevelWindowMacInstallTopLevelWindowEventHandler(WindowRef window, EventHandlerRef* handler, void *ref) +{ + InstallWindowEventHandler(window, GetwxMacTopLevelEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, ref, handler ); } void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler() @@ -1089,17 +1015,26 @@ void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler() { verify_noerr( ::RemoveEventHandler( (EventHandlerRef) m_macEventHandler ) ) ; } + wxTopLevelWindowMacInstallTopLevelWindowEventHandler(MAC_WXHWND(m_macWindow),(EventHandlerRef *)&m_macEventHandler,this); +} - InstallWindowEventHandler( - MAC_WXHWND(m_macWindow), GetwxMacTopLevelEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler ); +void wxTopLevelWindowMac::MacCreateRealWindow( + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) +{ + DoMacCreateRealWindow( NULL, title, pos, size, style, name ); } -void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ) +void wxTopLevelWindowMac::DoMacCreateRealWindow( + wxWindow* parent, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { OSStatus err = noErr ; SetName(name); @@ -1128,6 +1063,8 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, WindowClass wclass = 0; WindowAttributes attr = kWindowNoAttributes ; WindowGroupRef group = NULL ; + bool activationScopeSet = false; + WindowActivationScope activationScope = kWindowActivationScopeNone; if ( HasFlag( wxFRAME_TOOL_WINDOW) ) { @@ -1137,7 +1074,10 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) ) { - wclass = kFloatingWindowClass ; + if ( HasFlag( wxSTAY_ON_TOP ) ) + wclass = kUtilityWindowClass; + else + wclass = kFloatingWindowClass ; if ( HasFlag(wxTINY_CAPTION_VERT) ) attr |= kWindowSideTitlebarAttribute ; @@ -1145,21 +1085,33 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, else { wclass = kPlainWindowClass ; + activationScopeSet = true; + activationScope = kWindowActivationScopeNone; } } + else if ( HasFlag( wxPOPUP_WINDOW ) ) + { + // TEMPORARY HACK! + // Until we've got a real wxPopupWindow class on wxMac make it a + // little easier for wxFrame to be used to emulate it and workaround + // the lack of wxPopupWindow. + if ( HasFlag( wxBORDER_NONE ) ) + wclass = kHelpWindowClass ; // has no border + else + wclass = kPlainWindowClass ; // has a single line border, it will have to do for now + //attr |= kWindowNoShadowAttribute; // turn off the shadow Should we?? + group = GetWindowGroupOfClass( // float above other windows + kFloatingWindowClass) ; + } else if ( HasFlag( wxCAPTION ) ) { wclass = kDocumentWindowClass ; attr |= kWindowInWindowMenuAttribute ; } -#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 ) else if ( HasFlag( wxFRAME_DRAWER ) ) { wclass = kDrawerWindowClass; - // we must force compositing on a drawer - m_macUsesCompositing = true ; } -#endif //10.2 and up else { if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || @@ -1167,6 +1119,10 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, { wclass = kDocumentWindowClass ; } + else if ( HasFlag( wxNO_BORDER ) ) + { + wclass = kSimpleWindowClass ; + } else { wclass = kPlainWindowClass ; @@ -1187,25 +1143,36 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, if ( HasFlag( wxCLOSE_BOX) ) attr |= kWindowCloseBoxAttribute ; } - - // turn on live resizing (OS X only) - if (UMAGetSystemVersion() >= 0x1000) - attr |= kWindowLiveResizeAttribute; + attr |= kWindowLiveResizeAttribute; if ( HasFlag(wxSTAY_ON_TOP) ) group = GetWindowGroupOfClass(kUtilityWindowClass) ; -#if TARGET_API_MAC_OSX - if ( m_macUsesCompositing ) - attr |= kWindowCompositingAttribute; + if ( HasFlag( wxFRAME_FLOAT_ON_PARENT ) ) + group = GetWindowGroupOfClass(kFloatingWindowClass) ; + + if ( group == NULL && parent != NULL ) + { + WindowRef parenttlw = (WindowRef) parent->MacGetTopLevelWindowRef(); + if( parenttlw ) + group = GetWindowGroupParent( GetWindowGroup( parenttlw ) ); + } + + attr |= kWindowCompositingAttribute; +#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale) + attr |= kWindowFrameworkScaledAttribute; #endif if ( HasFlag(wxFRAME_SHAPED) ) { WindowDefSpec customWindowDefSpec; customWindowDefSpec.defType = kWindowDefProcPtr; - customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef); - + customWindowDefSpec.u.defProc = +#ifdef __LP64__ + (WindowDefUPP) wxShapedMacWindowDef; +#else + NewWindowDefUPP(wxShapedMacWindowDef); +#endif err = ::CreateCustomWindow( &customWindowDefSpec, wclass, attr, &theBoundsRect, (WindowRef*) &m_macWindow); @@ -1220,36 +1187,42 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") ); - // the create commands are only for content rect, so we have to set the size again as - // structure bounds + // setup a separate group for each window, so that overlays can be handled easily + + WindowGroupRef overlaygroup = NULL; + verify_noerr( CreateWindowGroup( kWindowGroupAttrMoveTogether | kWindowGroupAttrLayerTogether | kWindowGroupAttrHideOnCollapse, &overlaygroup )); + verify_noerr( SetWindowGroupParent( overlaygroup, GetWindowGroup( (WindowRef) m_macWindow ))); + verify_noerr( SetWindowGroup( (WindowRef) m_macWindow , overlaygroup )); + + if ( activationScopeSet ) + { + verify_noerr( SetWindowActivationScope( (WindowRef) m_macWindow , activationScope )); + } + + // the create commands are only for content rect, + // so we have to set the size again as structure bounds SetWindowBounds( (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ; wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ; - UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ; + SetWindowTitleWithCFString( (WindowRef) m_macWindow , wxMacCFStringHolder( title , m_font.GetEncoding() ) ); m_peer = new wxMacControl(this , true /*isRootControl*/) ; -#if TARGET_API_MAC_OSX - if ( m_macUsesCompositing ) + // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of + // the content view, so we have to retrieve it explicitly + HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , + m_peer->GetControlRefAddr() ) ; + if ( !m_peer->Ok() ) { - // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of - // the content view, so we have to retrieve it explicitly - HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , - m_peer->GetControlRefAddr() ) ; - if ( !m_peer->Ok() ) - { - // compatibility mode fallback - GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ; - } - } -#endif - { - ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ; + // compatibility mode fallback + GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ; } // the root control level handler MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ; -#if TARGET_API_MAC_OSX + // Causes the inner part of the window not to be metal + // if the style is used before window creation. +#if 0 // TARGET_API_MAC_OSX if ( m_macUsesCompositing && m_macWindow != NULL ) { if ( GetExtraStyle() & wxFRAME_EX_METAL ) @@ -1257,6 +1230,16 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } #endif + if ( m_macWindow != NULL ) + { + MacSetUnifiedAppearance( true ) ; + } + + HIViewRef growBoxRef = 0 ; + err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef ); + if ( err == noErr && growBoxRef != 0 ) + HIGrowBoxViewSetTransparent( growBoxRef, true ) ; + // the frame window event handler InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; MacInstallTopLevelWindowEventHandler() ; @@ -1305,7 +1288,7 @@ void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp) } } -void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) +void wxTopLevelWindowMac::MacActivate( long timestamp , bool WXUNUSED(inIsActivating) ) { wxLogTrace(TRACE_ACTIVATE, wxT("TopLevel=%p::MacActivate"), this); @@ -1313,13 +1296,12 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) s_macDeactivateWindow = NULL; MacDelayedDeactivation(timestamp); - MacPropagateHiliteChanged() ; } void wxTopLevelWindowMac::SetTitle(const wxString& title) { wxWindow::SetLabel( title ) ; - UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ; + SetWindowTitleWithCFString( (WindowRef) m_macWindow , wxMacCFStringHolder( title , m_font.GetEncoding() ) ) ; } wxString wxTopLevelWindowMac::GetTitle() const @@ -1332,50 +1314,175 @@ bool wxTopLevelWindowMac::Show(bool show) if ( !wxTopLevelWindowBase::Show(show) ) return false; + bool plainTransition = true; + +#if wxUSE_SYSTEM_OPTIONS + if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) + plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ; +#endif + if (show) { -#if wxUSE_SYSTEM_OPTIONS // code contributed by Ryan Wilcox December 18, 2003 - bool plainTransition = UMAGetSystemVersion() >= 0x1000 ; - if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) - plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ; - if ( plainTransition ) - { ::ShowWindow( (WindowRef)m_macWindow ); - } else -#endif - { ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL ); - } ::SelectWindow( (WindowRef)m_macWindow ) ; // because apps expect a size event to occur at this moment - wxSizeEvent event( GetSize() , m_windowId); + wxSizeEvent event(GetSize() , m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); } else { -#if wxUSE_SYSTEM_OPTIONS - bool plainTransition = UMAGetSystemVersion() >= 0x1000 ; - if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) - plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ; if ( plainTransition ) - { - ::HideWindow((WindowRef) m_macWindow ); - } + ::HideWindow( (WindowRef)m_macWindow ); else + ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL ); + } + + return true ; +} + +bool wxTopLevelWindowMac::ShowWithEffect(wxShowEffect effect, + unsigned timeout, + wxDirection dir) +{ + // TODO factor common code + if ( !wxTopLevelWindowBase::Show(true) ) + return false; + + WindowTransitionEffect transition = 0 ; + switch( effect ) + { + case wxSHOW_EFFECT_ROLL : + case wxSHOW_EFFECT_SLIDE : + transition = kWindowGenieTransitionEffect; + break; + case wxSHOW_EFFECT_BLEND : + transition = kWindowFadeTransitionEffect; + break; + case wxSHOW_EFFECT_EXPAND : + default : + // having sheets would be fine, but this might lead to a repositioning +#if 0 + if ( GetParent() ) + transition = kWindowSheetTransitionEffect; + else #endif - { - ::TransitionWindow((WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL ); - } + transition = kWindowZoomTransitionEffect; + break; } + + TransitionWindowOptions options; + options.version = 0; + options.duration = timeout / 1000.0; + options.window = transition == kWindowSheetTransitionEffect ? (WindowRef) GetParent()->MacGetTopLevelWindowRef() :0; + options.userData = 0; + + wxSize size = wxGetDisplaySize(); + Rect bounds; + GetWindowBounds( (WindowRef)m_macWindow, kWindowStructureRgn, &bounds ); + CGRect hiBounds = CGRectMake( bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top ); - MacPropagateVisibilityChanged() ; + if ( dir & wxRIGHT ) + { + hiBounds.origin.x = size.x; + hiBounds.size.width = 0; + } + if ( dir & wxUP ) + { + hiBounds.origin.y = 0; + hiBounds.size.height = 0; + } + if ( dir & wxDOWN ) + { + hiBounds.origin.y = size.y; + hiBounds.size.height = 0; + } + if ( dir & wxLEFT ) + { + hiBounds.origin.x = 0; + hiBounds.size.width = 0; + } + + ::TransitionWindowWithOptions( (WindowRef)m_macWindow, transition, kWindowShowTransitionAction, transition == kWindowGenieTransitionEffect ? &hiBounds : NULL , + false, &options ); - return true ; + ::SelectWindow( (WindowRef)m_macWindow ) ; + + // because apps expect a size event to occur at this moment + wxSizeEvent event(GetSize() , m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + + return true; +} + +bool wxTopLevelWindowMac::HideWithEffect(wxShowEffect effect, + unsigned timeout , + wxDirection dir ) +{ + if ( !wxTopLevelWindowBase::Show(false) ) + return false; + + WindowTransitionEffect transition = 0 ; + switch( effect ) + { + case wxSHOW_EFFECT_ROLL : + case wxSHOW_EFFECT_SLIDE : + transition = kWindowGenieTransitionEffect; + break; + case wxSHOW_EFFECT_BLEND : + transition = kWindowFadeTransitionEffect; + break; + case wxSHOW_EFFECT_EXPAND : + default: +#if 0 + if ( GetParent() ) + transition = kWindowSheetTransitionEffect; + else +#endif + transition = kWindowZoomTransitionEffect; + break; + } + TransitionWindowOptions options; + options.version = 0; + options.duration = timeout / 1000.0; + options.window = transition == kWindowSheetTransitionEffect ? (WindowRef) GetParent()->MacGetTopLevelWindowRef() :0; + options.userData = 0; + + wxSize size = wxGetDisplaySize(); + Rect bounds; + GetWindowBounds( (WindowRef)m_macWindow, kWindowStructureRgn, &bounds ); + CGRect hiBounds = CGRectMake( bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top ); + + if ( dir & wxRIGHT ) + { + hiBounds.origin.x = size.x; + hiBounds.size.width = 0; + } + if ( dir & wxUP ) + { + hiBounds.origin.y = 0; + hiBounds.size.height = 0; + } + if ( dir & wxDOWN ) + { + hiBounds.origin.y = size.y; + hiBounds.size.height = 0; + } + if ( dir & wxLEFT ) + { + hiBounds.origin.x = 0; + hiBounds.size.width = 0; + } + ::TransitionWindowWithOptions( (WindowRef)m_macWindow, transition, kWindowHideTransitionAction, transition == kWindowGenieTransitionEffect ? &hiBounds : NULL , + false, &options ); + + return true; } bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style) @@ -1389,6 +1496,7 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style) m_macFullScreenData = data ; data->m_position = GetPosition() ; data->m_size = GetSize() ; + data->m_wasResizable = MacGetWindowAttributes() & kWindowResizableAttribute ; if ( style & wxFULLSCREEN_NOMENUBAR ) HideMenuBar() ; @@ -1429,11 +1537,15 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style) } SetSize( x , y , w, h ) ; + if ( data->m_wasResizable ) + MacChangeWindowAttributes( kWindowNoAttributes , kWindowResizableAttribute ) ; } else { ShowMenuBar() ; FullScreenData *data = (FullScreenData *) m_macFullScreenData ; + if ( data->m_wasResizable ) + MacChangeWindowAttributes( kWindowResizableAttribute , kWindowNoAttributes ) ; SetPosition( data->m_position ) ; SetSize( data->m_size ) ; @@ -1449,29 +1561,66 @@ bool wxTopLevelWindowMac::IsFullScreen() const return m_macFullScreenData != NULL ; } -void wxTopLevelWindowMac::SetExtraStyle(long exStyle) + +bool wxTopLevelWindowMac::SetTransparent(wxByte alpha) +{ + OSStatus result = SetWindowAlpha((WindowRef)m_macWindow, float(alpha)/255.0); + return result == noErr; +} + + +bool wxTopLevelWindowMac::CanSetTransparent() +{ + return true; +} + + +void wxTopLevelWindowMac::SetExtraStyle(long exStyle) { if ( GetExtraStyle() == exStyle ) return ; - + wxTopLevelWindowBase::SetExtraStyle( exStyle ) ; -#if TARGET_API_MAC_OSX - if ( m_macUsesCompositing && m_macWindow != NULL ) + if ( m_macWindow != NULL ) { bool metal = GetExtraStyle() & wxFRAME_EX_METAL ; + if ( MacGetMetalAppearance() != metal ) + { + if ( MacGetUnifiedAppearance() ) + MacSetUnifiedAppearance( !metal ) ; + MacSetMetalAppearance( metal ) ; + } } -#endif } -// we are still using coordinates of the content view; TODO: switch to structure bounds +bool wxTopLevelWindowMac::SetBackgroundStyle(wxBackgroundStyle style) +{ + if ( !wxTopLevelWindowBase::SetBackgroundStyle(style) ) + return false ; + + WindowRef windowRef = HIViewGetWindow( (HIViewRef)GetHandle() ); + + if ( GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT ) + { + OSStatus err = HIWindowChangeFeatures( windowRef, 0, kWindowIsOpaque ); + verify_noerr( err ); + err = ReshapeCustomWindow( windowRef ); + verify_noerr( err ); + } + + return true ; +} +// TODO: switch to structure bounds - +// we are still using coordinates of the content view +// void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) { - Rect content ; - Rect structure ; + Rect content, structure ; + GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ; GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ; @@ -1525,24 +1674,45 @@ void wxTopLevelWindowMac::DoGetClientSize( int *width, int *height ) const *height = bounds.bottom - bounds.top ; } +void wxTopLevelWindowMac::DoCentre(int dir) +{ + if ( m_macWindow != 0 ) + wxTopLevelWindowBase::DoCentre(dir); +} + void wxTopLevelWindowMac::MacSetMetalAppearance( bool set ) { -#if TARGET_API_MAC_OSX - wxASSERT_MSG( m_macUsesCompositing , - wxT("Cannot set metal appearance on a non-compositing window") ) ; + if ( MacGetUnifiedAppearance() ) + MacSetUnifiedAppearance( false ) ; MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes , set ? kWindowNoAttributes : kWindowMetalAttribute ) ; -#endif } bool wxTopLevelWindowMac::MacGetMetalAppearance() const { -#if TARGET_API_MAC_OSX return MacGetWindowAttributes() & kWindowMetalAttribute ; -#else - return false ; -#endif +} + +void wxTopLevelWindowMac::MacSetUnifiedAppearance( bool set ) +{ + if ( MacGetMetalAppearance() ) + MacSetMetalAppearance( false ) ; + + MacChangeWindowAttributes( set ? kWindowUnifiedTitleAndToolbarAttribute : kWindowNoAttributes , + set ? kWindowNoAttributes : kWindowUnifiedTitleAndToolbarAttribute) ; + + // For some reason, Tiger uses white as the background color for this appearance, + // while most apps using it use the typical striped background. Restore that behavior + // for wx. + // TODO: Determine if we need this on Leopard as well. (should be harmless either way, + // though) + SetBackgroundColour( wxSYS_COLOUR_WINDOW ) ; +} + +bool wxTopLevelWindowMac::MacGetUnifiedAppearance() const +{ + return MacGetWindowAttributes() & kWindowUnifiedTitleAndToolbarAttribute ; } void wxTopLevelWindowMac::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) @@ -1560,58 +1730,9 @@ wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const void wxTopLevelWindowMac::MacPerformUpdates() { -#if TARGET_API_MAC_OSX - if ( m_macUsesCompositing ) - { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 - // for composited windows this also triggers a redraw of all - // invalid views in the window - if ( UMAGetSystemVersion() >= 0x1030 ) - HIWindowFlush((WindowRef) m_macWindow) ; - else -#endif - { - // the only way to trigger the redrawing on earlier systems is to call - // ReceiveNextEvent - - EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; - UInt32 currentEventClass = 0 ; - UInt32 currentEventKind = 0 ; - if ( currentEvent != NULL ) - { - currentEventClass = ::GetEventClass( currentEvent ) ; - currentEventKind = ::GetEventKind( currentEvent ) ; - } - - if ( currentEventClass != kEventClassMenu ) - { - // when tracking a menu, strange redraw errors occur if we flush now, so leave.. - EventRef theEvent; - OSStatus status = noErr ; - status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ; - } - } - } - else -#endif - { - BeginUpdate( (WindowRef) m_macWindow ) ; - - RgnHandle updateRgn = NewRgn(); - if ( updateRgn ) - { - GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ); - UpdateControls( (WindowRef)m_macWindow , updateRgn ) ; - - // if ( !EmptyRgn( updateRgn ) ) - // MacDoRedraw( updateRgn , 0 , true) ; - - DisposeRgn( updateRgn ); - } - - EndUpdate( (WindowRef)m_macWindow ) ; - QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ; - } + // for composited windows this also triggers a redraw of all + // invalid views in the window + HIWindowFlush((WindowRef) m_macWindow) ; } // Attracts the users attention to this window if the application is @@ -1620,11 +1741,10 @@ void wxTopLevelWindowMac::MacPerformUpdates() static pascal void wxMacNMResponse( NMRecPtr ptr ) { NMRemove( ptr ) ; - DisposePtr( (Ptr) ptr ) ; + DisposePtr( (Ptr)ptr ) ; } - -void wxTopLevelWindowMac::RequestUserAttention(int flags ) +void wxTopLevelWindowMac::RequestUserAttention(int WXUNUSED(flags)) { NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ; static wxMacNMUPP nmupp( wxMacNMResponse ); @@ -1650,8 +1770,8 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false, _T("Shaped windows must be created with the wxFRAME_SHAPED style.")); - // The empty region signifies that the shape should be removed from the - // window. + // The empty region signifies that the shape + // should be removed from the window. if ( region.IsEmpty() ) { wxSize sz = GetClientSize(); @@ -1672,7 +1792,7 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) DisposeRgn(oldRgn); // Save the region so we can use it later - SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion); + SetWRefCon((WindowRef)MacGetWindowRef(), (URefCon)shapeRegion); // inform the window manager that the window has changed shape ReshapeCustomWindow((WindowRef)MacGetWindowRef()); @@ -1688,15 +1808,15 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect) { GetWindowPortBounds(window, inRect); - Point pt = {inRect->left, inRect->top}; - QDLocalToGlobalPoint( GetWindowPort(window) , &pt ) ; + Point pt = { inRect->top ,inRect->left }; + wxMacLocalToGlobal( window, &pt ) ; + inRect->bottom += pt.v - inRect->top; + inRect->right += pt.h - inRect->left; inRect->top = pt.v; inRect->left = pt.h; - inRect->bottom += pt.v; - inRect->right += pt.h; } -static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param) +static SInt32 wxShapedMacWindowGetFeatures(WindowRef WXUNUSED(window), SInt32 param) { /*------------------------------------------------------ Define which options your custom window supports. @@ -1796,7 +1916,7 @@ static SInt32 wxShapedMacWindowHitTest(WindowRef window, SInt32 param) return wNoHit; } -static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param) +static pascal long wxShapedMacWindowDef(short WXUNUSED(varCode), WindowRef window, SInt16 message, SInt32 param) { switch (message) { @@ -1816,4 +1936,3 @@ static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 return 0; } -