X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a6a2972a218d918bebf46331d2bb2eb8ccaeb69..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/src/mac/carbon/uma.cpp?ds=inline diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 48a7599f04..22120e08f6 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -9,7 +9,7 @@ // Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_GUI @@ -33,10 +33,13 @@ #endif #include "wx/mac/uma.h" +#if TARGET_API_MAC_OSX +#include "wx/toplevel.h" +#endif // since we have decided that we only support 8.6 upwards we are // checking for these minimum requirements in the startup code of -// the application so all wxWindows code can safely assume that appearance 1.1 +// the application so all wxWidgets code can safely assume that appearance 1.1 // windows manager, control manager, navigation services etc. are // present @@ -165,21 +168,13 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) } ; int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ; - // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke -#if 0 - // leads to unexpected content for clients, TODO configurable - OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ; -#else OptionBits options = 0 ; -#endif -#if TARGET_CARBON - if ( !UMAHasAquaLayout() ) -#endif + if ( UMAGetSystemVersion() < 0x1000 ) { options |= kTXNAlwaysUseQuickDrawTextMask ; } - TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); + TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); } @@ -202,7 +197,7 @@ long UMAGetProcessMode() ProcessInfoRec processinfo; ProcessSerialNumber procno ; - procno.highLongOfPSN = NULL ; + procno.highLongOfPSN = 0 ; procno.lowLongOfPSN = kCurrentProcess ; processinfo.processInfoLength = sizeof(ProcessInfoRec); processinfo.processName = NULL; @@ -283,8 +278,8 @@ void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id ) { MacInsertMenuItem(menu, "\pA" , item); - UMASetMenuItemText(menu, item , title , encoding); - SetMenuItemHierarchicalID( menu , item , id ) ; + UMASetMenuItemText(menu, item+1, title , encoding); + SetMenuItemHierarchicalID( menu , item+1 , id ) ; } void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) @@ -326,7 +321,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn glyph += 13 ; if ( !explicitCommandKey ) modifiers |= kMenuNoCommandModifier ; - } + } else { switch( key ) @@ -387,10 +382,21 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn macKey = kDownArrowCharCode ; glyph = kMenuDownArrowGlyph ; break ; + default : + macKey = toupper( key ) ; + break ; } + // we now allow non command key shortcuts + // remove in case this gives problems + if ( !explicitCommandKey ) + modifiers |= kMenuNoCommandModifier ; } - SetItemCmd( menu, item , macKey ); + // 1d and 1e have special meaning to SetItemCmd, so + // do not use for these character codes. + if (key != WXK_UP && key != WXK_RIGHT) + SetItemCmd( menu, item , macKey ); + SetMenuItemModifiers(menu, item , modifiers ) ; if ( glyph ) @@ -401,6 +407,8 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry ) { MacAppendMenu(menu, "\pA"); + // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) + ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ; UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding ); UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ; } @@ -408,6 +416,8 @@ void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry ) { MacInsertMenuItem( menu , "\pA" , item) ; + // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) + ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ; UMASetMenuItemText(menu, item+1 , title , encoding ); UMASetMenuItemShortcut( menu , item+1 , entry ) ; } @@ -517,7 +527,7 @@ void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncodin // appearance additions -void UMASetControlTitle( ControlHandle inControl , const wxString& title , wxFontEncoding encoding) +void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding) { #if TARGET_CARBON SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ; @@ -528,8 +538,9 @@ void UMASetControlTitle( ControlHandle inControl , const wxString& title , wxFon #endif } -void UMAActivateControl( ControlHandle inControl ) +void UMAActivateControl( ControlRef inControl ) { +#if !TARGET_API_MAC_OSX // we have to add the control after again to the update rgn // otherwise updates get lost if ( !IsControlActive( inControl ) ) @@ -537,93 +548,95 @@ void UMAActivateControl( ControlHandle inControl ) bool visible = IsControlVisible( inControl ) ; if ( visible ) SetControlVisibility( inControl , false , false ) ; +#endif ::ActivateControl( inControl ) ; +#if !TARGET_API_MAC_OSX if ( visible ) { SetControlVisibility( inControl , true , false ) ; + Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ; } } +#endif } -void UMADrawControl( ControlHandle inControl ) -{ - WindowRef theWindow = GetControlOwner(inControl) ; - wxMacPortStateHelper help( (GrafPtr) GetWindowPort(theWindow) ) ; - RgnHandle updateRgn = NewRgn() ; - GetWindowUpdateRgn( theWindow , updateRgn ) ; - Point zero = { 0 , 0 } ; - LocalToGlobal( &zero ) ; - OffsetRgn( updateRgn , -zero.h , -zero.v ) ; - ::DrawControlInCurrentPort( inControl ) ; - InvalWindowRgn( theWindow, updateRgn) ; - DisposeRgn( updateRgn ) ; -} - -void UMAMoveControl( ControlHandle inControl , short x , short y ) +void UMAMoveControl( ControlRef inControl , short x , short y ) { +#if !TARGET_API_MAC_OSX bool visible = IsControlVisible( inControl ) ; if ( visible ) { SetControlVisibility( inControl , false , false ) ; Rect ctrlBounds ; InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; } +#endif ::MoveControl( inControl , x , y ) ; +#if !TARGET_API_MAC_OSX if ( visible ) { SetControlVisibility( inControl , true , false ) ; Rect ctrlBounds ; InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; } +#endif } -void UMASizeControl( ControlHandle inControl , short x , short y ) +void UMASizeControl( ControlRef inControl , short x , short y ) { +#if !TARGET_API_MAC_OSX bool visible = IsControlVisible( inControl ) ; if ( visible ) { SetControlVisibility( inControl , false , false ) ; Rect ctrlBounds ; InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; } +#endif ::SizeControl( inControl , x , y ) ; +#if !TARGET_API_MAC_OSX if ( visible ) { SetControlVisibility( inControl , true , false ) ; Rect ctrlBounds ; InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; } +#endif } -void UMADeactivateControl( ControlHandle inControl ) +void UMADeactivateControl( ControlRef inControl ) { +#if !TARGET_API_MAC_OSX // we have to add the control after again to the update rgn // otherwise updates get lost bool visible = IsControlVisible( inControl ) ; if ( visible ) SetControlVisibility( inControl , false , false ) ; +#endif ::DeactivateControl( inControl ) ; +#if !TARGET_API_MAC_OSX if ( visible ) { SetControlVisibility( inControl , true , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ; } +#endif } // shows the control and adds the region to the update region -void UMAShowControl (ControlHandle inControl) +void UMAShowControl (ControlRef inControl) { SetControlVisibility( inControl , true , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ; } -// shows the control and adds the region to the update region -void UMAHideControl (ControlHandle inControl) +// hides the control and adds the region to the update region +void UMAHideControl (ControlRef inControl) { SetControlVisibility( inControl , false , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ; } // keyboard focus OSErr UMASetKeyboardFocus (WindowPtr inWindow, - ControlHandle inControl, + ControlRef inControl, ControlFocusPart inPart) { OSErr err = noErr; @@ -637,23 +650,6 @@ OSErr UMASetKeyboardFocus (WindowPtr inWindow, return err ; } - -// events -void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) -{ - wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) inWindow) ) ; - RgnHandle updateRgn = NewRgn() ; - GetWindowUpdateRgn( inWindow , updateRgn ) ; - - Point zero = { 0 , 0 } ; - LocalToGlobal( &zero ) ; - OffsetRgn( updateRgn , -zero.h , -zero.v ) ; - - UpdateControls( inWindow , inRgn ) ; - InvalWindowRgn( inWindow, updateRgn) ; - DisposeRgn( updateRgn ) ; -} - bool UMAIsWindowFloating( WindowRef inWindow ) { WindowClass cl ; @@ -677,12 +673,12 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) if ( inWindowRef ) { // bool isHighlighted = IsWindowHighlited( inWindowRef ) ; -// if ( inActivate != isHightlited ) +// if ( inActivate != isHighlighted ) GrafPtr port ; GetPort( &port ) ; SetPortWindowPort( inWindowRef ) ; HiliteWindow( inWindowRef , inActivate ) ; - ControlHandle control = NULL ; + ControlRef control = NULL ; ::GetRootControl( inWindowRef , & control ) ; if ( control ) { @@ -795,6 +791,25 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data ) return err ; } +Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds) +{ + GetControlBounds( theControl , bounds ) ; +#if TARGET_API_MAC_OSX + WindowRef tlwref = GetControlOwner( theControl ) ; + + wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ; + if ( tlwwx != NULL && tlwwx->MacUsesCompositing() ) + { + ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ; + HIPoint hiPoint = CGPointMake( 0 , 0 ) ; + HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ; + OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ; + } +#endif + return bounds ; +} + + #endif // wxUSE_GUI #if wxUSE_BASE