X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1832043f93af07af3f4891d9a95c4d4e1f70eec5..968c951fe1f6aba8276d6585c452b89bfa95993d:/src/mac/carbon/uma.cpp diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 91b3ed5f7b..d629632390 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -11,33 +11,13 @@ #include "wx/wxprec.h" -#if wxUSE_GUI +#include "wx/mac/uma.h" -#ifndef WX_PRECOMP - #if TARGET_API_MAC_OSX - #include "wx/toplevel.h" - #endif -#endif +#if wxUSE_GUI +#include "wx/toplevel.h" #include "wx/dc.h" -#ifndef __DARWIN__ -# include -# include -# if defined(TARGET_CARBON) -# if PM_USE_SESSION_APIS -# include -# endif -# include -# else -# include -# endif -#endif - -#ifndef __DARWIN__ -# include -#endif - #include "wx/mac/uma.h" // since we have decided that we only support 8.6 upwards we are @@ -46,111 +26,23 @@ // windows manager, control manager, navigation services etc. are // present -static bool sUMAHasAppearance = false ; -static long sUMAAppearanceVersion = 0 ; -static long sUMASystemVersion = 0 ; -static bool sUMAHasAquaLayout = false ; - -static bool sUMAHasInittedAppearance = false; +static SInt32 sUMASystemVersion = 0 ; -extern int gAGABackgroundColor ; - -bool UMAHasAppearance() { return sUMAHasAppearance ; } -long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; } long UMAGetSystemVersion() { return sUMASystemVersion ; } -static bool sUMAHasWindowManager = false ; -static long sUMAWindowManagerAttr = 0 ; - -bool UMAHasWindowManager() { return sUMAHasWindowManager ; } -long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; } -bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; } - - void UMACleanupToolbox() { - if (sUMAHasInittedAppearance) - UnregisterAppearanceClient() ; - - if ( NavServicesAvailable() ) - NavUnload() ; - - if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress ) - TXNTerminateTextension( ) ; } -void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) +void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls), + bool WXUNUSED(isEmbedded) ) { -#if !TARGET_CARBON - ::MaxApplZone(); - for (long i = 1; i <= inMoreMastersCalls; i++) - ::MoreMasters(); - - if (!isEmbedded) - { - ::InitGraf(&qd.thePort); - ::InitFonts(); - ::InitMenus(); - ::TEInit(); - ::InitDialogs(0L); - ::FlushEvents(everyEvent, 0); - } - - long total,contig; - PurgeSpace(&total, &contig); -#endif - ::InitCursor(); if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr) sUMASystemVersion = 0x0000 ; - long theAppearance ; - if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr ) - { - // 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. - - sUMAHasAppearance = true ; - OSStatus status = RegisterAppearanceClient(); - if (status != appearanceProcessRegisteredErr) - { - // Appearance client wasn't registered yet. - sUMAHasInittedAppearance = true; - } - - if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr ) - sUMAAppearanceVersion = theAppearance ; - else - sUMAAppearanceVersion = 0x0100 ; - } - - if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr ) - sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ; - -#if TARGET_CARBON -// Call currently implicitely done : InitFloatingWindows() ; -#else - if (!isEmbedded) - { - if ( sUMAHasWindowManager ) - InitFloatingWindows() ; - else - InitWindows(); - } -#endif - - if ( NavServicesAvailable() ) - NavLoad() ; - - long menuMgrAttr ; - Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ; - if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) - sUMAHasAquaLayout = true ; - - if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress ) +#ifndef __LP64__ { FontFamilyID fontId ; Str255 fontName ; @@ -173,19 +65,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) TXNInitTextension( fontDescriptions, noOfFontDescriptions, options ); } +#endif UMASetSystemIsInitialized( true ); } -#if 0 -Boolean CanUseATSUI() -{ - long result; - OSErr err = Gestalt(gestaltATSUVersion, &result); - return (err == noErr); -} -#endif - // process manager long UMAGetProcessMode() { @@ -197,7 +81,9 @@ long UMAGetProcessMode() procno.lowLongOfPSN = kCurrentProcess ; processinfo.processInfoLength = sizeof(ProcessInfoRec); processinfo.processName = NULL; +#ifndef __LP64__ processinfo.processAppSpec = NULL; +#endif err = ::GetProcessInformation( &procno , &processinfo ) ; wxASSERT( err == noErr ) ; @@ -217,14 +103,8 @@ 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 , encoding ) ) ; -#else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - menu = ::NewMenu( id , ptitle ) ; -#endif return menu ; } @@ -233,14 +113,7 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding enco { wxString str = wxStripMenuCodes( title ) ; -#if TARGET_CARBON SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - SetMenuTitle( menu , ptitle ) ; -#endif } void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title, wxFontEncoding encoding ) @@ -248,14 +121,7 @@ void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& titl // we don't strip the accels here anymore, must be done before wxString str = title ; -#if TARGET_CARBON SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - SetMenuItemText( menu , item , ptitle ) ; -#endif } UInt32 UMAMenuEvent( EventRecord *inEvent ) @@ -273,14 +139,17 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id ) { - MacAppendMenu( menu, "\pA" ); + AppendMenuItemTextWithCFString( menu, + CFSTR("A"), 0, 0,NULL); UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding ); SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ; } void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id ) { - MacInsertMenuItem( menu, "\pA" , item ); + InsertMenuItemTextWithCFString( menu, + CFSTR("A"), item, 0, 0); + UMASetMenuItemText( menu, item+1, title , encoding ); SetMenuItemHierarchicalID( menu , item+1 , id ) ; } @@ -315,7 +184,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn macKey = 0 ; glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; if ( key >= WXK_F13 ) - glyph += 13 ; + glyph += 12 ; } else { @@ -425,8 +294,8 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry ) { - MacAppendMenu(menu, "\pA"); - + AppendMenuItemTextWithCFString( menu, + CFSTR("A"), 0, 0,NULL); // 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 ); @@ -435,7 +304,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) ; + InsertMenuItemTextWithCFString( menu, + CFSTR("A"), item, 0, 0); // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ; @@ -443,87 +313,14 @@ void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc UMASetMenuItemShortcut( menu , item+1 , entry ) ; } -// quickdraw - -#if !TARGET_CARBON - -int gPrOpenCounter = 0 ; - -OSStatus UMAPrOpen() -{ - OSErr err = noErr ; - - ++gPrOpenCounter ; - - if ( gPrOpenCounter == 1 ) - { - PrOpen() ; - err = PrError() ; - wxASSERT( err == noErr ) ; - } - - return err ; -} - -OSStatus UMAPrClose() -{ - OSErr err = noErr ; - - wxASSERT( gPrOpenCounter >= 1 ) ; - - if ( gPrOpenCounter == 1 ) - { - PrClose() ; - err = PrError() ; - wxASSERT( err == noErr ) ; - } - - --gPrOpenCounter ; - - return err ; -} - -pascal QDGlobalsPtr GetQDGlobalsPtr() ; -pascal QDGlobalsPtr GetQDGlobalsPtr() -{ - return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA); -} - -#endif - void UMAShowWatchCursor() { - OSErr err = noErr; - - CursHandle watchFob = GetCursor(watchCursor); - - if (watchFob == NULL) - { - err = nilHandleErr; - } - else - { -#if TARGET_CARBON -// Cursor preservedArrow; -// GetQDGlobalsArrow(&preservedArrow); -// SetQDGlobalsArrow(*watchFob); -// InitCursor(); -// SetQDGlobalsArrow(&preservedArrow); - SetCursor(*watchFob); -#else - SetCursor(*watchFob); -#endif - } + SetThemeCursor(kThemeWatchCursor); } void UMAShowArrowCursor() { -#if TARGET_CARBON - Cursor arrow; - SetCursor( GetQDGlobalsArrow(&arrow) ); -#else - SetCursor (&(qd.arrow)); -#endif + SetThemeCursor(kThemeArrowCursor); } // window manager @@ -532,11 +329,7 @@ GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) { wxASSERT( inWindowRef != NULL ) ; -#if TARGET_CARBON return (GrafPtr) GetWindowPort( inWindowRef ) ; -#else - return (GrafPtr) inWindowRef ; -#endif } void UMADisposeWindow( WindowRef inWindowRef ) @@ -548,144 +341,48 @@ void UMADisposeWindow( WindowRef inWindowRef ) void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding ) { -#if TARGET_CARBON SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( title , ptitle ) ; - SetWTitle( inWindowRef , ptitle ) ; -#endif } // appearance additions void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding ) { -#if TARGET_CARBON SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( title , ptitle ) ; - SetControlTitle( inControl , ptitle ) ; -#endif } void UMAActivateControl( ControlRef inControl ) { -#if TARGET_API_MAC_OSX ::ActivateControl( inControl ) ; - -#else - // we have to add the control after again to the update rgn - // otherwise updates get lost - if ( !IsControlActive( inControl ) ) - { - bool visible = IsControlVisible( inControl ) ; - if ( visible ) - SetControlVisibility( inControl , false , false ) ; - - ::ActivateControl( inControl ) ; - - if ( visible ) - { - SetControlVisibility( inControl , true , false ) ; - - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; - } - } -#endif } void UMAMoveControl( ControlRef inControl , short x , short y ) { -#if TARGET_API_MAC_OSX - ::MoveControl( inControl , x , y ) ; - -#else - bool visible = IsControlVisible( inControl ) ; - if ( visible ) - { - SetControlVisibility( inControl , false , false ) ; - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ; - } - ::MoveControl( inControl , x , y ) ; - - if ( visible ) - { - SetControlVisibility( inControl , true , false ) ; - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ; - } -#endif } void UMASizeControl( ControlRef inControl , short x , short y ) { -#if TARGET_API_MAC_OSX - ::SizeControl( inControl , x , y ) ; - -#else - bool visible = IsControlVisible( inControl ) ; - if ( visible ) - { - SetControlVisibility( inControl , false , false ) ; - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ; - } - ::SizeControl( inControl , x , y ) ; - - if ( visible ) - { - SetControlVisibility( inControl , true , false ) ; - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ; - } -#endif } void UMADeactivateControl( ControlRef inControl ) { -#if TARGET_API_MAC_OSX - ::DeactivateControl( inControl ) ; - -#else - // 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 ) ; - ::DeactivateControl( inControl ) ; - - if ( visible ) - { - SetControlVisibility( inControl , true , false ) ; - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; - } -#endif } // shows the control and adds the region to the update region void UMAShowControl( ControlRef inControl ) { SetControlVisibility( inControl , true , false ) ; - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; + HIViewSetNeedsDisplay( inControl, true ); } // hides the control and adds the region to the update region void UMAHideControl( ControlRef inControl ) { SetControlVisibility( inControl , false , false ) ; - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; + HIViewSetNeedsDisplay( inControl, true ); } // keyboard focus @@ -694,13 +391,17 @@ OSErr UMASetKeyboardFocus( WindowPtr inWindow, ControlFocusPart inPart ) { OSErr err = noErr; +#ifndef __LP64__ GrafPtr port ; GetPort( &port ) ; SetPortWindowPort( inWindow ) ; +#endif err = SetKeyboardFocus( inWindow , inControl , inPart ) ; +#ifndef __LP64__ SetPort( port ) ; +#endif return err ; } @@ -729,10 +430,11 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) { // bool isHighlighted = IsWindowHighlited( inWindowRef ) ; // if ( inActivate != isHighlighted ) - +#ifndef __LP64__ GrafPtr port ; GetPort( &port ) ; SetPortWindowPort( inWindowRef ) ; +#endif HiliteWindow( inWindowRef , inActivate ) ; ControlRef control = NULL ; ::GetRootControl( inWindowRef , &control ) ; @@ -743,44 +445,59 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) else UMADeactivateControl( control ) ; } - +#ifndef __LP64__ SetPort( port ) ; +#endif } } OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) { +#ifndef __LP64__ return ::DrawThemePlacard( inRect , inState ) ; +#else + return noErr; +#endif } -#if !TARGET_CARBON -static OSStatus helpMenuStatus = noErr ; -static MenuItemIndex firstCustomItemIndex = 0 ; -#endif +static OSStatus UMAGetHelpMenu( + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex, + bool allowHelpMenuCreation); -OSStatus UMAGetHelpMenu( +static OSStatus UMAGetHelpMenu( MenuRef * outHelpMenu, - MenuItemIndex * outFirstCustomItemIndex) + MenuItemIndex * outFirstCustomItemIndex, + bool allowHelpMenuCreation) { -#if TARGET_CARBON - return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ; - -#else - MenuRef helpMenuHandle ; + static bool s_createdHelpMenu = false ; - helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ; - if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr ) - firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ; + if ( !s_createdHelpMenu && !allowHelpMenuCreation ) + { + return paramErr ; + } - if ( outFirstCustomItemIndex ) - *outFirstCustomItemIndex = firstCustomItemIndex ; + OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ; + s_createdHelpMenu = ( status == noErr ) ; + return status ; +} - *outHelpMenu = helpMenuHandle ; +OSStatus UMAGetHelpMenu( + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex) +{ + return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true ); +} - return helpMenuStatus ; -#endif +OSStatus UMAGetHelpMenuDontCreate( + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex) +{ + return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false ); } +#ifndef __LP64__ + wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport ) { m_clip = NULL ; @@ -835,42 +552,65 @@ wxMacPortStateHelper::~wxMacPortStateHelper() } } -OSStatus UMAPutScrap( Size size , OSType type , void *data ) -{ - OSStatus err = noErr ; - -#if !TARGET_CARBON - err = PutScrap( size , type , data ) ; -#else - ScrapRef scrap; - err = GetCurrentScrap( &scrap ); - if ( err == noErr ) - err = PutScrapFlavor( scrap, type , 0, size, data ); #endif - 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() ) + if ( tlwwx != NULL ) { 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 ; } +size_t UMAPutBytesCFRefCallback( void *info, const void *bytes, size_t count ) +{ + CFMutableDataRef data = (CFMutableDataRef) info; + if ( data ) + { + CFDataAppendBytes( data, (const UInt8*) bytes, count ); + } + return count; +} + +void UMAReleaseCFDataProviderCallback(void *info, + const void *WXUNUSED(data), + size_t WXUNUSED(count)) +{ + if ( info ) + CFRelease( (CFDataRef) info ); +} + +void UMAReleaseCFDataConsumerCallback( void *info ) +{ + if ( info ) + CFRelease( (CFDataRef) info ); +} + +CGDataProviderRef UMACGDataProviderCreateWithCFData( CFDataRef data ) +{ + if ( data == NULL ) + return NULL; + + return CGDataProviderCreateWithCFData( data ); +} + +CGDataConsumerRef UMACGDataConsumerCreateWithCFData( CFMutableDataRef data ) +{ + if ( data == NULL ) + return NULL; + + return CGDataConsumerCreateWithCFData( data ); +} #endif // wxUSE_GUI #if wxUSE_BASE