X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7052b16dedae79bec878ce41e4607a39a969610c..c0831a3c31d5fdc5f1f4271861dcf79c13bb6491:/src/mac/uma.cpp diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp index 40fc28f1d6..48a7599f04 100644 --- a/src/mac/uma.cpp +++ b/src/mac/uma.cpp @@ -10,6 +10,9 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/defs.h" + +#if wxUSE_GUI + #include "wx/dc.h" #include @@ -30,17 +33,19 @@ #endif #include "wx/mac/uma.h" + // 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 -// windows manager, control manager, navigation services etc. are +// 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 sUMASystemInitialized = false ; + +static bool sUMAHasInittedAppearance = false; extern int gAGABackgroundColor ; bool UMAHasAppearance() { return sUMAHasAppearance ; } @@ -53,11 +58,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,34 +73,47 @@ 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 ; - + long theAppearance ; 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 ; @@ -109,14 +127,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) { sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ; } - + #if TARGET_CARBON // Call currently implicitely done : InitFloatingWindows() ; #else - if ( sUMAHasWindowManager ) - InitFloatingWindows() ; - else - InitWindows(); + if (!isEmbedded) + { + if ( sUMAHasWindowManager ) + InitFloatingWindows() ; + else + InitWindows(); + } #endif if ( NavServicesAvailable() ) @@ -130,7 +151,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) sUMAHasAquaLayout = true ; if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress ) - { + { FontFamilyID fontId ; Str255 fontName ; SInt16 fontSize ; @@ -140,14 +161,18 @@ 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 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 @@ -158,7 +183,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) } - sUMASystemInitialized = true ; + UMASetSystemIsInitialized(true); } @@ -171,12 +196,12 @@ Boolean CanUseATSUI() } */ // process manager -long UMAGetProcessMode() +long UMAGetProcessMode() { - OSErr err ; + OSErr err ; ProcessInfoRec processinfo; ProcessSerialNumber procno ; - + procno.highLongOfPSN = NULL ; procno.lowLongOfPSN = kCurrentProcess ; processinfo.processInfoLength = sizeof(ProcessInfoRec); @@ -188,20 +213,20 @@ long UMAGetProcessMode() return processinfo.processMode ; } -bool UMAGetProcessModeDoesActivateOnFGSwitch() +bool UMAGetProcessModeDoesActivateOnFGSwitch() { return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ; } // 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 +235,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 +247,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 ) ; @@ -240,7 +265,7 @@ UInt32 UMAMenuEvent( EventRecord *inEvent ) return MenuEvent( inEvent ) ; } -void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) +void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) { if ( enable ) EnableMenuItem( inMenu , inItem ) ; @@ -248,17 +273,17 @@ 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 ); + UMASetMenuItemText(menu, item , title , encoding); SetMenuItemHierarchicalID( menu , item , id ) ; } @@ -266,24 +291,24 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn { if ( !entry ) return ; - + UInt8 modifiers = 0 ; SInt16 key = entry->GetKeyCode() ; if ( key ) { bool explicitCommandKey = false ; - if ( entry->GetFlags() & wxACCEL_CTRL ) + if ( entry->GetFlags() & wxACCEL_CTRL ) { explicitCommandKey = true ; } - if (entry->GetFlags() & wxACCEL_ALT ) + if (entry->GetFlags() & wxACCEL_ALT ) { modifiers |= kMenuOptionModifier ; } - if (entry->GetFlags() & wxACCEL_SHIFT) + if (entry->GetFlags() & wxACCEL_SHIFT) { modifiers |= kMenuShiftModifier ; } @@ -292,68 +317,15 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn SInt16 macKey = key ; if ( key >= WXK_F1 && key <= WXK_F15 ) { - macKey = kFunctionKeyCharCode ; + // 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 ; glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; if ( key >= WXK_F13 ) glyph += 13 ; if ( !explicitCommandKey ) modifiers |= kMenuNoCommandModifier ; - - switch( key ) - { - case WXK_F1 : - macKey += ( 0x7a << 8 ) ; - break ; - case WXK_F2 : - macKey += ( 0x78 << 8 ) ; - break ; - case WXK_F3 : - macKey += ( 0x63 << 8 ) ; - break ; - case WXK_F4 : - macKey += ( 0x76 << 8 ) ; - break ; - case WXK_F5 : - macKey += ( 0x60 << 8 ) ; - break ; - case WXK_F6 : - macKey += ( 0x61 << 8 ) ; - break ; - case WXK_F7 : - macKey += ( 0x62 << 8 ) ; - break ; - case WXK_F8 : - macKey += ( 0x64 << 8 ) ; - break ; - case WXK_F9 : - macKey += ( 0x65 << 8 ) ; - break ; - case WXK_F10 : - macKey += ( 0x6D << 8 ) ; - break ; - case WXK_F11 : - macKey += ( 0x67 << 8 ) ; - break ; - case WXK_F12 : - macKey += ( 0x6F << 8 ) ; - break ; - case WXK_F13 : - macKey += ( 0x69 << 8 ) ; - break ; - case WXK_F14 : - macKey += ( 0x6B << 8 ) ; - break ; - case WXK_F15 : - macKey += ( 0x71 << 8 ) ; - break ; - default : - break ; - } ; - // unfortunately this does not yet trigger the right key , - // for some reason mac justs picks the first function key menu - // defined, so we turn this off - macKey = 0 ; - glyph = 0 ; } else { @@ -426,18 +398,18 @@ 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 ); + 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 , "\p" , item) ; - UMASetMenuItemText(menu, item , title ); - UMASetMenuItemShortcut( menu , item , entry ) ; + MacInsertMenuItem( menu , "\pA" , item) ; + UMASetMenuItemText(menu, item+1 , title , encoding ); + UMASetMenuItemShortcut( menu , item+1 , entry ) ; } // quickdraw @@ -481,7 +453,7 @@ pascal QDGlobalsPtr GetQDGlobalsPtr (void) #endif -void UMAShowWatchCursor() +void UMAShowWatchCursor() { OSErr err = noErr; @@ -497,14 +469,14 @@ void UMAShowWatchCursor() // SetQDGlobalsArrow (*watchFob); // InitCursor ( ); // SetQDGlobalsArrow (&preservedArrow); - SetCursor (*watchFob); + SetCursor (*watchFob); #else - SetCursor (*watchFob); + SetCursor (*watchFob); #endif } } -void UMAShowArrowCursor() +void UMAShowArrowCursor() { #if TARGET_CARBON Cursor arrow; @@ -516,26 +488,26 @@ void UMAShowArrowCursor() // window manager -GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) +GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) { wxASSERT( inWindowRef != NULL ) ; -#if TARGET_CARBON - return (GrafPtr) GetWindowPort( inWindowRef ) ; +#if TARGET_CARBON + return (GrafPtr) GetWindowPort( inWindowRef ) ; #else return (GrafPtr) inWindowRef ; #endif } -void UMADisposeWindow( WindowRef inWindowRef ) +void UMADisposeWindow( WindowRef inWindowRef ) { wxASSERT( inWindowRef != NULL ) ; 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 ) ; @@ -543,22 +515,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( ControlHandle inControl , const wxString& title , wxFontEncoding encoding) { #if TARGET_CARBON - SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ; + SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ; #else Str255 ptitle ; wxMacStringToPascal( title , ptitle ) ; @@ -566,7 +528,7 @@ void UMASetControlTitle( ControlHandle inControl , const wxString& title ) #endif } -void UMAActivateControl( ControlHandle inControl ) +void UMAActivateControl( ControlHandle inControl ) { // we have to add the control after again to the update rgn // otherwise updates get lost @@ -584,9 +546,10 @@ void UMAActivateControl( ControlHandle inControl ) } } -void UMADrawControl( ControlHandle inControl ) +void UMADrawControl( ControlHandle inControl ) { WindowRef theWindow = GetControlOwner(inControl) ; + wxMacPortStateHelper help( (GrafPtr) GetWindowPort(theWindow) ) ; RgnHandle updateRgn = NewRgn() ; GetWindowUpdateRgn( theWindow , updateRgn ) ; Point zero = { 0 , 0 } ; @@ -597,7 +560,7 @@ void UMADrawControl( ControlHandle inControl ) DisposeRgn( updateRgn ) ; } -void UMAMoveControl( ControlHandle inControl , short x , short y ) +void UMAMoveControl( ControlHandle inControl , short x , short y ) { bool visible = IsControlVisible( inControl ) ; if ( visible ) { @@ -613,14 +576,14 @@ void UMAMoveControl( ControlHandle inControl , short x , short y ) } } -void UMASizeControl( ControlHandle inControl , short x , short y ) +void UMASizeControl( ControlHandle inControl , short x , short y ) { 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 ) ; @@ -629,7 +592,7 @@ void UMASizeControl( ControlHandle inControl , short x , short y ) } } -void UMADeactivateControl( ControlHandle inControl ) +void UMADeactivateControl( ControlHandle inControl ) { // we have to add the control after again to the update rgn // otherwise updates get lost @@ -676,32 +639,33 @@ OSErr UMASetKeyboardFocus (WindowPtr inWindow, // events -void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) +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 ) +bool UMAIsWindowFloating( WindowRef inWindow ) { WindowClass cl ; - + GetWindowClass( inWindow , &cl ) ; return cl == kFloatingWindowClass ; } -bool UMAIsWindowModal( WindowRef inWindow ) +bool UMAIsWindowModal( WindowRef inWindow ) { WindowClass cl ; - + GetWindowClass( inWindow , &cl ) ; return cl < kFloatingWindowClass ; } @@ -726,12 +690,12 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) UMAActivateControl( control ) ; else UMADeactivateControl( control ) ; - } + } SetPort( port ) ; } } -OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) +OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) { return ::DrawThemePlacard( inRect , inState ) ; } @@ -763,7 +727,7 @@ OSStatus UMAGetHelpMenu( #endif } -wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport) +wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport) { m_clip = NULL ; Setup( newport ) ; @@ -778,13 +742,14 @@ 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 ); m_textFont = GetPortTextFont( (CGrafPtr) newport); m_textSize = GetPortTextSize( (CGrafPtr) newport); m_textStyle = GetPortTextFace( (CGrafPtr) newport); - m_textMode = GetPortTextMode( (CGrafPtr) newport); + m_textMode = GetPortTextMode( (CGrafPtr) newport); GetThemeDrawingState( &m_drawingState ) ; m_currentPort = newport ; } @@ -821,7 +786,7 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data ) err = PutScrap( size , type , data ) ; #else ScrapRef scrap; - err = GetCurrentScrap (&scrap); + err = GetCurrentScrap (&scrap); if ( !err ) { err = PutScrapFlavor (scrap, type , 0, size, data); @@ -830,3 +795,21 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data ) return err ; } +#endif // wxUSE_GUI + +#if wxUSE_BASE + +static bool sUMASystemInitialized = false ; + +bool UMASystemIsInitialized() +{ + return sUMASystemInitialized ; +} + +void UMASetSystemIsInitialized(bool val) +{ + sUMASystemInitialized = val; +} + + +#endif // wxUSE_BASE