X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dabdbb43a4c47b53cd7f984a9e7aa1ba3646617..ab8d2b0278ebe76cc6721d51112fc7d866ff1400:/src/common/fontcmn.cpp diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 4176be9b54..938e9259fd 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -18,22 +18,24 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "fontbase.h" +#pragma implementation "fontbase.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop +#pragma hdrstop #endif #ifndef WX_PRECOMP - #include "wx/font.h" +#include "wx/font.h" +#include "wx/intl.h" #endif // WX_PRECOMP #include "wx/gdicmn.h" #include "wx/fontutil.h" // for wxNativeFontInfo +#include "wx/fontmap.h" #include "wx/tokenzr.h" @@ -47,6 +49,11 @@ wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM; +wxFontBase::~wxFontBase() +{ + // this destructor is required for Darwin +} + /* static */ wxFont *wxFontBase::New(int size, int family, @@ -77,16 +84,16 @@ wxFont *wxFontBase::New(const wxString& strNativeFontDesc) wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const { -#if !defined(__WXGTK__) && !defined(__WXMSW__) - wxNativeFontInfo *fontInfo = new wxNativeFontInfo; +#ifdef wxNO_NATIVE_FONTINFO + wxNativeFontInfo *fontInfo = new wxNativeFontInfo(); - fontInfo->pointSize = GetPointSize(); - fontInfo->family = GetFamily(); - fontInfo->style = GetStyle(); - fontInfo->weight = GetWeight(); - fontInfo->underlined = GetUnderlined(); - fontInfo->faceName = GetFaceName(); - fontInfo->encoding = GetEncoding(); + fontInfo->SetPointSize(GetPointSize()); + fontInfo->SetFamily((wxFontFamily)GetFamily()); + fontInfo->SetStyle((wxFontStyle)GetStyle()); + fontInfo->SetWeight((wxFontWeight)GetWeight()); + fontInfo->SetUnderlined(GetUnderlined()); + fontInfo->SetFaceName(GetFaceName()); + fontInfo->SetEncoding(GetEncoding()); return fontInfo; #else @@ -96,7 +103,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info) { -#if !defined(__WXGTK__) && !defined(__WXMSW__) +#ifdef wxNO_NATIVE_FONTINFO SetPointSize(info.pointSize); SetFamily(info.family); SetStyle(info.style); @@ -122,6 +129,37 @@ wxString wxFontBase::GetNativeFontInfoDesc() const return fontDesc; } +wxString wxFontBase::GetNativeFontInfoUserDesc() const +{ + wxString fontDesc; + wxNativeFontInfo *fontInfo = GetNativeFontInfo(); + if ( fontInfo ) + { + fontDesc = fontInfo->ToUserString(); + delete fontInfo; + } + + return fontDesc; +} + +void wxFontBase::SetNativeFontInfo(const wxString& info) +{ + wxNativeFontInfo fontInfo; + if ( !info.empty() && fontInfo.FromString(info) ) + { + SetNativeFontInfo(fontInfo); + } +} + +void wxFontBase::SetNativeFontInfoUserDesc(const wxString& info) +{ + wxNativeFontInfo fontInfo; + if ( !info.empty() && fontInfo.FromUserString(info) ) + { + SetNativeFontInfo(fontInfo); + } +} + wxFont& wxFont::operator=(const wxFont& font) { if ( this != &font ) @@ -140,6 +178,7 @@ bool wxFontBase::operator==(const wxFont& font) const GetPointSize() == font.GetPointSize() && GetFamily() == font.GetFamily() && GetStyle() == font.GetStyle() && + GetWeight() == font.GetWeight() && GetUnderlined() == font.GetUnderlined() && GetFaceName() == font.GetFaceName() && GetEncoding() == font.GetEncoding() @@ -193,12 +232,12 @@ wxString wxFontBase::GetWeightString() const } } -#if !defined(__WXGTK__) && !defined(__WXMSW__) - // ---------------------------------------------------------------------------- // wxNativeFontInfo // ---------------------------------------------------------------------------- +#ifdef wxNO_NATIVE_FONTINFO + // These are the generic forms of FromString()/ToString. // // convert to/from the string representation: format is @@ -223,17 +262,17 @@ bool wxNativeFontInfo::FromString(const wxString& s) token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) return FALSE; - family = (int)l; + family = (wxFontFamily)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) return FALSE; - style = (int)l; + style = (wxFontStyle)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) return FALSE; - weight = (int)l; + weight = (wxFontWeight)l; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) @@ -260,8 +299,8 @@ wxString wxNativeFontInfo::ToString() const 0, // version pointSize, family, - style, - weight, + (int)style, + (int)weight, underlined, faceName.GetData(), (int)encoding); @@ -269,5 +308,247 @@ wxString wxNativeFontInfo::ToString() const return s; } +void wxNativeFontInfo::Init() +{ + pointSize = wxNORMAL_FONT->GetPointSize(); + family = wxFONTFAMILY_DEFAULT; + style = wxFONTSTYLE_NORMAL; + weight = wxFONTWEIGHT_NORMAL; + underlined = FALSE; + faceName.clear(); + encoding = wxFONTENCODING_DEFAULT; +} + +int wxNativeFontInfo::GetPointSize() const +{ + return pointSize; +} + +wxFontStyle wxNativeFontInfo::GetStyle() const +{ + return style; +} + +wxFontWeight wxNativeFontInfo::GetWeight() const +{ + return weight; +} + +bool wxNativeFontInfo::GetUnderlined() const +{ + return underlined; +} + +wxString wxNativeFontInfo::GetFaceName() const +{ + return faceName; +} + +wxFontFamily wxNativeFontInfo::GetFamily() const +{ + return family; +} + +wxFontEncoding wxNativeFontInfo::GetEncoding() const +{ + return encoding; +} + +void wxNativeFontInfo::SetPointSize(int pointsize) +{ + pointSize = pointsize; +} + +void wxNativeFontInfo::SetStyle(wxFontStyle style_) +{ + style = style_; +} + +void wxNativeFontInfo::SetWeight(wxFontWeight weight_) +{ + weight = weight_; +} + +void wxNativeFontInfo::SetUnderlined(bool underlined_) +{ + underlined = underlined_; +} + +void wxNativeFontInfo::SetFaceName(wxString facename_) +{ + faceName = facename_; +} + +void wxNativeFontInfo::SetFamily(wxFontFamily family_) +{ + family = family_; +} + +void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_) +{ + encoding = encoding_; +} + #endif // generic wxNativeFontInfo implementation +// conversion to/from user-readable string: this is used in the generic +// versions and under MSW as well because there is no standard font description +// format there anyhow (but there is a well-defined standard for X11 fonts used +// by wxGTK and wxMotif) + +#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) + +wxString wxNativeFontInfo::ToUserString() const +{ + wxString desc; + + // first put the adjectives, if any - this is English-centric, of course, + // but what else can we do? + if ( GetUnderlined() ) + { + desc << _("underlined "); + } + + switch ( GetWeight() ) + { + default: + wxFAIL_MSG( _T("unknown font weight") ); + // fall through + + case wxFONTWEIGHT_NORMAL: + break; + + case wxFONTWEIGHT_LIGHT: + desc << _("light "); + break; + + case wxFONTWEIGHT_BOLD: + desc << _("bold "); + break; + } + + switch ( GetStyle() ) + { + default: + wxFAIL_MSG( _T("unknown font style") ); + // fall through + + case wxFONTSTYLE_NORMAL: + break; + + // we don't distinguish between the two for now anyhow... + case wxFONTSTYLE_ITALIC: + case wxFONTSTYLE_SLANT: + desc << _("italic"); + break; + } + + wxString face = GetFaceName(); + if ( !face.empty() ) + { + desc << _T(' ') << face; + } + + int size = GetPointSize(); + if ( size != wxNORMAL_FONT->GetPointSize() ) + { + desc << _T(' ') << size; + } + +#if wxUSE_FONTMAP + wxFontEncoding enc = GetEncoding(); + if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM ) + { + desc << _T(' ') << wxTheFontMapper->GetEncodingName(enc); + } +#endif // wxUSE_FONTMAP + + return desc; +} + +bool wxNativeFontInfo::FromUserString(const wxString& s) +{ + // reset to the default state + Init(); + + // parse a more or less free form string + // + // TODO: we should handle at least the quoted facenames + wxStringTokenizer tokenizer(s, _T(";, "), wxTOKEN_STRTOK); + + wxString face; + unsigned long size; + +#if wxUSE_FONTMAP + wxFontEncoding encoding; +#endif // wxUSE_FONTMAP + + while ( tokenizer.HasMoreTokens() ) + { + wxString token = tokenizer.GetNextToken(); + + // normalize it + token.Trim(TRUE).Trim(FALSE).MakeLower(); + + // look for the known tokens + if ( token == _T("underlined") || token == _("underlined") ) + { + SetUnderlined(TRUE); + } + else if ( token == _T("light") || token == _("light") ) + { + SetWeight(wxFONTWEIGHT_LIGHT); + } + else if ( token == _T("bold") || token == _("bold") ) + { + SetWeight(wxFONTWEIGHT_BOLD); + } + else if ( token == _T("italic") || token == _("italic") ) + { + SetStyle(wxFONTSTYLE_ITALIC); + } + else if ( token.ToULong(&size) ) + { + SetPointSize(size); + } +#if wxUSE_FONTMAP + else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE)) + != wxFONTENCODING_DEFAULT ) + { + SetEncoding(encoding); + } +#endif // wxUSE_FONTMAP + else // assume it is the face name + { + if ( !face.empty() ) + { + face += _T(' '); + } + + face += token; + + // skip the code which resets face below + continue; + } + + // if we had had the facename, we shouldn't continue appending tokens + // to it (i.e. "foo bold bar" shouldn't result in the facename "foo + // bar") + if ( !face.empty() ) + { + SetFaceName(face); + face.clear(); + } + } + + // we might not have flushed it inside the loop + if ( !face.empty() ) + { + SetFaceName(face); + } + + return TRUE; +} + +#endif // generic or wxMSW +