X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..ed8fad817a4c951b0a3c07b8a086a874dc435591:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 071d8b0bd9..cd97c822e5 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -29,18 +29,28 @@ #endif #ifndef WX_PRECOMP - #include #include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" #include "wx/font.h" + #include "wx/log.h" #endif // WX_PRECOMP +#include "wx/fontutil.h" +#include "wx/tokenzr.h" + #include "wx/msw/private.h" IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// the default font size in points +static const int wxDEFAULT_FONT_SIZE = 12; + // ---------------------------------------------------------------------------- // wxFontRefData - the internal description of the font // ---------------------------------------------------------------------------- @@ -52,7 +62,7 @@ friend class WXDLLEXPORT wxFont; public: wxFontRefData() { - Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, + Init(wxDEFAULT_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, "", wxFONTENCODING_DEFAULT); } @@ -75,6 +85,11 @@ public: Init(size, family, style, weight, underlined, faceName, encoding); } + wxFontRefData(const wxNativeFontInfo& info) + { + Init(info); + } + virtual ~wxFontRefData(); protected: @@ -87,6 +102,8 @@ protected: const wxString& faceName, wxFontEncoding encoding); + void Init(const wxNativeFontInfo& info); + // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE // DELETED by destructor bool m_temporary; @@ -104,6 +121,10 @@ protected: // Windows font handle WXHFONT m_hFont; + + // Native font info + wxNativeFontInfo m_nativeFontInfo; + bool m_nativeFontInfoOk; }; // ============================================================================ @@ -135,6 +156,83 @@ void wxFontRefData::Init(int pointSize, m_temporary = FALSE; m_hFont = 0; + + m_nativeFontInfoOk = FALSE; +} + +void wxFontRefData::Init(const wxNativeFontInfo& info) +{ + // 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; + + switch ( lfFamily ) + { + case FF_ROMAN: + m_family = wxROMAN; + break; + + case FF_SWISS: + m_family = wxSWISS; + break; + + case FF_SCRIPT: + m_family = wxSCRIPT; + break; + + case FF_MODERN: + m_family = wxMODERN; + break; + + case FF_DECORATIVE: + m_family = wxDECORATIVE; + break; + + default: + m_family = wxSWISS; + } + + // weight and style + switch ( info.lf.lfWeight ) + { + case FW_LIGHT: + m_weight = wxLIGHT; + break; + + default: + case FW_NORMAL: + m_weight = wxNORMAL; + break; + + case FW_BOLD: + m_weight = wxBOLD; + break; + } + + m_style = info.lf.lfItalic ? wxITALIC : wxNORMAL; + + m_underlined = info.lf.lfUnderline != 0; + + m_faceName = info.lf.lfFaceName; + + int height = abs(info.lf.lfHeight); + + // remember that 1pt = 1/72inch + const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); + m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5); + + m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet); + + m_fontId = 0; + m_temporary = FALSE; + + m_hFont = 0; + + m_nativeFontInfoOk = TRUE; + m_nativeFontInfo = info; } wxFontRefData::~wxFontRefData() @@ -148,6 +246,119 @@ wxFontRefData::~wxFontRefData() } } + +// ---------------------------------------------------------------------------- +// wxNativeFontInfo +// ---------------------------------------------------------------------------- + +bool wxNativeFontInfo::FromString(const wxString& s) +{ + long l; + + wxStringTokenizer tokenizer(s, _T(";")); + + wxString token = tokenizer.GetNextToken(); + // + // Ignore the version for now + // + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfHeight = l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfWidth = l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfEscapement = l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfOrientation = l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfWeight = l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfItalic = (BYTE)l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfUnderline = (BYTE)l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfStrikeOut = (BYTE)l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfCharSet = (BYTE)l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfOutPrecision = (BYTE)l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfClipPrecision = (BYTE)l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfQuality = (BYTE)l; + + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return FALSE; + lf.lfPitchAndFamily = (BYTE)l; + + token = tokenizer.GetNextToken(); + if(!token) + return FALSE; + wxStrcpy(lf.lfFaceName, token.c_str()); + + 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"), + 0, // version, in case we want to change the format later + lf.lfHeight, + lf.lfWidth, + lf.lfEscapement, + lf.lfOrientation, + lf.lfWeight, + lf.lfItalic, + lf.lfUnderline, + lf.lfStrikeOut, + lf.lfCharSet, + lf.lfOutPrecision, + lf.lfClipPrecision, + lf.lfQuality, + lf.lfPitchAndFamily, + lf.lfFaceName); + + return s; +} + // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- @@ -158,6 +369,24 @@ void wxFont::Init() wxTheFontList->Append(this); } +bool wxFont::Create(const wxNativeFontInfo& info) +{ + UnRef(); + + m_refData = new wxFontRefData(info); + + RealizeResource(); + + return TRUE; +} + +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. */ @@ -170,6 +399,12 @@ bool wxFont::Create(int pointSize, 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; + m_refData = new wxFontRefData(pointSize, family, style, weight, underlined, faceName, encoding); @@ -197,10 +432,14 @@ bool wxFont::RealizeResource() return TRUE; } - LOGFONT lf; - wxFillLogFont(&lf, this); - M_FONTDATA->m_hFont = (WXHFONT)::CreateFontIndirect(&lf); - M_FONTDATA->m_faceName = lf.lfFaceName; + 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")); @@ -211,7 +450,7 @@ bool wxFont::RealizeResource() return TRUE; } -bool wxFont::FreeResource(bool force) +bool wxFont::FreeResource(bool WXUNUSED(force)) { if ( GetResourceHandle() ) { @@ -269,6 +508,7 @@ void wxFont::SetPointSize(int pointSize) Unshare(); M_FONTDATA->m_pointSize = pointSize; + M_FONTDATA->m_nativeFontInfoOk = FALSE; RealizeResource(); } @@ -278,6 +518,7 @@ void wxFont::SetFamily(int family) Unshare(); M_FONTDATA->m_family = family; + M_FONTDATA->m_nativeFontInfoOk = FALSE; RealizeResource(); } @@ -287,6 +528,7 @@ void wxFont::SetStyle(int style) Unshare(); M_FONTDATA->m_style = style; + M_FONTDATA->m_nativeFontInfoOk = FALSE; RealizeResource(); } @@ -296,6 +538,7 @@ void wxFont::SetWeight(int weight) Unshare(); M_FONTDATA->m_weight = weight; + M_FONTDATA->m_nativeFontInfoOk = FALSE; RealizeResource(); } @@ -305,6 +548,7 @@ void wxFont::SetFaceName(const wxString& faceName) Unshare(); M_FONTDATA->m_faceName = faceName; + M_FONTDATA->m_nativeFontInfoOk = FALSE; RealizeResource(); } @@ -314,6 +558,7 @@ void wxFont::SetUnderlined(bool underlined) Unshare(); M_FONTDATA->m_underlined = underlined; + M_FONTDATA->m_nativeFontInfoOk = FALSE; RealizeResource(); } @@ -323,6 +568,18 @@ void wxFont::SetEncoding(wxFontEncoding encoding) Unshare(); M_FONTDATA->m_encoding = encoding; + M_FONTDATA->m_nativeFontInfoOk = FALSE; + + RealizeResource(); +} + +void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +{ + Unshare(); + + FreeResource(); + + M_FONTDATA->Init(info); RealizeResource(); } @@ -333,44 +590,65 @@ void wxFont::SetEncoding(wxFontEncoding encoding) int wxFont::GetPointSize() const { + wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + return M_FONTDATA->m_pointSize; } int wxFont::GetFamily() const { + wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + return M_FONTDATA->m_family; } int wxFont::GetFontId() const { + wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + return M_FONTDATA->m_fontId; } int wxFont::GetStyle() const { + wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + return M_FONTDATA->m_style; } int wxFont::GetWeight() const { + wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + return M_FONTDATA->m_weight; } bool wxFont::GetUnderlined() const { + wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); + return M_FONTDATA->m_underlined; } wxString wxFont::GetFaceName() const { - wxString str; - if ( M_FONTDATA ) - str = M_FONTDATA->m_faceName; - return str; + wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); + + return M_FONTDATA->m_faceName; } wxFontEncoding wxFont::GetEncoding() const { + wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + return M_FONTDATA->m_encoding; } +wxNativeFontInfo *wxFont::GetNativeFontInfo() const +{ + if( M_FONTDATA->m_nativeFontInfoOk ) + return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo); + + return 0; +} +