X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/409d5a58605cfb202774b59c3af078d3be89d7d5..c72b1ad70a0dda5a3fe5086e0c80ae12402e405d:/src/gtk1/font.cpp diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index 1637fb8a9a..35a7060ab6 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -3,7 +3,7 @@ // 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" @@ -30,9 +29,8 @@ #include -#include +#include "wx/gtk1/private.h" #include -#include // ---------------------------------------------------------------------------- // constants @@ -42,15 +40,11 @@ static const int wxDEFAULT_FONT_SIZE = 12; // ---------------------------------------------------------------------------- -// wxScaledFontList +// wxScaledFontList: maps the font sizes to the GDK fonts for the given font // ---------------------------------------------------------------------------- -// TODO: replace this with a type safe list or hash!! -class wxScaledFontList : public wxList -{ -public: - wxScaledFontList() : wxList(wxKEY_INTEGER) { } -}; +WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual, + wxScaledFontList); // ---------------------------------------------------------------------------- // wxFontRefData @@ -79,6 +73,7 @@ public: // do we have the native font info? bool HasNativeFont() const { + // only use m_nativeFontInfo if it had been initialized return !m_nativeFontInfo.IsDefault(); } @@ -92,11 +87,17 @@ public: 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); + // 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__ +#if defined(__WXDEBUG__) void Dump() const { wxPrintf(_T("%s-%s-%s-%d-%d\n"), @@ -122,31 +123,34 @@ protected: const wxString& faceName, wxFontEncoding encoding); + // set all fields from (already initialized and valid) m_nativeFontInfo + void InitFromNative(); + private: + // clear m_scaled_xfonts if any + void ClearGdkFonts(); + // the map of font sizes to "GdkFont *" wxScaledFontList m_scaled_xfonts; - // the broken down font parameters 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 - // the native font info, basicly an XFLD + // The native font info, basicly an XFLD under GTK 1.2 and + // the pango font description under GTK 2.0. wxNativeFontInfo m_nativeFontInfo; friend class wxFont; }; -// ============================================================================ -// wxFontRefData implementation -// ============================================================================ - // ---------------------------------------------------------------------------- -// wxFontRefData creation +// wxFontRefData // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, @@ -167,40 +171,19 @@ void wxFontRefData::Init(int 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_pointSize = pointSize == wxDEFAULT || pointSize == -1 + ? wxDEFAULT_FONT_SIZE + : pointSize; m_underlined = underlined; m_encoding = encoding; -} - -wxFontRefData::wxFontRefData( const wxFontRefData& data ) -{ - 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; + m_noAA = FALSE; } -wxFontRefData::wxFontRefData(int size, int family, int style, - int weight, bool underlined, - const wxString& faceName, - wxFontEncoding encoding) -{ - Init(size, family, style, weight, underlined, faceName, encoding); -} - -wxFontRefData::wxFontRefData(const wxString& fontname) +void wxFontRefData::InitFromNative() { - // remember the X font name - m_nativeFontInfo.SetXFontName(fontname); + m_noAA = FALSE; // get the font parameters from the XLFD // ------------------------------------- @@ -214,9 +197,9 @@ wxFontRefData::wxFontRefData(const wxString& fontname) { // 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")) ) + if ( ((w[0u] == _T('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) || + !wxStrcmp(w.c_str() + 1, wxT("LACK"))))) || + wxStrstr(w.c_str() + 1, _T("BOLD")) ) { m_weight = wxFONTWEIGHT_BOLD; } @@ -296,21 +279,64 @@ wxFontRefData::wxFontRefData(const wxString& fontname) } else // unknown encoding { - // may be give a warning here? + // may be give a warning here? or use wxFontMapper? m_encoding = wxFONTENCODING_SYSTEM; } } -wxFontRefData::~wxFontRefData() +wxFontRefData::wxFontRefData( const wxFontRefData& data ) + : wxObjectRefData() +{ + 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) { - wxNode *node = m_scaled_xfonts.First(); - while (node) + Init(size, family, style, weight, underlined, faceName, encoding); +} + +wxFontRefData::wxFontRefData(const wxString& fontname) +{ + // FromString() should really work in GTK1 too, doesn't it? + m_nativeFontInfo.SetXFontName(fontname); + + InitFromNative(); +} + +void wxFontRefData::ClearGdkFonts() +{ + for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin(); + i != m_scaled_xfonts.end(); + ++i ) { - GdkFont *font = (GdkFont*)node->Data(); - wxNode *next = node->Next(); + GdkFont *font = i->second; gdk_font_unref( font ); - node = next; } + + m_scaled_xfonts.clear(); +} + +wxFontRefData::~wxFontRefData() +{ + ClearGdkFonts(); } // ---------------------------------------------------------------------------- @@ -431,9 +457,16 @@ void wxFontRefData::SetEncoding(wxFontEncoding encoding) } } -// ============================================================================ -// wxFont implementation -// ============================================================================ +void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) +{ + // previously cached fonts shouldn't be used + ClearGdkFonts(); + + m_nativeFontInfo = info; + + // set all the other font parameters from the native font info + InitFromNative(); +} // ---------------------------------------------------------------------------- // wxFont creation @@ -449,7 +482,7 @@ wxFont::wxFont(const wxNativeFontInfo& info) { Init(); - Create(info.GetXFontName()); + (void) Create(info.GetXFontName()); } bool wxFont::Create( int pointSize, @@ -460,6 +493,8 @@ bool wxFont::Create( int pointSize, const wxString& face, wxFontEncoding encoding) { + UnRef(); + m_refData = new wxFontRefData(pointSize, family, style, weight, underlined, face, encoding); @@ -503,42 +538,71 @@ wxFont::~wxFont() // accessors // ---------------------------------------------------------------------------- -// all accessors are just forwarded to wxFontRefData which has everything we -// need - 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 @@ -552,17 +616,30 @@ 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; } -wxNativeFontInfo *wxFont::GetNativeFontInfo() const +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") ); - if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() ) + if ( !M_FONTDATA->HasNativeFont() ) + { + // NB: this call has important side-effect: it not only finds + // GdkFont representation, it also initializes m_nativeFontInfo + // by calling its SetXFontName method GetInternalFont(); + } - return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo); + return &(M_FONTDATA->m_nativeFontInfo); } bool wxFont::IsFixedWidth() const @@ -634,11 +711,18 @@ void wxFont::SetEncoding(wxFontEncoding encoding) M_FONTDATA->SetEncoding(encoding); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) { Unshare(); - M_FONTDATA->m_nativeFontInfo = info; + M_FONTDATA->SetNativeFontInfo( info ); +} + +void wxFont::SetNoAntiAliasing( bool no ) +{ + Unshare(); + + M_FONTDATA->SetNoAntiAliasing( no ); } // ---------------------------------------------------------------------------- @@ -681,13 +765,14 @@ GdkFont *wxFont::GetInternalFont( float scale ) const wxCHECK_MSG( Ok(), font, wxT("invalid font") ) - long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */ + long int_scale = long(scale * 100.0 + 0.5); // key for fontlist int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100); - wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale); - if (node) + wxScaledFontList& list = M_FONTDATA->m_scaled_xfonts; + wxScaledFontList::iterator i = list.find(int_scale); + if ( i != list.end() ) { - font = (GdkFont*)node->Data(); + font = i->second; } else // we don't have this font in this size yet { @@ -699,7 +784,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const if ( !font ) { // do we have the XLFD? - if ( M_FONTDATA->HasNativeFont() ) + if ( int_scale == 100 && M_FONTDATA->HasNativeFont() ) { font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName()); } @@ -716,16 +801,16 @@ GdkFont *wxFont::GetInternalFont( float scale ) const M_FONTDATA->m_faceName, M_FONTDATA->m_encoding, &xfontname); - if ( font ) - { + // NB: wxFont::GetNativeFontInfo relies on this + // side-effect of GetInternalFont + if ( int_scale == 100 ) M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); - } } } if ( font ) { - M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font ); + list[int_scale] = font; } } @@ -735,4 +820,3 @@ GdkFont *wxFont::GetInternalFont( float scale ) const return font; } -