X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55bd3f34b68f55f2cdccf29f40581b7683b9e524..224d978ffb483f93864f8bf9a5cd61b1425a7fd5:/src/msw/font.cpp?ds=inline diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 39f7d08a7e..499478eace 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: src/msw/font.cpp // Purpose: wxFont class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "font.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,28 +24,80 @@ #pragma hdrstop #endif +#include "wx/font.h" + #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/font.h" #include "wx/log.h" + #include "wx/encinfo.h" #endif // WX_PRECOMP +#include "wx/msw/private.h" + #include "wx/fontutil.h" +#include "wx/fontmap.h" + +#ifndef __WXWINCE__ + #include "wx/sysopt.h" +#endif + +#include "wx/scopeguard.h" #include "wx/tokenzr.h" -#include "wx/msw/private.h" +#if wxUSE_EXTENDED_RTTI + +wxBEGIN_ENUM( wxFontFamily ) + wxENUM_MEMBER( wxDEFAULT ) + wxENUM_MEMBER( wxDECORATIVE ) + wxENUM_MEMBER( wxROMAN ) + wxENUM_MEMBER( wxSCRIPT ) + wxENUM_MEMBER( wxSWISS ) + wxENUM_MEMBER( wxMODERN ) + wxENUM_MEMBER( wxTELETYPE ) +wxEND_ENUM( wxFontFamily ) + +wxBEGIN_ENUM( wxFontStyle ) + wxENUM_MEMBER( wxNORMAL ) + wxENUM_MEMBER( wxITALIC ) + wxENUM_MEMBER( wxSLANT ) +wxEND_ENUM( wxFontStyle ) + +wxBEGIN_ENUM( wxFontWeight ) + wxENUM_MEMBER( wxNORMAL ) + wxENUM_MEMBER( wxLIGHT ) + wxENUM_MEMBER( wxBOLD ) +wxEND_ENUM( wxFontWeight ) + +IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h") + +wxBEGIN_PROPERTIES_TABLE(wxFont) + wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Family, int , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily + wxPROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle + wxPROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight + wxPROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Face, wxString , SetFaceName, GetFaceName, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxEND_PROPERTIES_TABLE() + +wxCONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face ) + +wxBEGIN_HANDLERS_TABLE(wxFont) +wxEND_HANDLERS_TABLE() + +#else + IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) +#endif -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -// the default font size in points -static const int wxDEFAULT_FONT_SIZE = 12; +// the mask used to extract the pitch from LOGFONT::lfPitchAndFamily field +static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH; // ---------------------------------------------------------------------------- // wxFontRefData - the internal description of the font @@ -57,76 +105,269 @@ static const int wxDEFAULT_FONT_SIZE = 12; class WXDLLEXPORT wxFontRefData: public wxGDIRefData { -friend class WXDLLEXPORT wxFont; - public: + // constructors wxFontRefData() { - Init(wxDEFAULT_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, - "", wxFONTENCODING_DEFAULT); - } - - wxFontRefData(const wxFontRefData& data) - { - Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight, - data.m_underlined, data.m_faceName, data.m_encoding); - - m_fontId = data.m_fontId; + Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, false, wxEmptyString, + wxFONTENCODING_DEFAULT); } wxFontRefData(int size, - int family, - int style, - int weight, + const wxSize& pixelSize, + bool sizeUsingPixels, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, bool underlined, const wxString& faceName, wxFontEncoding encoding) { - Init(size, family, style, weight, underlined, faceName, encoding); + Init(size, pixelSize, sizeUsingPixels, family, style, weight, + underlined, faceName, encoding); } - wxFontRefData(const wxNativeFontInfo& info) + wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0) { - Init(info); + Init(info, hFont); + } + + wxFontRefData(const wxFontRefData& data) : wxGDIRefData() + { + Init(data.m_nativeFontInfo); } virtual ~wxFontRefData(); + // operations + bool Alloc(); + + void Free(); + + // all wxFont accessors + int GetPointSize() const + { + return m_nativeFontInfo.GetPointSize(); + } + + wxSize GetPixelSize() const + { + return m_nativeFontInfo.GetPixelSize(); + } + + bool IsUsingSizeInPixels() const + { + return m_sizeUsingPixels; + } + + wxFontFamily GetFamily() const + { + return m_nativeFontInfo.GetFamily(); + } + + wxFontStyle GetStyle() const + { + return m_nativeFontInfo.GetStyle(); + } + + wxFontWeight GetWeight() const + { + return m_nativeFontInfo.GetWeight(); + } + + bool GetUnderlined() const + { + return m_nativeFontInfo.GetUnderlined(); + } + + wxString GetFaceName() const + { + wxString facename = m_nativeFontInfo.GetFaceName(); + if ( facename.empty() ) + { + facename = GetMSWFaceName(); + if ( !facename.empty() ) + { + // cache the face name, it shouldn't change unless the family + // does and wxNativeFontInfo::SetFamily() resets the face name + const_cast(this)->SetFaceName(facename); + } + } + + return facename; + } + + wxFontEncoding GetEncoding() const + { + return m_nativeFontInfo.GetEncoding(); + } + + WXHFONT GetHFONT() const + { + AllocIfNeeded(); + + return (WXHFONT)m_hFont; + } + + bool HasHFONT() const + { + return m_hFont != 0; + } + + // ... and setters: notice that all of them invalidate the currently + // allocated HFONT, if any, so that the next call to GetHFONT() recreates a + // new one + void SetPointSize(int pointSize) + { + Free(); + + m_nativeFontInfo.SetPointSize(pointSize); + m_sizeUsingPixels = false; + } + + void SetPixelSize(const wxSize& pixelSize) + { + wxCHECK_RET( pixelSize.GetWidth() >= 0, "negative font width" ); + wxCHECK_RET( pixelSize.GetHeight() != 0, "zero font height" ); + + Free(); + + m_nativeFontInfo.SetPixelSize(pixelSize); + m_sizeUsingPixels = true; + } + + void SetFamily(wxFontFamily family) + { + Free(); + + m_nativeFontInfo.SetFamily(family); + } + + void SetStyle(wxFontStyle style) + { + Free(); + + m_nativeFontInfo.SetStyle(style); + } + + void SetWeight(wxFontWeight weight) + { + Free(); + + m_nativeFontInfo.SetWeight(weight); + } + + bool SetFaceName(const wxString& faceName) + { + Free(); + + return m_nativeFontInfo.SetFaceName(faceName); + } + + void SetUnderlined(bool underlined) + { + Free(); + + m_nativeFontInfo.SetUnderlined(underlined); + } + + void SetEncoding(wxFontEncoding encoding) + { + Free(); + + m_nativeFontInfo.SetEncoding(encoding); + } + + const wxNativeFontInfo& GetNativeFontInfo() const + { + // we need to create the font now to get the corresponding LOGFONT if + // it hadn't been done yet + AllocIfNeeded(); + + // ensure that we have a valid face name in our font information: + // GetFaceName() will try to retrieve it from our HFONT and save it if + // it was successful + (void)GetFaceName(); + + return m_nativeFontInfo; + } + + void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo) + { + Free(); + + m_nativeFontInfo = nativeFontInfo; + } + protected: // common part of all ctors void Init(int size, - int family, - int style, - int weight, + const wxSize& pixelSize, + bool sizeUsingPixels, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, bool underlined, const wxString& faceName, wxFontEncoding encoding); - void Init(const wxNativeFontInfo& info); + void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0); + + void AllocIfNeeded() const + { + if ( !m_hFont ) + const_cast(this)->Alloc(); + } + + // retrieve the face name really being used by the font: this is used to + // get the face name selected by the system when we don't specify it (but + // use just the family for example) + wxString GetMSWFaceName() const + { + ScreenHDC hdc; + SelectInHDC selectFont(hdc, m_hFont); + + UINT otmSize = GetOutlineTextMetrics(hdc, 0, NULL); + if ( !otmSize ) + { + wxLogLastError("GetOutlineTextMetrics(NULL)"); + return wxString(); + } - // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE - // DELETED by destructor - bool m_temporary; + OUTLINETEXTMETRIC * const + otm = static_cast(malloc(otmSize)); + wxON_BLOCK_EXIT1( free, otm ); - int m_fontId; + otm->otmSize = otmSize; + if ( !GetOutlineTextMetrics(hdc, otmSize, otm) ) + { + wxLogLastError("GetOutlineTextMetrics()"); + return wxString(); + } + + // in spite of its type, the otmpFamilyName field of OUTLINETEXTMETRIC + // gives an offset in _bytes_ of the face (not family!) name from the + // struct start while the name itself is an array of TCHARs + // + // FWIW otmpFaceName contains the same thing as otmpFamilyName followed + // by a possible " Italic" or " Bold" or something else suffix + return reinterpret_cast(otm) + + wxPtrToUInt(otm->otmpFamilyName)/sizeof(wxChar); + } - // font characterstics - int m_pointSize; - int m_family; - int m_style; - int m_weight; - bool m_underlined; - wxString m_faceName; - wxFontEncoding m_encoding; + // are we using m_nativeFontInfo.lf.lfHeight for point size or pixel size? + bool m_sizeUsingPixels; - // Windows font handle - WXHFONT m_hFont; + // Windows font handle, created on demand in GetHFONT() + HFONT m_hFont; // Native font info wxNativeFontInfo m_nativeFontInfo; - bool m_nativeFontInfoOk; }; +#define M_FONTDATA ((wxFontRefData*)m_refData) + // ============================================================================ // implementation // ============================================================================ @@ -136,210 +377,420 @@ protected: // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, - int family, - int style, - int weight, + const wxSize& pixelSize, + bool sizeUsingPixels, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, bool underlined, const wxString& faceName, wxFontEncoding encoding) { - m_style = style; - m_pointSize = pointSize; - m_family = family; - m_style = style; - m_weight = weight; - m_underlined = underlined; - m_faceName = faceName; - m_encoding = encoding; + m_hFont = NULL; + + m_sizeUsingPixels = sizeUsingPixels; + if ( m_sizeUsingPixels ) + SetPixelSize(pixelSize); + else + SetPointSize(pointSize); - m_fontId = 0; - m_temporary = FALSE; + SetStyle(style); + SetWeight(weight); + SetUnderlined(underlined); - m_hFont = 0; + // set the family/facename + SetFamily(family); + if ( !faceName.empty() ) + SetFaceName(faceName); - m_nativeFontInfoOk = FALSE; + // deal with encoding now (it may override the font family and facename + // so do it after setting them) + SetEncoding(encoding); } -void wxFontRefData::Init(const wxNativeFontInfo& info) +void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont) { - // extract family from pitch-and-family - int lfFamily = info.lf.lfPitchAndFamily; - if ( lfFamily & FIXED_PITCH ) - lfFamily -= FIXED_PITCH; - if ( lfFamily & VARIABLE_PITCH ) - lfFamily -= VARIABLE_PITCH; + // hFont may be zero, or it be passed in case we really want to + // use the exact font created in the underlying system + // (for example where we can't guarantee conversion from HFONT + // to LOGFONT back to HFONT) + m_hFont = (HFONT)hFont; + m_nativeFontInfo = info; + + // TODO: m_sizeUsingPixels? +} + +wxFontRefData::~wxFontRefData() +{ + Free(); +} + +bool wxFontRefData::Alloc() +{ + m_hFont = ::CreateFontIndirect(&m_nativeFontInfo.lf); + if ( !m_hFont ) + { + wxLogLastError(wxT("CreateFont")); + return false; + } + + return true; +} + +void wxFontRefData::Free() +{ + if ( m_hFont ) + { + if ( !::DeleteObject(m_hFont) ) + { + wxLogLastError(wxT("DeleteObject(font)")); + } + + m_hFont = 0; + } +} + +// ---------------------------------------------------------------------------- +// wxNativeFontInfo +// ---------------------------------------------------------------------------- + +void wxNativeFontInfo::Init() +{ + wxZeroMemory(lf); + + // we get better font quality if we use PROOF_QUALITY instead of + // DEFAULT_QUALITY but some fonts (e.g. "Terminal 6pt") are not available + // then so we allow to set a global option to choose between quality and + // wider font selection +#ifdef __WXWINCE__ + lf.lfQuality = CLEARTYPE_QUALITY; +#else + lf.lfQuality = wxSystemOptions::GetOptionInt("msw.font.no-proof-quality") + ? DEFAULT_QUALITY + : PROOF_QUALITY; +#endif +} - switch ( lfFamily ) +int wxNativeFontInfo::GetPointSize() const +{ + // FIXME: using the screen here results in incorrect font size calculation + // for printing! + const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); + + // BC++ 2007 doesn't provide abs(long) overload, hence the cast + return (int) (((72.0*abs((int)lf.lfHeight)) / (double) ppInch) + 0.5); +} + +wxSize wxNativeFontInfo::GetPixelSize() const +{ + wxSize ret; + ret.SetHeight(abs((int)lf.lfHeight)); + ret.SetWidth(lf.lfWidth); + return ret; +} + +wxFontStyle wxNativeFontInfo::GetStyle() const +{ + return lf.lfItalic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL; +} + +wxFontWeight wxNativeFontInfo::GetWeight() const +{ + if ( lf.lfWeight <= 300 ) + return wxFONTWEIGHT_LIGHT; + + if ( lf.lfWeight >= 600 ) + return wxFONTWEIGHT_BOLD; + + return wxFONTWEIGHT_NORMAL; +} + +bool wxNativeFontInfo::GetUnderlined() const +{ + return lf.lfUnderline != 0; +} + +wxString wxNativeFontInfo::GetFaceName() const +{ + return lf.lfFaceName; +} + +wxFontFamily wxNativeFontInfo::GetFamily() const +{ + wxFontFamily family; + + // extract family from pitch-and-family + switch ( lf.lfPitchAndFamily & ~PITCH_MASK ) { + case 0: + family = wxFONTFAMILY_UNKNOWN; + break; + case FF_ROMAN: - m_family = wxROMAN; + family = wxFONTFAMILY_ROMAN; break; case FF_SWISS: - m_family = wxSWISS; + family = wxFONTFAMILY_SWISS; break; case FF_SCRIPT: - m_family = wxSCRIPT; + family = wxFONTFAMILY_SCRIPT; break; case FF_MODERN: - m_family = wxMODERN; + family = wxFONTFAMILY_MODERN; break; case FF_DECORATIVE: - m_family = wxDECORATIVE; + family = wxFONTFAMILY_DECORATIVE; break; default: - m_family = wxSWISS; + wxFAIL_MSG( "unknown LOGFONT::lfFamily value" ); + family = wxFONTFAMILY_UNKNOWN; + // just to avoid a warning } - // weight and style - switch ( info.lf.lfWeight ) + return family; +} + +wxFontEncoding wxNativeFontInfo::GetEncoding() const +{ + return wxGetFontEncFromCharSet(lf.lfCharSet); +} + +void wxNativeFontInfo::SetPointSize(int pointsize) +{ + // FIXME: using the screen here results in incorrect font size calculation + // for printing! + const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); + + lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5); +} + +void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize) +{ + // MSW accepts both positive and negative heights here but they mean + // different things: positive specifies the cell height while negative + // specifies the character height. We used to just pass the value to MSW + // unchanged but changed the behaviour for positive values in 2.9.1 to + // match other ports and, more importantly, the expected behaviour. So now + // passing the negative height doesn't make sense at all any more but we + // still accept it for compatibility with the existing code which worked + // around the wrong interpretation of the height argument in older wxMSW + // versions by passing a negative value explicitly itself. + lf.lfHeight = -abs(pixelSize.GetHeight()); + lf.lfWidth = pixelSize.GetWidth(); +} + +void wxNativeFontInfo::SetStyle(wxFontStyle style) +{ + switch ( style ) { - case FW_LIGHT: - m_weight = wxLIGHT; + default: + wxFAIL_MSG( "unknown font style" ); + // fall through + + case wxFONTSTYLE_NORMAL: + lf.lfItalic = FALSE; + break; + + case wxFONTSTYLE_ITALIC: + case wxFONTSTYLE_SLANT: + lf.lfItalic = TRUE; break; + } +} +void wxNativeFontInfo::SetWeight(wxFontWeight weight) +{ + switch ( weight ) + { default: - case FW_NORMAL: - m_weight = wxNORMAL; + wxFAIL_MSG( "unknown font weight" ); + // fall through + + case wxFONTWEIGHT_NORMAL: + lf.lfWeight = FW_NORMAL; + break; + + case wxFONTWEIGHT_LIGHT: + lf.lfWeight = FW_LIGHT; break; - case FW_BOLD: - m_weight = wxBOLD; + case wxFONTWEIGHT_BOLD: + lf.lfWeight = FW_BOLD; break; } +} - m_style = info.lf.lfItalic ? wxITALIC : wxNORMAL; +void wxNativeFontInfo::SetUnderlined(bool underlined) +{ + lf.lfUnderline = underlined; +} - m_underlined = info.lf.lfUnderline != 0; +bool wxNativeFontInfo::SetFaceName(const wxString& facename) +{ + wxStrlcpy(lf.lfFaceName, facename.c_str(), WXSIZEOF(lf.lfFaceName)); + return true; +} - m_faceName = info.lf.lfFaceName; +void wxNativeFontInfo::SetFamily(wxFontFamily family) +{ + BYTE ff_family = FF_DONTCARE; - int height = abs(info.lf.lfHeight); + switch ( family ) + { + case wxFONTFAMILY_SCRIPT: + ff_family = FF_SCRIPT; + break; - // remember that 1pt = 1/72inch - const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); - m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5); + case wxFONTFAMILY_DECORATIVE: + ff_family = FF_DECORATIVE; + break; + + case wxFONTFAMILY_ROMAN: + ff_family = FF_ROMAN; + break; + + case wxFONTFAMILY_TELETYPE: + case wxFONTFAMILY_MODERN: + ff_family = FF_MODERN; + break; - m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet); + case wxFONTFAMILY_SWISS: + case wxFONTFAMILY_DEFAULT: + ff_family = FF_SWISS; + break; + } - m_fontId = 0; - m_temporary = FALSE; + wxCHECK_RET( ff_family != FF_DONTCARE, "unknown wxFontFamily" ); - m_hFont = 0; + lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family; - m_nativeFontInfoOk = TRUE; - m_nativeFontInfo = info; + // reset the facename so that CreateFontIndirect() will automatically choose a + // face name based only on the font family. + lf.lfFaceName[0] = '\0'; } -wxFontRefData::~wxFontRefData() +void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) { - if ( m_hFont ) + wxNativeEncodingInfo info; + if ( !wxGetNativeFontEncoding(encoding, &info) ) { - if ( !::DeleteObject((HFONT) m_hFont) ) +#if wxUSE_FONTMAP + if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) ) { - wxLogLastError(wxT("DeleteObject(font)")); + if ( !info.facename.empty() ) + { + // if we have this encoding only in some particular facename, use + // the facename - it is better to show the correct characters in a + // wrong facename than unreadable text in a correct one + SetFaceName(info.facename); + } + } + else +#endif // wxUSE_FONTMAP + { + // unsupported encoding, replace with the default + info.charset = DEFAULT_CHARSET; } } -} - -// ---------------------------------------------------------------------------- -// wxNativeFontInfo -// ---------------------------------------------------------------------------- + lf.lfCharSet = (BYTE)info.charset; +} bool wxNativeFontInfo::FromString(const wxString& s) { long l; - wxStringTokenizer tokenizer(s, _T(";")); + wxStringTokenizer tokenizer(s, wxS(";"), wxTOKEN_RET_EMPTY_ALL); + // first the version wxString token = tokenizer.GetNextToken(); - // - // Ignore the version for now - // + if ( token != wxS('0') ) + return false; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfHeight = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfWidth = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfEscapement = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfOrientation = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; + return false; lf.lfWeight = l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfItalic = l; + return false; + lf.lfItalic = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfUnderline = l; + return false; + lf.lfUnderline = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfStrikeOut = l; + return false; + lf.lfStrikeOut = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfCharSet = l; + return false; + lf.lfCharSet = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfOutPrecision = l; + return false; + lf.lfOutPrecision = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfClipPrecision = l; + return false; + lf.lfClipPrecision = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfQuality = l; + return false; + lf.lfQuality = (BYTE)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) - return FALSE; - lf.lfPitchAndFamily = l; + return false; + lf.lfPitchAndFamily = (BYTE)l; - token = tokenizer.GetNextToken(); - if(!token) - return FALSE; - wxStrcpy(lf.lfFaceName, token.c_str()); + if ( !tokenizer.HasMoreTokens() ) + return false; + + // the face name may be empty + SetFaceName(tokenizer.GetNextToken()); - return TRUE; + return true; } wxString wxNativeFontInfo::ToString() const { wxString s; - s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"), + s.Printf(wxS("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"), 0, // version, in case we want to change the format later lf.lfHeight, lf.lfWidth, @@ -363,140 +814,99 @@ wxString wxNativeFontInfo::ToString() const // wxFont // ---------------------------------------------------------------------------- -void wxFont::Init() +wxFont::wxFont(const wxString& fontdesc) { - if ( wxTheFontList ) - wxTheFontList->Append(this); + wxNativeFontInfo info; + if ( info.FromString(fontdesc) ) + (void)Create(info); } -bool wxFont::Create(const wxNativeFontInfo& info) +bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) { UnRef(); - m_refData = new wxFontRefData(info); - - RealizeResource(); + m_refData = new wxFontRefData(info, hFont); - return TRUE; + return RealizeResource(); } -wxFont::wxFont(const wxString& fontdesc) -{ - wxNativeFontInfo info; - if ( info.FromString(fontdesc) ) - (void)Create(info); -} - -/* Constructor for a font. Note that the real construction is done - * in wxDC::SetFont, when information is available about scaling etc. - */ -bool wxFont::Create(int pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString& faceName, - wxFontEncoding encoding) +bool wxFont::DoCreate(int pointSize, + const wxSize& pixelSize, + bool sizeUsingPixels, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined, + const wxString& faceName, + wxFontEncoding encoding) { UnRef(); // wxDEFAULT is a valid value for the font size too so we must treat it // specially here (otherwise the size would be 70 == wxDEFAULT value) if ( pointSize == wxDEFAULT ) - pointSize = wxDEFAULT_FONT_SIZE; + { + pointSize = wxNORMAL_FONT->GetPointSize(); + } - m_refData = new wxFontRefData(pointSize, family, style, weight, + m_refData = new wxFontRefData(pointSize, pixelSize, sizeUsingPixels, + family, style, weight, underlined, faceName, encoding); - RealizeResource(); - - return TRUE; + return RealizeResource(); } wxFont::~wxFont() { - if ( wxTheFontList ) - wxTheFontList->DeleteObject(this); } // ---------------------------------------------------------------------------- // real implementation // ---------------------------------------------------------------------------- -bool wxFont::RealizeResource() +wxGDIRefData *wxFont::CreateGDIRefData() const { - if ( GetResourceHandle() ) - { - // VZ: the old code returned FALSE in this case, but it doesn't seem - // to make sense because the font _was_ created - return TRUE; - } - - if(!M_FONTDATA->m_nativeFontInfoOk) - { - wxFillLogFont(&M_FONTDATA->m_nativeFontInfo.lf, this); - M_FONTDATA->m_nativeFontInfoOk = TRUE; - } - - M_FONTDATA->m_hFont = (WXHFONT)::CreateFontIndirect(&M_FONTDATA->m_nativeFontInfo.lf); - M_FONTDATA->m_faceName = M_FONTDATA->m_nativeFontInfo.lf.lfFaceName; - if ( !M_FONTDATA->m_hFont ) - { - wxLogLastError(wxT("CreateFont")); + return new wxFontRefData(); +} - return FALSE; - } +wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxFontRefData(*static_cast(data)); +} - return TRUE; +bool wxFont::RealizeResource() +{ + // NOTE: the GetHFONT() call automatically triggers a reallocation of + // the HFONT if necessary (will do nothing if we already have the resource); + // it returns NULL only if there is a failure in wxFontRefData::Alloc()... + return GetHFONT() != NULL; } -bool wxFont::FreeResource(bool force) +bool wxFont::FreeResource(bool WXUNUSED(force)) { - if ( GetResourceHandle() ) - { - if ( !::DeleteObject((HFONT) M_FONTDATA->m_hFont) ) - { - wxLogLastError(wxT("DeleteObject(font)")); - } + if ( !M_FONTDATA ) + return false; - M_FONTDATA->m_hFont = 0; + M_FONTDATA->Free(); - return TRUE; - } - return FALSE; + return true; } -WXHANDLE wxFont::GetResourceHandle() +WXHANDLE wxFont::GetResourceHandle() const { - return GetHFONT(); + return (WXHANDLE)GetHFONT(); } WXHFONT wxFont::GetHFONT() const { - if ( !M_FONTDATA ) - return 0; - else - return (WXHANDLE)M_FONTDATA->m_hFont; + // NOTE: wxFontRefData::GetHFONT() will automatically call + // wxFontRefData::Alloc() if necessary + return M_FONTDATA ? M_FONTDATA->GetHFONT() : 0; } bool wxFont::IsFree() const { - return (M_FONTDATA && (M_FONTDATA->m_hFont == 0)); -} - -void wxFont::Unshare() -{ - // Don't change shared data - if ( !m_refData ) - { - m_refData = new wxFontRefData(); - } - else - { - wxFontRefData* ref = new wxFontRefData(*M_FONTDATA); - UnRef(); - m_refData = ref; - } + return M_FONTDATA && !M_FONTDATA->HasHFONT(); } // ---------------------------------------------------------------------------- @@ -505,83 +915,76 @@ void wxFont::Unshare() void wxFont::SetPointSize(int pointSize) { - Unshare(); - - M_FONTDATA->m_pointSize = pointSize; - M_FONTDATA->m_nativeFontInfoOk = FALSE; + AllocExclusive(); - RealizeResource(); + M_FONTDATA->Free(); + M_FONTDATA->SetPointSize(pointSize); } -void wxFont::SetFamily(int family) +void wxFont::SetPixelSize(const wxSize& pixelSize) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_family = family; - M_FONTDATA->m_nativeFontInfoOk = FALSE; - - RealizeResource(); + M_FONTDATA->SetPixelSize(pixelSize); } -void wxFont::SetStyle(int style) +void wxFont::SetFamily(wxFontFamily family) { - Unshare(); - - M_FONTDATA->m_style = style; - M_FONTDATA->m_nativeFontInfoOk = FALSE; + AllocExclusive(); - RealizeResource(); + M_FONTDATA->SetFamily(family); } -void wxFont::SetWeight(int weight) +void wxFont::SetStyle(wxFontStyle style) { - Unshare(); - - M_FONTDATA->m_weight = weight; - M_FONTDATA->m_nativeFontInfoOk = FALSE; + AllocExclusive(); - RealizeResource(); + M_FONTDATA->SetStyle(style); } -void wxFont::SetFaceName(const wxString& faceName) +void wxFont::SetWeight(wxFontWeight weight) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_faceName = faceName; - M_FONTDATA->m_nativeFontInfoOk = FALSE; + M_FONTDATA->SetWeight(weight); +} - RealizeResource(); +bool wxFont::SetFaceName(const wxString& faceName) +{ + AllocExclusive(); + + if ( !M_FONTDATA->SetFaceName(faceName) ) + return false; + + // NB: using win32's GetObject() API on M_FONTDATA->GetHFONT() + // to retrieve a LOGFONT and then compare lf.lfFaceName + // with given facename is not reliable at all: + // Windows copies the facename given to ::CreateFontIndirect() + // without any validity check. + // Thus we use wxFontBase::SetFaceName to check if facename + // is valid... + return wxFontBase::SetFaceName(faceName); } void wxFont::SetUnderlined(bool underlined) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_underlined = underlined; - M_FONTDATA->m_nativeFontInfoOk = FALSE; - - RealizeResource(); + M_FONTDATA->SetUnderlined(underlined); } void wxFont::SetEncoding(wxFontEncoding encoding) { - Unshare(); - - M_FONTDATA->m_encoding = encoding; - M_FONTDATA->m_nativeFontInfoOk = FALSE; + AllocExclusive(); - RealizeResource(); + M_FONTDATA->SetEncoding(encoding); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) { - Unshare(); - - FreeResource(); - - M_FONTDATA->Init(info); + AllocExclusive(); - RealizeResource(); + M_FONTDATA->SetNativeFontInfo(info); } // ---------------------------------------------------------------------------- @@ -590,65 +993,80 @@ void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); - return M_FONTDATA->m_pointSize; + return M_FONTDATA->GetPointSize(); } -int wxFont::GetFamily() const +wxSize wxFont::GetPixelSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid font") ); - return M_FONTDATA->m_family; + return M_FONTDATA->GetPixelSize(); } -int wxFont::GetFontId() const +bool wxFont::IsUsingSizeInPixels() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); - return M_FONTDATA->m_fontId; + return M_FONTDATA->IsUsingSizeInPixels(); } -int wxFont::GetStyle() const +wxFontFamily wxFont::GetFamily() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") ); - return M_FONTDATA->m_style; + return M_FONTDATA->GetFamily(); } -int wxFont::GetWeight() const +wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); - return M_FONTDATA->m_weight; + return M_FONTDATA->GetStyle(); +} + +wxFontWeight wxFont::GetWeight() const +{ + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + + return M_FONTDATA->GetWeight(); } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - return M_FONTDATA->m_underlined; + return M_FONTDATA->GetUnderlined(); } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - return M_FONTDATA->m_faceName; + return M_FONTDATA->GetFaceName(); } wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); - return M_FONTDATA->m_encoding; + return M_FONTDATA->GetEncoding(); } -wxNativeFontInfo *wxFont::GetNativeFontInfo() const +const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - if( M_FONTDATA->m_nativeFontInfoOk ) - return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo); - - return 0; + return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL; } +bool wxFont::IsFixedWidth() const +{ + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); + + // the two low-order bits specify the pitch of the font, the rest is + // family + BYTE pitch = + (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK); + + return pitch == FIXED_PITCH; +}