X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6eaa4426e06c03017b47beaf4235d9f079edf5fe..f100b1c33ed3266515ae7c2cd4978ea9c9fceddc:/src/mac/carbon/font.cpp diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 517f232e70..0fcdd8ad72 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" @@ -39,10 +45,10 @@ 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) + , m_macFontFamily(0) , m_macFontSize(0) , m_macFontStyle(0) , m_macATSUStyle(0) @@ -62,7 +68,7 @@ public: , m_underlined(data.m_underlined) , m_faceName(data.m_faceName) , m_encoding(data.m_encoding) - , m_macFontNum(data.m_macFontNum) + , m_macFontFamily(data.m_macFontFamily) , m_macFontSize(data.m_macFontSize) , m_macFontStyle(data.m_macFontStyle) , m_macATSUStyle(0) @@ -87,7 +93,7 @@ public: , m_underlined(underlined) , m_faceName(faceName) , m_encoding(encoding) - , m_macFontNum(0) + , m_macFontFamily(0) , m_macFontSize(0) , m_macFontStyle(0) , m_macATSUStyle(0) @@ -104,7 +110,7 @@ public: bool GetNoAntiAliasing() const { return m_noAA; } - void MacFindFont() ; + void MacFindFont(); protected: // common part of all ctors @@ -128,9 +134,9 @@ protected: bool m_noAA; // No anti-aliasing public: - short m_macFontNum; - short m_macFontSize; - Style m_macFontStyle; + FMFontFamily m_macFontFamily; + FMFontSize m_macFontSize; + FMFontStyle m_macFontStyle; // ATSU Font Information @@ -140,7 +146,7 @@ public: // 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 @@ -149,6 +155,8 @@ public: wxNativeFontInfo m_info; }; +#define M_FONTDATA ((wxFontRefData*)m_refData) + // ============================================================================ // implementation @@ -175,7 +183,7 @@ void wxFontRefData::Init(int pointSize, m_faceName = faceName; m_encoding = encoding; - m_macFontNum = 0 ; + m_macFontFamily = 0 ; m_macFontSize = 0; m_macFontStyle = 0; m_macATSUFontID = 0; @@ -197,12 +205,15 @@ wxFontRefData::~wxFontRefData() void wxFontRefData::MacFindFont() { + OSStatus status ; + + Str255 qdFontName ; if ( m_macThemeFontID != kThemeCurrentPortFont ) { - Str255 fontName ; - - GetThemeFont( m_macThemeFontID, GetApplicationScript(), fontName, &m_macFontSize, &m_macFontStyle ); - m_faceName = wxMacMakeStringFromPascal( fontName ) ; + 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 @@ -211,56 +222,84 @@ void wxFontRefData::MacFindFont() m_style = wxITALIC ; if ( m_macFontStyle & underline ) m_underlined = true ; - ::GetFNum( fontName, &m_macFontNum ); m_pointSize = m_macFontSize ; +#ifndef __LP64__ + m_macFontFamily = FMGetFontFamilyFromName( qdFontName ); +#endif } else { - if ( m_faceName.Length() == 0 ) + if ( m_faceName.empty() ) { - switch ( m_family ) + if ( m_family == wxDEFAULT ) { - case wxDEFAULT : - m_macFontNum = ::GetAppFont(); - break ; - - case wxSCRIPT : - case wxROMAN : - case wxDECORATIVE : - ::GetFNum( "\pTimes", &m_macFontNum ); - break ; - - case wxSWISS : -#ifdef __WXMAC_OSX__ - ::GetFNum( "\pLucida Grande", &m_macFontNum ); -#else - ::GetFNum( "\pGeneva", &m_macFontNum ); +#ifndef __LP64__ + m_macFontFamily = GetAppFont(); + FMGetFontFamilyName(m_macFontFamily,qdFontName); + m_faceName = wxMacMakeStringFromPascal( qdFontName ); +#endif + } + 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 ; + } +#ifndef __LP64__ + 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(); + } #endif - break ; - - case wxMODERN : - ::GetFNum( "\pMonaco", &m_macFontNum ); - break ; - - default: - break ; } - - Str255 name ; - ::GetFontName( m_macFontNum , name ) ; - m_faceName = wxMacMakeStringFromPascal( name ) ; } else { +#ifndef __LP64__ if ( m_faceName == wxT("systemfont") ) - m_macFontNum = ::GetSysFont() ; + m_macFontFamily = GetSysFont(); else if ( m_faceName == wxT("applicationfont") ) - m_macFontNum = ::GetAppFont() ; + m_macFontFamily = GetAppFont(); else +#else + if ( m_faceName == wxT("systemfont") ) + m_faceName = wxT("Lucida Grande"); + else if ( m_faceName == wxT("applicationfont") ) + m_faceName = wxT("Lucida Grande"); +#endif { - Str255 fontname ; - wxMacStringToPascal( m_faceName , fontname ) ; - ::GetFNum( fontname, &m_macFontNum); + wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() ); + ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault ); + + // ATSFontFamilyRef is an unsigned type, so check against max + // for an invalid value, not -1. + if ( atsfamily == 0xffffffff ) + { + wxLogDebug( wxT("ATSFontFamilyFindFromName failed for ") + m_faceName ); + m_macFontFamily = GetAppFont(); + } + else + m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily ); } } @@ -276,41 +315,14 @@ 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 ; +#ifndef __LP64__ + status = FMGetFontFromFontFamilyInstance( m_macFontFamily , m_macFontStyle , &m_macATSUFontID , &intrinsicStyle); + wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") ); +#endif + m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle ); if ( m_macATSUStyle ) { @@ -318,35 +330,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 +378,13 @@ 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") ); } // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -void wxFont::Init() -{ -} - bool wxFont::Create(const wxNativeFontInfo& info) { return Create( @@ -429,7 +438,7 @@ wxFont::~wxFont() bool wxFont::RealizeResource() { - M_FONTDATA->MacFindFont() ; + M_FONTDATA->MacFindFont(); return true; } @@ -494,13 +503,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 +545,20 @@ 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); + return wxSize((int)width, (int)height); +#else + return wxFontBase::GetPixelSize(); +#endif +} + int wxFont::GetFamily() const { wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") ); @@ -587,7 +612,7 @@ 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 @@ -641,4 +666,3 @@ const wxNativeFontInfo * wxFont::GetNativeFontInfo() const return &(M_FONTDATA->m_info); } -