X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6eaa4426e06c03017b47beaf4235d9f079edf5fe..850df2d78866c3edcf848103b5dbc7e7fa1ee5fa:/src/mac/carbon/font.cpp diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 517f232e70..9e0fe30b92 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: src/mac/carbon/font.cpp // Purpose: wxFont class // Author: Stefan Csomor // Modified by: @@ -11,12 +11,18 @@ #include "wx/wxprec.h" -#include "wx/string.h" #include "wx/font.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/intl.h" + #include "wx/gdicmn.h" + #include "wx/log.h" +#endif + #include "wx/fontutil.h" -#include "wx/gdicmn.h" -#include "wx/utils.h" -#include "wx/fontutil.h" +#include "wx/graphics.h" #include "wx/mac/private.h" @@ -30,7 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) class WXDLLEXPORT wxFontRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxFont; + friend class wxFont; public: wxFontRefData() @@ -39,14 +45,17 @@ public: , m_family(wxDEFAULT) , m_style(wxNORMAL) , m_weight(wxNORMAL) - , m_underlined(FALSE) + , m_underlined(false) , m_faceName(wxT("applicationfont")) , m_encoding(wxFONTENCODING_DEFAULT) - , m_macFontNum(0) +#ifdef __LP64__ +#else + , m_macFontFamily(0) , m_macFontSize(0) , m_macFontStyle(0) - , m_macATSUStyle(0) , m_macATSUFontID(0) +#endif + , m_macATSUStyle(0) { Init(m_pointSize, m_family, m_style, m_weight, m_underlined, m_faceName, m_encoding); @@ -62,11 +71,14 @@ public: , m_underlined(data.m_underlined) , m_faceName(data.m_faceName) , m_encoding(data.m_encoding) - , m_macFontNum(data.m_macFontNum) +#ifdef __LP64__ +#else + , m_macFontFamily(data.m_macFontFamily) , m_macFontSize(data.m_macFontSize) , m_macFontStyle(data.m_macFontStyle) - , m_macATSUStyle(0) , m_macATSUFontID(data.m_macATSUFontID) +#endif + , m_macATSUStyle(0) { Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight, data.m_underlined, data.m_faceName, data.m_encoding); @@ -87,11 +99,14 @@ public: , m_underlined(underlined) , m_faceName(faceName) , m_encoding(encoding) - , m_macFontNum(0) +#ifdef __LP64__ +#else + , m_macFontFamily(0) , m_macFontSize(0) , m_macFontStyle(0) - , m_macATSUStyle(0) , m_macATSUFontID(0) +#endif + , m_macATSUStyle(0) { Init(size, family, style, weight, underlined, faceName, encoding); } @@ -104,7 +119,7 @@ public: bool GetNoAntiAliasing() const { return m_noAA; } - void MacFindFont() ; + void MacFindFont(); protected: // common part of all ctors @@ -128,9 +143,10 @@ protected: bool m_noAA; // No anti-aliasing public: - short m_macFontNum; - short m_macFontSize; - Style m_macFontStyle; +#ifndef __LP64__ + FMFontFamily m_macFontFamily; + FMFontSize m_macFontSize; + FMFontStyle m_macFontStyle; // ATSU Font Information @@ -138,17 +154,22 @@ public: // contain some styles (special bold fonts etc) and // these are the additional qd styles that are not // included in the ATSU font id - ATSUStyle m_macATSUStyle ; ATSUFontID m_macATSUFontID; - Style m_macATSUAdditionalQDStyles ; + FMFontStyle m_macATSUAdditionalQDStyles ; // for true themeing support we must store the correct font // information here, as this speeds up and optimizes rendering ThemeFontID m_macThemeFontID ; - +#else + CTFontRef m_macFontRef; + CTFontUIFontType m_macUIFontType; +#endif + ATSUStyle m_macATSUStyle ; wxNativeFontInfo m_info; }; +#define M_FONTDATA ((wxFontRefData*)m_refData) + // ============================================================================ // implementation @@ -174,15 +195,19 @@ void wxFontRefData::Init(int pointSize, m_underlined = underlined; m_faceName = faceName; m_encoding = encoding; - - m_macFontNum = 0 ; +#ifdef __LP64__ + m_macUIFontType = kCTFontNoFontType; + m_macFontRef = 0; +#else + m_macFontFamily = 0 ; m_macFontSize = 0; m_macFontStyle = 0; m_macATSUFontID = 0; m_macATSUAdditionalQDStyles = 0 ; - m_macATSUStyle = NULL ; m_macThemeFontID = kThemeCurrentPortFont ; +#endif + m_macATSUStyle = NULL ; m_noAA = false; } @@ -197,70 +222,192 @@ wxFontRefData::~wxFontRefData() void wxFontRefData::MacFindFont() { - if ( m_macThemeFontID != kThemeCurrentPortFont ) - { - Str255 fontName ; + OSStatus status = noErr; + Str255 qdFontName ; - GetThemeFont( m_macThemeFontID, GetApplicationScript(), fontName, &m_macFontSize, &m_macFontStyle ); - m_faceName = wxMacMakeStringFromPascal( fontName ) ; - if ( m_macFontStyle & bold ) - m_weight = wxBOLD ; - else - m_weight = wxNORMAL ; - if ( m_macFontStyle & italic ) - m_style = wxITALIC ; - if ( m_macFontStyle & underline ) - m_underlined = true ; - ::GetFNum( fontName, &m_macFontNum ); - m_pointSize = m_macFontSize ; +#ifdef __LP64__ + if ( m_faceName.empty() && m_family == wxDEFAULT ) + { + m_macUIFontType = kCTFontSystemFontType; + } + + if ( m_macUIFontType != kCTFontNoFontType ) + { + m_macFontRef = CTFontCreateUIFontForLanguage( m_macUIFontType, 0.0, NULL ); + wxMacCFStringHolder name( CTFontCopyFamilyName( m_macFontRef ) ); + m_faceName = name.AsString(); } else { - if ( m_faceName.Length() == 0 ) + if ( m_faceName.empty() ) { switch ( m_family ) { - case wxDEFAULT : - m_macFontNum = ::GetAppFont(); - break ; - case wxSCRIPT : case wxROMAN : case wxDECORATIVE : - ::GetFNum( "\pTimes", &m_macFontNum ); + m_faceName = wxT("Times"); break ; case wxSWISS : -#ifdef __WXMAC_OSX__ - ::GetFNum( "\pLucida Grande", &m_macFontNum ); -#else - ::GetFNum( "\pGeneva", &m_macFontNum ); -#endif + m_faceName = wxT("Lucida Grande"); break ; case wxMODERN : - ::GetFNum( "\pMonaco", &m_macFontNum ); + case wxTELETYPE: + m_faceName = wxT("Monaco"); break ; default: + m_faceName = wxT("Times"); break ; } + } + + wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() ); + m_macFontRef = CTFontCreateWithName( cf, m_pointSize, NULL); + } + + if ( m_macATSUStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle); + m_macATSUStyle = NULL ; + } - Str255 name ; - ::GetFontName( m_macFontNum , name ) ; - m_faceName = wxMacMakeStringFromPascal( name ) ; + status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle); + wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ); + + ATSUAttributeTag atsuTags[] = + { + kATSUSizeTag , + kATSUVerticalCharacterTag, + kATSUQDBoldfaceTag , + kATSUQDItalicTag , + kATSUQDUnderlineTag , + kATSUQDCondensedTag , + kATSUQDExtendedTag , + kATSUFontTag , + }; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + sizeof( Fixed ) , + sizeof( ATSUVerticalCharacterType), + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( ATSUFontID ) , + }; + + Boolean kTrue = true ; + Boolean kFalse = false ; + + Fixed atsuSize = IntToFixed( m_pointSize ); + short m_macATSUAdditionalQDStyles = 0; + ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; + ATSUFontID atsuFontID = 0; + int attributeCount = sizeof(atsuTags) / sizeof(ATSUAttributeTag) ; + + // attempt to add atsu font + status = ATSUFindFontFromName(m_faceName.c_str(), strlen(m_faceName.c_str()), kFontFamilyName, kFontNoPlatform, kFontNoScript, kFontNoLanguage, &atsuFontID); + if ( status != noErr ) + { + attributeCount--; + } + + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + &atsuSize , + &kHorizontal, + (m_macATSUAdditionalQDStyles & bold) ? &kTrue : &kFalse , + (m_macATSUAdditionalQDStyles & italic) ? &kTrue : &kFalse , + (m_macATSUAdditionalQDStyles & underline) ? &kTrue : &kFalse , + (m_macATSUAdditionalQDStyles & condense) ? &kTrue : &kFalse , + (m_macATSUAdditionalQDStyles & extend) ? &kTrue : &kFalse , + &atsuFontID , + }; + + status = ::ATSUSetAttributes( (ATSUStyle)m_macATSUStyle, attributeCount, atsuTags, atsuSizes, atsuValues); + + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ); +#else + if ( m_macThemeFontID != kThemeCurrentPortFont ) + { + Style style ; + GetThemeFont( m_macThemeFontID, GetApplicationScript(), qdFontName, &m_macFontSize, &style ); + m_macFontStyle = style ; + m_faceName = wxMacMakeStringFromPascal( qdFontName ); + if ( m_macFontStyle & bold ) + m_weight = wxBOLD ; + else + m_weight = wxNORMAL ; + if ( m_macFontStyle & italic ) + m_style = wxITALIC ; + if ( m_macFontStyle & underline ) + m_underlined = true ; + m_pointSize = m_macFontSize ; + m_macFontFamily = FMGetFontFamilyFromName( qdFontName ); + } + else + { + if ( m_faceName.empty() ) + { + if ( m_family == wxDEFAULT ) + { + m_macFontFamily = GetAppFont(); + FMGetFontFamilyName(m_macFontFamily,qdFontName); + m_faceName = wxMacMakeStringFromPascal( qdFontName ); + } + else + { + switch ( m_family ) + { + case wxSCRIPT : + case wxROMAN : + case wxDECORATIVE : + m_faceName = wxT("Times"); + break ; + + case wxSWISS : + m_faceName = wxT("Lucida Grande"); + break ; + + case wxMODERN : + case wxTELETYPE: + m_faceName = wxT("Monaco"); + break ; + + default: + m_faceName = wxT("Times"); + break ; + } + wxMacStringToPascal( m_faceName , qdFontName ); + m_macFontFamily = FMGetFontFamilyFromName( qdFontName ); + if ( m_macFontFamily == kInvalidFontFamily ) + { + wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName.c_str() ); + m_macFontFamily = GetAppFont(); + } + } } else { if ( m_faceName == wxT("systemfont") ) - m_macFontNum = ::GetSysFont() ; + m_macFontFamily = GetSysFont(); else if ( m_faceName == wxT("applicationfont") ) - m_macFontNum = ::GetAppFont() ; + m_macFontFamily = GetAppFont(); else { - Str255 fontname ; - wxMacStringToPascal( m_faceName , fontname ) ; - ::GetFNum( fontname, &m_macFontNum); + wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() ); + ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault ); + if ( atsfamily == (ATSFontFamilyRef) -1 ) + { + wxLogDebug( wxT("ATSFontFamilyFindFromName failed for ") + m_faceName ); + m_macFontFamily = GetAppFont(); + } + else + m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily ); } } @@ -276,41 +423,12 @@ void wxFontRefData::MacFindFont() // we try to get as much styles as possible into ATSU - Fixed atsuSize = IntToFixed( m_macFontSize ) ; - Style atsuStyle = normal ; - verify_noerr(::ATSUFONDtoFontID(m_macFontNum, atsuStyle , (UInt32*)&m_macATSUFontID) ); - if ( m_macFontStyle & bold ) - { - ATSUFontID test ; - if ( ::ATSUFONDtoFontID(m_macFontNum, atsuStyle | bold , &test) == noErr ) - { - atsuStyle |= bold ; - m_macATSUFontID = test ; - } - } - - if ( m_macFontStyle & italic ) - { - ATSUFontID test ; - if ( ::ATSUFONDtoFontID(m_macFontNum, atsuStyle | italic , &test) == noErr ) - { - atsuStyle |= italic ; - m_macATSUFontID = test ; - } - } - - if ( m_macFontStyle & underline ) - { - ATSUFontID test ; - if ( ::ATSUFONDtoFontID(m_macFontNum, atsuStyle | underline , &test) == noErr ) - { - atsuStyle |= underline ; - m_macATSUFontID = test ; - } - } - - m_macATSUAdditionalQDStyles = m_macFontStyle & (~atsuStyle ) ; + // ATSUFontID and FMFont are equivalent + FMFontStyle intrinsicStyle = 0 ; + status = FMGetFontFromFontFamilyInstance( m_macFontFamily , m_macFontStyle , &m_macATSUFontID , &intrinsicStyle); + wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") ); + m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle ); if ( m_macATSUStyle ) { @@ -318,35 +436,36 @@ void wxFontRefData::MacFindFont() m_macATSUStyle = NULL ; } - OSStatus status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle) ; - wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ; + status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle); + wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ); ATSUAttributeTag atsuTags[] = { - kATSUFontTag , - kATSUSizeTag , - kATSUVerticalCharacterTag, - kATSUQDBoldfaceTag , - kATSUQDItalicTag , - kATSUQDUnderlineTag , - kATSUQDCondensedTag , - kATSUQDExtendedTag , + kATSUFontTag , + kATSUSizeTag , + kATSUVerticalCharacterTag, + kATSUQDBoldfaceTag , + kATSUQDItalicTag , + kATSUQDUnderlineTag , + kATSUQDCondensedTag , + kATSUQDExtendedTag , }; ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { - sizeof( ATSUFontID ) , - sizeof( Fixed ) , - sizeof( ATSUVerticalCharacterType), - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , + sizeof( ATSUFontID ) , + sizeof( Fixed ) , + sizeof( ATSUVerticalCharacterType), + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , + sizeof( Boolean ) , }; Boolean kTrue = true ; Boolean kFalse = false ; + Fixed atsuSize = IntToFixed( m_macFontSize ); ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { @@ -365,17 +484,14 @@ void wxFontRefData::MacFindFont() sizeof(atsuTags) / sizeof(ATSUAttributeTag) , atsuTags, atsuSizes, atsuValues); - wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ); +#endif } // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -void wxFont::Init() -{ -} - bool wxFont::Create(const wxNativeFontInfo& info) { return Create( @@ -409,8 +525,29 @@ bool wxFont::Create(int pointSize, return true; } +#ifdef __LP64__ + +bool wxFont::MacCreateUIFont(wxUint32 ctFontType ) +{ + UnRef(); + + m_refData = new wxFontRefData( + 12, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, + false, wxEmptyString, wxFONTENCODING_DEFAULT ); + + M_FONTDATA->m_macUIFontType = ctFontType ; + RealizeResource(); + + return true; +} + +#endif + bool wxFont::MacCreateThemeFont(wxUint16 themeFontID) { +#ifdef __LP64__ + return MacCreateUIFont(HIThemeGetUIFontType(themeFontID)); +#else UnRef(); m_refData = new wxFontRefData( @@ -421,6 +558,7 @@ bool wxFont::MacCreateThemeFont(wxUint16 themeFontID) RealizeResource(); return true; +#endif } wxFont::~wxFont() @@ -429,7 +567,7 @@ wxFont::~wxFont() bool wxFont::RealizeResource() { - M_FONTDATA->MacFindFont() ; + M_FONTDATA->MacFindFont(); return true; } @@ -494,13 +632,15 @@ void wxFont::SetWeight(int weight) RealizeResource(); } -void wxFont::SetFaceName(const wxString& faceName) +bool wxFont::SetFaceName(const wxString& faceName) { Unshare(); M_FONTDATA->m_faceName = faceName; RealizeResource(); + + return wxFontBase::SetFaceName(faceName); } void wxFont::SetUnderlined(bool underlined) @@ -534,6 +674,21 @@ int wxFont::GetPointSize() const return M_FONTDATA->m_pointSize; } +wxSize wxFont::GetPixelSize() const +{ +#if wxUSE_GRAPHICS_CONTEXT + // TODO: consider caching the value + wxGraphicsContext* dc = wxGraphicsContext::CreateFromNative((CGContextRef) NULL); + dc->SetFont(*(wxFont *)this,*wxBLACK); + wxDouble width, height = 0; + dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL); + delete dc; + return wxSize((int)width, (int)height); +#else + return wxFontBase::GetPixelSize(); +#endif +} + int wxFont::GetFamily() const { wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") ); @@ -583,11 +738,13 @@ bool wxFont::GetNoAntiAliasing() const return M_FONTDATA->m_noAA; } +#ifndef __LP64__ + short wxFont::MacGetFontNum() const { wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") ); - return M_FONTDATA->m_macFontNum; + return M_FONTDATA->m_macFontFamily; } short wxFont::MacGetFontSize() const @@ -631,6 +788,23 @@ wxUint16 wxFont::MacGetThemeFontID() const return M_FONTDATA->m_macThemeFontID; } +#else +const void * wxFont::MacGetCTFont() const +{ + wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") ); + + return M_FONTDATA->m_macFontRef; +} + +// to be removed +void * wxFont::MacGetATSUStyle() const +{ + wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") ); + + return M_FONTDATA->m_macATSUStyle; +} + +#endif const wxNativeFontInfo * wxFont::GetNativeFontInfo() const { @@ -641,4 +815,3 @@ const wxNativeFontInfo * wxFont::GetNativeFontInfo() const return &(M_FONTDATA->m_info); } -