X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53f6aab75294c585e53e02b618a09dcb1dd97fb8..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/gtk/font.cpp?ds=sidebyside diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 940b38d81a..1fd76d1df0 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: gtk/font.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -30,9 +30,26 @@ #include -#include +#include "wx/gtk/private.h" #include -#include + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// the default size (in points) for the fonts +static const int wxDEFAULT_FONT_SIZE = 12; + +// ---------------------------------------------------------------------------- +// wxScaledFontList +// ---------------------------------------------------------------------------- + +// TODO: replace this with a type safe list or hash!! +class wxScaledFontList : public wxList +{ +public: + wxScaledFontList() : wxList(wxKEY_INTEGER) { } +}; // ---------------------------------------------------------------------------- // wxFontRefData @@ -41,16 +58,59 @@ class wxFontRefData : public wxObjectRefData { public: - wxFontRefData(int size = wxDEFAULT, - int family = wxDEFAULT, - int style = wxDEFAULT, - int weight = wxDEFAULT, + // from broken down font parameters, also default ctor + wxFontRefData(int size = -1, + int family = wxFONTFAMILY_DEFAULT, + int style = wxFONTSTYLE_NORMAL, + int weight = wxFONTWEIGHT_NORMAL, bool underlined = FALSE, const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + + // from XFLD + wxFontRefData(const wxString& fontname); + + // copy ctor wxFontRefData( const wxFontRefData& data ); + virtual ~wxFontRefData(); + // do we have the native font info? + bool HasNativeFont() const + { + return !m_nativeFontInfo.IsDefault(); + } + + // setters: all of them also take care to modify m_nativeFontInfo if we + // have it so as to not lose the information not carried by our fields + void SetPointSize(int pointSize); + void SetFamily(int family); + void SetStyle(int style); + void SetWeight(int weight); + void SetUnderlined(bool underlined); + void SetFaceName(const wxString& facename); + void SetEncoding(wxFontEncoding encoding); + + // debugger helper: shows what the font really is + // + // VZ: I need this as my gdb either shows wildly wrong values or crashes + // when I ask it to "p fontRefData" :-( +#ifdef __WXDEBUG__ + void Dump() const + { + wxPrintf(_T("%s-%s-%s-%d-%d\n"), + m_faceName.c_str(), + m_weight == wxFONTWEIGHT_NORMAL + ? _T("normal") + : m_weight == wxFONTWEIGHT_BOLD + ? _T("bold") + : _T("light"), + m_style == wxFONTSTYLE_NORMAL ? _T("regular") : _T("italic"), + m_pointSize, + m_encoding); + } +#endif // Debug + protected: // common part of all ctors void Init(int pointSize, @@ -62,7 +122,10 @@ protected: wxFontEncoding encoding); private: - wxList m_scaled_xfonts; + // the map of font sizes to "GdkFont *" + wxScaledFontList m_scaled_xfonts; + + // the broken down font parameters int m_pointSize; int m_family, m_style, @@ -71,17 +134,18 @@ private: wxString m_faceName; wxFontEncoding m_encoding; + // the native font info, basicly an XFLD wxNativeFontInfo m_nativeFontInfo; friend class wxFont; }; // ============================================================================ -// implementation +// wxFontRefData implementation // ============================================================================ // ---------------------------------------------------------------------------- -// wxFontRefData +// wxFontRefData creation // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, @@ -92,48 +156,150 @@ void wxFontRefData::Init(int pointSize, const wxString& faceName, wxFontEncoding encoding) { - if (family == wxDEFAULT) - m_family = wxSWISS; - else - m_family = family; + m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family; m_faceName = faceName; - if (style == wxDEFAULT) - m_style = wxNORMAL; - else - m_style = style; - - if (weight == wxDEFAULT) - m_weight = wxNORMAL; - else - m_weight = weight; + // we accept both wxDEFAULT and wxNORMAL here - should we? + m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style; + m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight; - if (pointSize == wxDEFAULT) - m_pointSize = 12; - else - m_pointSize = pointSize; + // and here, do we really want to forbid creation of the font of the size + // 90 (the value of wxDEFAULT)?? + m_pointSize = pointSize == wxDEFAULT || + pointSize == -1 ? wxDEFAULT_FONT_SIZE : pointSize; m_underlined = underlined; m_encoding = encoding; } wxFontRefData::wxFontRefData( const wxFontRefData& data ) - : m_scaled_xfonts(wxKEY_INTEGER) { - Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight, - data.m_underlined, data.m_faceName, data.m_encoding); + m_pointSize = data.m_pointSize; + m_family = data.m_family; + m_style = data.m_style; + m_weight = data.m_weight; + + m_underlined = data.m_underlined; + + m_faceName = data.m_faceName; + m_encoding = data.m_encoding; + + m_nativeFontInfo = data.m_nativeFontInfo; } wxFontRefData::wxFontRefData(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding) - : m_scaled_xfonts(wxKEY_INTEGER) { Init(size, family, style, weight, underlined, faceName, encoding); } +wxFontRefData::wxFontRefData(const wxString& fontname) +{ + // remember the X font name + m_nativeFontInfo.SetXFontName(fontname); + + // get the font parameters from the XLFD + // ------------------------------------- + + m_faceName = m_nativeFontInfo.GetXFontComponent(wxXLFD_FAMILY); + + m_weight = wxFONTWEIGHT_NORMAL; + + wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper(); + if ( !w.empty() && w != _T('*') ) + { + // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD + // and BLACK + if ( ((w[0u] == _T('B') && (!strcmp(w.c_str() + 1, _T("OLD")) || + !strcmp(w.c_str() + 1, _T("LACK"))))) || + strstr(w.c_str() + 1, _T("BOLD")) ) + { + m_weight = wxFONTWEIGHT_BOLD; + } + else if ( w == _T("LIGHT") || w == _T("THIN") ) + { + m_weight = wxFONTWEIGHT_LIGHT; + } + } + + switch ( wxToupper(*m_nativeFontInfo. + GetXFontComponent(wxXLFD_SLANT).c_str()) ) + { + case _T('I'): // italique + m_style = wxFONTSTYLE_ITALIC; + break; + + case _T('O'): // oblique + m_style = wxFONTSTYLE_SLANT; + break; + + default: + m_style = wxFONTSTYLE_NORMAL; + } + + long ptSize; + if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_POINTSIZE).ToLong(&ptSize) ) + { + // size in XLFD is in 10 point units + m_pointSize = (int)(ptSize / 10); + } + else + { + m_pointSize = wxDEFAULT_FONT_SIZE; + } + + // examine the spacing: if the font is monospaced, assume wxTELETYPE + // family for compatibility with the old code which used it instead of + // IsFixedWidth() + if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == _T('M') ) + { + m_family = wxFONTFAMILY_TELETYPE; + } + else // not monospaceed + { + // don't even try guessing it, it doesn't work for too many fonts + // anyhow + m_family = wxFONTFAMILY_UNKNOWN; + } + + // X fonts are never underlined... + m_underlined = FALSE; + + // deal with font encoding + wxString + registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(), + encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper(); + + if ( registry == _T("ISO8859") ) + { + int cp; + if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 ) + { + m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1); + } + } + else if ( registry == _T("MICROSOFT") ) + { + int cp; + if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 ) + { + m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp); + } + } + else if ( registry == _T("KOI8") ) + { + m_encoding = wxFONTENCODING_KOI8; + } + else // unknown encoding + { + // may be give a warning here? + m_encoding = wxFONTENCODING_SYSTEM; + } +} + wxFontRefData::~wxFontRefData() { wxNode *node = m_scaled_xfonts.First(); @@ -147,141 +313,170 @@ wxFontRefData::~wxFontRefData() } // ---------------------------------------------------------------------------- -// wxFont +// wxFontRefData SetXXX() // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - -void wxFont::Init() +void wxFontRefData::SetPointSize(int pointSize) { -} + m_pointSize = pointSize; -wxFont::wxFont(const wxNativeFontInfo& info) -{ - Init(); + if ( HasNativeFont() ) + { + wxString size; + if ( pointSize == -1 ) + size = _T('*'); + else + size.Printf(_T("%d"), 10*pointSize); - Create(info.xFontName); + m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size); + } } -bool wxFont::Create(const wxNativeFontInfo& info) +void wxFontRefData::SetFamily(int family) { - return Create(info.xFontName); -} + m_family = family; -bool wxFont::Create( int pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString& face, - wxFontEncoding encoding) -{ - m_refData = new wxFontRefData(pointSize, family, style, weight, - underlined, face, encoding); - - return TRUE; + // TODO: what are we supposed to do with m_nativeFontInfo here? } -bool wxFont::Create(const wxString& fontname, wxFontEncoding enc) +void wxFontRefData::SetStyle(int style) { - if( !fontname ) + m_style = style; + + if ( HasNativeFont() ) { - *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT); - return TRUE; + wxString slant; + switch ( style ) + { + case wxFONTSTYLE_ITALIC: + slant = _T('i'); + break; + + case wxFONTSTYLE_SLANT: + slant = _T('o'); + break; + + default: + wxFAIL_MSG( _T("unknown font style") ); + // fall through + + case wxFONTSTYLE_NORMAL: + slant = _T('r'); + } + + m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant); } +} - m_refData = new wxFontRefData(); +void wxFontRefData::SetWeight(int weight) +{ + m_weight = weight; - M_FONTDATA->m_nativeFontInfo.xFontName = fontname; // X font name + if ( HasNativeFont() ) + { + wxString boldness; + switch ( weight ) + { + case wxFONTWEIGHT_BOLD: + boldness = _T("bold"); + break; - wxString tmp; + case wxFONTWEIGHT_LIGHT: + boldness = _T("light"); + break; - wxStringTokenizer tn( fontname, wxT("-") ); + default: + wxFAIL_MSG( _T("unknown font weight") ); + // fall through - tn.GetNextToken(); // skip initial empty token - tn.GetNextToken(); // foundry + case wxFONTWEIGHT_NORMAL: + // unspecified + boldness = _T("medium"); + } + m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness); + } +} - M_FONTDATA->m_faceName = tn.GetNextToken(); // family +void wxFontRefData::SetUnderlined(bool underlined) +{ + m_underlined = underlined; - tmp = tn.GetNextToken().MakeUpper(); // weight - if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD; + // the XLFD doesn't have "underlined" field anyhow +} - if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT; - if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT; +void wxFontRefData::SetFaceName(const wxString& facename) +{ + m_faceName = facename; - tmp = tn.GetNextToken().MakeUpper(); // slant - if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC; - if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC; + if ( HasNativeFont() ) + { + m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename); + } +} - tn.GetNextToken(); // set width - tn.GetNextToken(); // add. style - tn.GetNextToken(); // pixel size +void wxFontRefData::SetEncoding(wxFontEncoding encoding) +{ + m_encoding = encoding; - tmp = tn.GetNextToken(); // pointsize - if (tmp != wxT("*")) + if ( HasNativeFont() ) { - long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10); - M_FONTDATA->m_pointSize = (int)(num / 10); + wxNativeEncodingInfo info; + if ( wxGetNativeFontEncoding(encoding, &info) ) + { + m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry); + m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding); + } } +} - tn.GetNextToken(); // x-res - tn.GetNextToken(); // y-res +// ============================================================================ +// wxFont implementation +// ============================================================================ - tmp = tn.GetNextToken().MakeUpper(); // spacing +// ---------------------------------------------------------------------------- +// wxFont creation +// ---------------------------------------------------------------------------- - if (tmp == wxT("M")) - M_FONTDATA->m_family = wxMODERN; - else if (M_FONTDATA->m_faceName == wxT("TIMES")) - M_FONTDATA->m_family = wxROMAN; - else if (M_FONTDATA->m_faceName == wxT("HELVETICA")) - M_FONTDATA->m_family = wxSWISS; - else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER")) - M_FONTDATA->m_family = wxTELETYPE; - else if (M_FONTDATA->m_faceName == wxT("LUCIDA")) - M_FONTDATA->m_family = wxDECORATIVE; - else if (M_FONTDATA->m_faceName == wxT("UTOPIA")) - M_FONTDATA->m_family = wxSCRIPT; +IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - tn.GetNextToken(); // avg width +void wxFont::Init() +{ +} - // deal with font encoding - M_FONTDATA->m_encoding = enc; - if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM ) +wxFont::wxFont(const wxNativeFontInfo& info) +{ + Init(); + + Create(info.GetXFontName()); +} + +bool wxFont::Create( int pointSize, + int family, + int style, + int weight, + bool underlined, + const wxString& face, + wxFontEncoding encoding) +{ + m_refData = new wxFontRefData(pointSize, family, style, weight, + underlined, face, encoding); + + return TRUE; +} + +bool wxFont::Create(const wxString& fontname) +{ + // VZ: does this really happen? + if ( fontname.empty() ) { - wxString registry = tn.GetNextToken().MakeUpper(), - encoding = tn.GetNextToken().MakeUpper(); + *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - if ( registry == _T("ISO8859") ) - { - int cp; - if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 ) - { - M_FONTDATA->m_encoding = - (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1); - } - } - else if ( registry == _T("MICROSOFT") ) - { - int cp; - if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 ) - { - M_FONTDATA->m_encoding = - (wxFontEncoding)(wxFONTENCODING_CP1250 + cp); - } - } - else if ( registry == _T("KOI8") ) - { - M_FONTDATA->m_encoding = wxFONTENCODING_KOI8; - } - //else: unknown encoding - may be give a warning here? - else - return FALSE; + return TRUE; } + + m_refData = new wxFontRefData(fontname); + return TRUE; } @@ -307,10 +502,8 @@ wxFont::~wxFont() // accessors // ---------------------------------------------------------------------------- -bool wxFont::HasNativeFont() const -{ - return !M_FONTDATA->m_nativeFontInfo.xFontName.empty(); -} +// all accessors are just forwarded to wxFontRefData which has everything we +// need int wxFont::GetPointSize() const { @@ -354,7 +547,6 @@ bool wxFont::GetUnderlined() const return M_FONTDATA->m_underlined; } - wxFontEncoding wxFont::GetEncoding() const { wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); @@ -366,7 +558,7 @@ wxNativeFontInfo *wxFont::GetNativeFontInfo() const { wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") ); - if(M_FONTDATA->m_nativeFontInfo.xFontName.IsEmpty()) + if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() ) GetInternalFont(); return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo); @@ -376,7 +568,7 @@ bool wxFont::IsFixedWidth() const { wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); - if ( HasNativeFont() ) + if ( M_FONTDATA->HasNativeFont() ) { // the monospace fonts are supposed to have "M" in the spacing field wxString spacing = M_FONTDATA-> @@ -396,55 +588,49 @@ void wxFont::SetPointSize(int pointSize) { Unshare(); - M_FONTDATA->m_pointSize = pointSize; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetPointSize(pointSize); } void wxFont::SetFamily(int family) { Unshare(); - M_FONTDATA->m_family = family; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetFamily(family); } void wxFont::SetStyle(int style) { Unshare(); - M_FONTDATA->m_style = style; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetStyle(style); } void wxFont::SetWeight(int weight) { Unshare(); - M_FONTDATA->m_weight = weight; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetWeight(weight); } void wxFont::SetFaceName(const wxString& faceName) { Unshare(); - M_FONTDATA->m_faceName = faceName; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetFaceName(faceName); } void wxFont::SetUnderlined(bool underlined) { Unshare(); - M_FONTDATA->m_underlined = underlined; + M_FONTDATA->SetUnderlined(underlined); } void wxFont::SetEncoding(wxFontEncoding encoding) { Unshare(); - M_FONTDATA->m_encoding = encoding; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetEncoding(encoding); } void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) @@ -460,7 +646,8 @@ void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL; -GdkFont *GtkGetDefaultGuiFont() +// this is also used from tbargtk.cpp and tooltip.cpp, hence extern +extern GdkFont *GtkGetDefaultGuiFont() { if (!g_systemDefaultGuiFont) { @@ -468,13 +655,13 @@ GdkFont *GtkGetDefaultGuiFont() GtkStyle *def = gtk_rc_get_style( widget ); if (def) { - g_systemDefaultGuiFont = gdk_font_ref( def->font ); + g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) ); } else { def = gtk_widget_get_default_style(); if (def) - g_systemDefaultGuiFont = gdk_font_ref( def->font ); + g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) ); } gtk_widget_destroy( widget ); } @@ -489,41 +676,56 @@ GdkFont *GtkGetDefaultGuiFont() GdkFont *wxFont::GetInternalFont( float scale ) const { - if (!Ok()) - { - wxFAIL_MSG( wxT("invalid font") ); + GdkFont *font = (GdkFont *) NULL; - return (GdkFont*) NULL; - } + wxCHECK_MSG( Ok(), font, wxT("invalid font") ) long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */ int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100); - GdkFont *font = (GdkFont *) NULL; wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale); if (node) { font = (GdkFont*)node->Data(); } - else + else // we don't have this font in this size yet { if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT)) { font = GtkGetDefaultGuiFont(); } - if (!font) + + if ( !font ) { - font = wxLoadQueryNearestFont( point_scale, - M_FONTDATA->m_family, - M_FONTDATA->m_style, - M_FONTDATA->m_weight, - M_FONTDATA->m_underlined, - M_FONTDATA->m_faceName, - M_FONTDATA->m_encoding, - &M_FONTDATA->m_nativeFontInfo.xFontName ); + // do we have the XLFD? + if ( M_FONTDATA->HasNativeFont() ) + { + font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName()); + } + + // no XLFD of no exact match - try the approximate one now + if ( !font ) + { + wxString xfontname; + font = wxLoadQueryNearestFont( point_scale, + M_FONTDATA->m_family, + M_FONTDATA->m_style, + M_FONTDATA->m_weight, + M_FONTDATA->m_underlined, + M_FONTDATA->m_faceName, + M_FONTDATA->m_encoding, + &xfontname); + if ( font ) + { + M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); + } + } } - M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font ); + if ( font ) + { + M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font ); + } } // it's quite useless to make it a wxCHECK because we're going to crash