X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5c1f8ca21e458661410d5019aea45134ccd0569..30e77b5c9ff09da4e65445d3a03081d375f49845:/src/mac/carbon/uma.cpp diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index c8073ac49f..807f122922 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -9,7 +9,10 @@ // Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" +#include "wx/wxprec.h" + +#if wxUSE_GUI + #include "wx/dc.h" #include @@ -30,9 +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 @@ -40,7 +47,8 @@ static bool sUMAHasAppearance = false ; static long sUMAAppearanceVersion = 0 ; static long sUMASystemVersion = 0 ; static bool sUMAHasAquaLayout = false ; -static bool sUMASystemInitialized = false ; + +static bool sUMAHasInittedAppearance = false; extern int gAGABackgroundColor ; bool UMAHasAppearance() { return sUMAHasAppearance ; } @@ -53,11 +61,11 @@ static long sUMAWindowManagerAttr = 0 ; bool UMAHasWindowManager() { return sUMAHasWindowManager ; } long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; } bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; } -bool UMASystemIsInitialized() { return sUMASystemInitialized ; } + void UMACleanupToolbox() { - if ( sUMAHasAppearance ) + if (sUMAHasInittedAppearance) { UnregisterAppearanceClient() ; } @@ -68,26 +76,29 @@ void UMACleanupToolbox() if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress ) TXNTerminateTextension( ) ; } -void UMAInitToolbox( UInt16 inMoreMastersCalls ) +void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) { #if !TARGET_CARBON ::MaxApplZone(); for (long i = 1; i <= inMoreMastersCalls; i++) ::MoreMasters(); - ::InitGraf(&qd.thePort); - ::InitFonts(); - ::InitMenus(); - ::TEInit(); - ::InitDialogs(0L); - ::FlushEvents(everyEvent, 0); - ::InitCursor(); + if (!isEmbedded) + { + ::InitGraf(&qd.thePort); + ::InitFonts(); + ::InitMenus(); + ::TEInit(); + ::InitDialogs(0L); + ::FlushEvents(everyEvent, 0); + } + long total,contig; PurgeSpace(&total, &contig); -#else - InitCursor(); #endif + ::InitCursor(); + if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr) sUMASystemVersion = 0x0000 ; @@ -95,7 +106,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr ) { sUMAHasAppearance = true ; - RegisterAppearanceClient(); + OSStatus status = RegisterAppearanceClient(); + // If status equals appearanceProcessRegisteredErr it means the + // appearance client already was registered (For example if we run + // embedded, the host might have registered it). In such a case + // we don't unregister it later on. + if (status != appearanceProcessRegisteredErr) + { + // Appearance client wasn't registered yet. + sUMAHasInittedAppearance = true; + } + if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr ) { sUMAAppearanceVersion = theAppearance ; @@ -113,10 +134,13 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) #if TARGET_CARBON // Call currently implicitely done : InitFloatingWindows() ; #else - if ( sUMAHasWindowManager ) - InitFloatingWindows() ; - else - InitWindows(); + if (!isEmbedded) + { + if ( sUMAHasWindowManager ) + InitFloatingWindows() ; + else + InitWindows(); + } #endif if ( NavServicesAvailable() ) @@ -140,25 +164,21 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) TXNMacOSPreferredFontDescription fontDescriptions[] = { - { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } , + { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } } ; int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ; -#if 0 // TARGET_CARBON - --noOfFontDescriptions ; -#endif - // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke - OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ; -#if TARGET_CARBON - if ( !UMAHasAquaLayout() ) -#endif + + OptionBits options = 0 ; + + if ( UMAGetSystemVersion() < 0x1000 ) { options |= kTXNAlwaysUseQuickDrawTextMask ; } - TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); + TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); } - sUMASystemInitialized = true ; + UMASetSystemIsInitialized(true); } @@ -177,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; @@ -195,13 +215,13 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() // menu manager -MenuRef UMANewMenu( SInt16 id , const wxString& title ) +MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding ) { wxString str = wxStripMenuCodes( title ) ; MenuRef menu ; #if TARGET_CARBON CreateNewMenu( id , 0 , &menu ) ; - SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ; + SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ; #else Str255 ptitle ; wxMacStringToPascal( str , ptitle ) ; @@ -210,11 +230,11 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title ) return menu ; } -void UMASetMenuTitle( MenuRef menu , const wxString& title ) +void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding) { wxString str = wxStripMenuCodes( title ) ; #if TARGET_CARBON - SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ; + SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ; #else Str255 ptitle ; wxMacStringToPascal( str , ptitle ) ; @@ -222,11 +242,11 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title ) #endif } -void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title ) +void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title , wxFontEncoding encoding) { wxString str = wxStripMenuCodes( title ) ; #if TARGET_CARBON - SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ; + SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ; #else Str255 ptitle ; wxMacStringToPascal( str , ptitle ) ; @@ -248,18 +268,18 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) DisableMenuItem( inMenu , inItem ) ; } -void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id ) +void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id ) { MacAppendMenu(menu, "\pA"); - UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title ); + UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding ); SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ; } -void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 id ) +void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id ) { MacInsertMenuItem(menu, "\pA" , item); - UMASetMenuItemText(menu, item , title ); - SetMenuItemHierarchicalID( menu , item , id ) ; + UMASetMenuItemText(menu, item+1, title , encoding); + SetMenuItemHierarchicalID( menu , item+1 , id ) ; } void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) @@ -295,13 +315,13 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn // for some reasons this must be 0 right now // everything else leads to just the first function key item // to be selected. Thanks to Ryan Wilcox for finding out. - macKey = 0 ; + macKey = 0 ; glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; if ( key >= WXK_F13 ) glyph += 13 ; if ( !explicitCommandKey ) modifiers |= kMenuNoCommandModifier ; - } + } else { switch( key ) @@ -362,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 ) @@ -373,17 +404,21 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn } } -void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry ) +void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry ) { MacAppendMenu(menu, "\pA"); - UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title ); + // 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 ) ; } -void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry ) +void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry ) { MacInsertMenuItem( menu , "\pA" , item) ; - UMASetMenuItemText(menu, item+1 , title ); + // 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 ) ; } @@ -479,10 +514,10 @@ void UMADisposeWindow( WindowRef inWindowRef ) DisposeWindow( inWindowRef ) ; } -void UMASetWTitle( WindowRef inWindowRef , const wxString& title ) +void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding) { #if TARGET_CARBON - SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ; + SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ; #else Str255 ptitle ; wxMacStringToPascal( title , ptitle ) ; @@ -490,22 +525,12 @@ void UMASetWTitle( WindowRef inWindowRef , const wxString& title ) #endif } -void UMAGetWTitleC( WindowRef inWindowRef , char *title ) -{ - GetWTitle( inWindowRef , (unsigned char*)title ) ; -#if TARGET_CARBON - p2cstrcpy( title, (unsigned char *)title ) ; -#else - p2cstr( (unsigned char*)title ) ; -#endif -} - // appearance additions -void UMASetControlTitle( ControlHandle inControl , const wxString& title ) +void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding) { #if TARGET_CARBON - SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ; + SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ; #else Str255 ptitle ; wxMacStringToPascal( title , ptitle ) ; @@ -513,8 +538,9 @@ void UMASetControlTitle( ControlHandle inControl , const wxString& title ) #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 ) ) @@ -522,92 +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) ; - 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; @@ -621,22 +650,6 @@ OSErr UMASetKeyboardFocus (WindowPtr inWindow, return err ; } - -// events -void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) -{ - 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 ; @@ -665,7 +678,7 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) GetPort( &port ) ; SetPortWindowPort( inWindowRef ) ; HiliteWindow( inWindowRef , inActivate ) ; - ControlHandle control = NULL ; + ControlRef control = NULL ; ::GetRootControl( inWindowRef , & control ) ; if ( control ) { @@ -725,6 +738,7 @@ void wxMacPortStateHelper::Setup( GrafPtr newport ) { GetPort( &m_oldPort ) ; SetPort( newport ) ; + SetOrigin(0,0); wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ; m_clip = NewRgn() ; GetClip( m_clip ); @@ -777,3 +791,40 @@ 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->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 + +static bool sUMASystemInitialized = false ; + +bool UMASystemIsInitialized() +{ + return sUMASystemInitialized ; +} + +void UMASetSystemIsInitialized(bool val) +{ + sUMASystemInitialized = val; +} + + +#endif // wxUSE_BASE