X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..a7d5151df02bf70a9f6ff1c5c7fd33ab07bf409c:/src/gtk/font.cpp?ds=inline diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index c2e51daba6..120d0a87e5 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -1,9 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: gtk/font.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,9 +15,8 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "font.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/font.h" #include "wx/fontutil.h" @@ -26,10 +25,26 @@ #include "wx/log.h" #include "wx/gdicmn.h" #include "wx/tokenzr.h" +#include "wx/settings.h" #include -#include "gdk/gdk.h" +#include "wx/gtk/private.h" +#include + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// the default size (in points) for the fonts +static const int wxDEFAULT_FONT_SIZE = 12; + +// ---------------------------------------------------------------------------- +// wxScaledFontList: maps the font sizes to the GDK fonts for the given font +// ---------------------------------------------------------------------------- + +WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual, + wxScaledFontList); // ---------------------------------------------------------------------------- // wxFontRefData @@ -38,16 +53,46 @@ 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 + { + // we always have a Pango font description + return TRUE; + } + + // 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); + + void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; } + bool GetNoAntiAliasing() const { return m_noAA; } + + // and this one also modifies all the other font data fields + void SetNativeFontInfo(const wxNativeFontInfo& info); + protected: // common part of all ctors void Init(int pointSize, @@ -58,22 +103,28 @@ protected: const wxString& faceName, wxFontEncoding encoding); + // set all fields from (already initialized and valid) m_nativeFontInfo + void InitFromNative(); + private: - wxList m_scaled_xfonts; + // clear m_scaled_xfonts if any + void ClearGdkFonts(); + int m_pointSize; int m_family, m_style, m_weight; bool m_underlined; wxString m_faceName; - wxFontEncoding m_encoding; + wxFontEncoding m_encoding; // Unused under GTK 2.0 + bool m_noAA; // No anti-aliasing - friend wxFont; -}; + // The native font info, basicly an XFLD under GTK 1.2 and + // the pango font description under GTK 2.0. + wxNativeFontInfo m_nativeFontInfo; -// ============================================================================ -// implementation -// ============================================================================ + friend class wxFont; +}; // ---------------------------------------------------------------------------- // wxFontRefData @@ -87,160 +138,228 @@ 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; + // we accept both wxDEFAULT and wxNORMAL here - should we? + m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style; + m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight; + + // 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; + + m_noAA = FALSE; - if (weight == wxDEFAULT) - m_weight = wxNORMAL; + // Create native font info + m_nativeFontInfo.description = pango_font_description_new(); + + // And set its values + if (!m_faceName.empty()) + { + pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) ); + } else - m_weight = weight; + { + switch (m_family) + { + case wxFONTFAMILY_MODERN: + case wxFONTFAMILY_TELETYPE: + pango_font_description_set_family( m_nativeFontInfo.description, "monospace" ); + break; + case wxFONTFAMILY_ROMAN: + pango_font_description_set_family( m_nativeFontInfo.description, "serif" ); + break; + case wxFONTFAMILY_SWISS: + // SWISS = sans serif + default: + pango_font_description_set_family( m_nativeFontInfo.description, "sans" ); + break; + } + } - if (pointSize == wxDEFAULT) - m_pointSize = 12; + SetStyle( m_style ); + SetPointSize( m_pointSize ); + SetWeight( m_weight ); +} + +void wxFontRefData::InitFromNative() +{ + m_noAA = FALSE; + + // Get native info + PangoFontDescription *desc = m_nativeFontInfo.description; + + // init fields + m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) ); + + // Pango sometimes needs to have a size + int pango_size = pango_font_description_get_size( desc ); + if (pango_size == 0) + m_nativeFontInfo.SetPointSize(12); + + m_pointSize = m_nativeFontInfo.GetPointSize(); + m_style = m_nativeFontInfo.GetStyle(); + m_weight = m_nativeFontInfo.GetWeight(); + + if (m_faceName == wxT("monospace")) + { + m_family = wxFONTFAMILY_TELETYPE; + } + else if (m_faceName == wxT("sans")) + { + m_family = wxFONTFAMILY_SWISS; + } + else if (m_faceName == wxT("serif")) + { + m_family = wxFONTFAMILY_ROMAN; + } else - m_pointSize = pointSize; + { + m_family = wxFONTFAMILY_UNKNOWN; + } - m_underlined = underlined; - m_encoding = encoding; + // Pango description are never underlined (?) + m_underlined = FALSE; + + // Cannot we choose that + m_encoding = wxFONTENCODING_SYSTEM; } wxFontRefData::wxFontRefData( const wxFontRefData& data ) - : m_scaled_xfonts(wxKEY_INTEGER) + : wxObjectRefData() { - 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_noAA = data.m_noAA; + + // Forces a copy of the internal data. wxNativeFontInfo should probably + // have a copy ctor and assignment operator to fix this properly but that + // would break binary compatibility... + m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString()); } wxFontRefData::wxFontRefData(int size, int family, int style, - int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding ) - : m_scaled_xfonts(wxKEY_INTEGER) + int weight, bool underlined, + const wxString& faceName, + wxFontEncoding encoding) +{ + Init(size, family, style, weight, underlined, faceName, encoding); +} + +wxFontRefData::wxFontRefData(const wxString& fontname) +{ + m_nativeFontInfo.FromString( fontname ); + + InitFromNative(); +} + +void wxFontRefData::ClearGdkFonts() { - Init(size, family, style, weight, - underlined, faceName, encoding); } wxFontRefData::~wxFontRefData() { - wxNode *node = m_scaled_xfonts.First(); - while (node) - { - GdkFont *font = (GdkFont*)node->Data(); - wxNode *next = node->Next(); - gdk_font_unref( font ); - node = next; - } + ClearGdkFonts(); } // ---------------------------------------------------------------------------- -// wxFont +// wxFontRefData SetXXX() // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - -void wxFont::Init() +void wxFontRefData::SetPointSize(int pointSize) { - if (wxTheFontList) - wxTheFontList->Append( this ); + m_pointSize = pointSize; + + m_nativeFontInfo.SetPointSize(pointSize); } -wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata ) +void wxFontRefData::SetFamily(int family) { - Init(); + m_family = family; - wxCHECK_RET( !!fontname, _T("invalid font spec") ); + // TODO: what are we supposed to do with m_nativeFontInfo here? +} - m_refData = new wxFontRefData(); +void wxFontRefData::SetStyle(int style) +{ + m_style = style; - wxString tmp; + m_nativeFontInfo.SetStyle((wxFontStyle)style); +} - wxStringTokenizer tn( fontname, wxT("-") ); +void wxFontRefData::SetWeight(int weight) +{ + m_weight = weight; - tn.GetNextToken(); // foundry + m_nativeFontInfo.SetWeight((wxFontWeight)weight); +} - 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; + m_nativeFontInfo.SetFaceName(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 - long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10); - M_FONTDATA->m_pointSize = num / 10; +void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) +{ + // previously cached fonts shouldn't be used + ClearGdkFonts(); - tn.GetNextToken(); // x-res - tn.GetNextToken(); // y-res + m_nativeFontInfo = info; - tmp = tn.GetNextToken().MakeUpper(); // spacing + // set all the other font parameters from the native font info + InitFromNative(); +} - 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; +// ---------------------------------------------------------------------------- +// wxFont creation +// ---------------------------------------------------------------------------- - tn.GetNextToken(); // avg width +IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - // deal with font encoding - M_FONTDATA->m_encoding = fontdata.GetEncoding(); - if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM ) - { - wxString registry = tn.GetNextToken().MakeUpper(), - encoding = tn.GetNextToken().MakeUpper(); +void wxFont::Init() +{ +} - 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? - } +wxFont::wxFont(const wxNativeFontInfo& info) +{ + Init(); + + Create( info.GetPointSize(), + info.GetFamily(), + info.GetStyle(), + info.GetWeight(), + info.GetUnderlined(), + info.GetFaceName(), + info.GetEncoding() ); } bool wxFont::Create( int pointSize, @@ -249,14 +368,31 @@ bool wxFont::Create( int pointSize, int weight, bool underlined, const wxString& face, - wxFontEncoding encoding ) + wxFontEncoding encoding) { + UnRef(); + 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() ) + { + *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + + return TRUE; + } + + m_refData = new wxFontRefData(fontname); + + return TRUE; +} + void wxFont::Unshare() { if (!m_refData) @@ -273,8 +409,6 @@ void wxFont::Unshare() wxFont::~wxFont() { - if (wxTheFontList) - wxTheFontList->DeleteObject( this ); } // ---------------------------------------------------------------------------- @@ -285,35 +419,67 @@ int wxFont::GetPointSize() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); +#if wxUSE_PANGO + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize() + : M_FONTDATA->m_pointSize; +#else return M_FONTDATA->m_pointSize; +#endif } wxString wxFont::GetFaceName() const { wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); +#if wxUSE_PANGO + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName() + : M_FONTDATA->m_faceName; +#else return M_FONTDATA->m_faceName; +#endif } int wxFont::GetFamily() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); +#if wxUSE_PANGO + int ret = M_FONTDATA->m_family; + if (M_FONTDATA->HasNativeFont()) + // wxNativeFontInfo::GetFamily is expensive, must not call more than once + ret = M_FONTDATA->m_nativeFontInfo.GetFamily(); + + if (ret == wxFONTFAMILY_DEFAULT) + ret = M_FONTDATA->m_family; + + return ret; +#else return M_FONTDATA->m_family; +#endif } int wxFont::GetStyle() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); +#if wxUSE_PANGO + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle() + : M_FONTDATA->m_style; +#else return M_FONTDATA->m_style; +#endif } int wxFont::GetWeight() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); +#if wxUSE_PANGO + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight() + : M_FONTDATA->m_weight; +#else return M_FONTDATA->m_weight; +#endif } bool wxFont::GetUnderlined() const @@ -323,14 +489,35 @@ bool wxFont::GetUnderlined() const return M_FONTDATA->m_underlined; } - wxFontEncoding wxFont::GetEncoding() const { wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + // m_encoding is unused in wxGTK2, return encoding that the user set. return M_FONTDATA->m_encoding; } +bool wxFont::GetNoAntiAliasing() const +{ + wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + + return M_FONTDATA->m_noAA; +} + +const wxNativeFontInfo *wxFont::GetNativeFontInfo() const +{ + wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") ); + + return &(M_FONTDATA->m_nativeFontInfo); +} + +bool wxFont::IsFixedWidth() const +{ + wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); + + return wxFontBase::IsFixedWidth(); +} + // ---------------------------------------------------------------------------- // change font attributes // ---------------------------------------------------------------------------- @@ -339,104 +526,61 @@ void wxFont::SetPointSize(int pointSize) { Unshare(); - M_FONTDATA->m_pointSize = pointSize; + M_FONTDATA->SetPointSize(pointSize); } void wxFont::SetFamily(int family) { Unshare(); - M_FONTDATA->m_family = family; + M_FONTDATA->SetFamily(family); } void wxFont::SetStyle(int style) { Unshare(); - M_FONTDATA->m_style = style; + M_FONTDATA->SetStyle(style); } void wxFont::SetWeight(int weight) { Unshare(); - M_FONTDATA->m_weight = weight; + M_FONTDATA->SetWeight(weight); } void wxFont::SetFaceName(const wxString& faceName) { Unshare(); - M_FONTDATA->m_faceName = faceName; + 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->SetEncoding(encoding); } -// ---------------------------------------------------------------------------- -// get internal representation of font -// ---------------------------------------------------------------------------- - -GdkFont *wxFont::GetInternalFont( float scale ) const +void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) { - if (!Ok()) - { - wxFAIL_MSG( wxT("invalid font") ); - - return (GdkFont*) NULL; - } - - 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 - { -#if 0 - if ((int_scale == 100) && - (M_FONTDATA->m_family == wxSWISS) && - (M_FONTDATA->m_style == wxNORMAL) && - (M_FONTDATA->m_pointSize == 12) && - (M_FONTDATA->m_weight == wxNORMAL) && - (M_FONTDATA->m_underlined == FALSE)) - { - font = gdk_font_load( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" ); - } - else -#endif // 0 - { - 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 ); - } + Unshare(); - M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font ); - } + M_FONTDATA->SetNativeFontInfo( info ); +} - // it's quite useless to make it a wxCHECK because we're going to crash - // anyhow... - wxASSERT_MSG( font, wxT("could not load any font?") ); +void wxFont::SetNoAntiAliasing( bool no ) +{ + Unshare(); - return font; + M_FONTDATA->SetNoAntiAliasing( no ); } -