X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46eed000d666418b3ba5e98190056cc2e9be4c6a..c2517b523979d4beaabbbe3538df1b49d682748d:/src/gtk/font.cpp?ds=sidebyside diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index e8dbe802e5..3989eea3bf 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/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,10 +15,13 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #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" #include "wx/cmndata.h" @@ -41,15 +44,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,10 +78,12 @@ public: bool HasNativeFont() const { #ifdef __WXGTK20__ - return TRUE; // ? -#else + // we always have a Pango font description + return TRUE; +#else // GTK 1.x + // only use m_nativeFontInfo if it had been initialized return !m_nativeFontInfo.IsDefault(); -#endif +#endif // GTK 2.0/1.x } // setters: all of them also take care to modify m_nativeFontInfo if we @@ -95,6 +96,12 @@ public: void SetFaceName(const wxString& facename); void SetEncoding(wxFontEncoding encoding); + void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; } + bool GetNoAntiAliasing() { 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 @@ -125,13 +132,18 @@ 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(); + #ifndef __WXGTK20__ // the map of font sizes to "GdkFont *" wxScaledFontList m_scaled_xfonts; -#endif +#endif // GTK 2.0/1.x - // the broken down font parameters int m_pointSize; int m_family, m_style, @@ -139,6 +151,7 @@ private: bool m_underlined; wxString m_faceName; wxFontEncoding m_encoding; // Unused under GTK 2.0 + bool m_noAA; // No anti-aliasing // The native font info, basicly an XFLD under GTK 1.2 and // the pango font description under GTK 2.0. @@ -147,12 +160,8 @@ private: friend class wxFont; }; -// ============================================================================ -// wxFontRefData implementation -// ============================================================================ - // ---------------------------------------------------------------------------- -// wxFontRefData creation +// wxFontRefData // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, @@ -173,71 +182,67 @@ 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; - - + + m_noAA = FALSE; + +#ifdef __WXGTK20__ // Create native font info m_nativeFontInfo.description = pango_font_description_new(); - // And set its values - switch (m_family) + // And set its values + if (!m_faceName.empty()) { - case wxFONTFAMILY_TELETYPE: - pango_font_description_set_family( m_nativeFontInfo.description, "monospaced" ); - break; - case wxFONTFAMILY_SWISS: - pango_font_description_set_family( m_nativeFontInfo.description, "serif" ); - break; - default: - pango_font_description_set_family( m_nativeFontInfo.description, "sans" ); - break; + pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) ); } + else + { + 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; + } + } + SetStyle( m_style ); SetPointSize( m_pointSize ); SetWeight( m_weight ); +#endif // GTK 2.0 } -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_nativeFontInfo = data.m_nativeFontInfo; -} - -wxFontRefData::wxFontRefData(int size, int family, int style, - int weight, bool underlined, - const wxString& faceName, - wxFontEncoding encoding) +void wxFontRefData::InitFromNative() { - Init(size, family, style, weight, underlined, faceName, encoding); -} + m_noAA = FALSE; -wxFontRefData::wxFontRefData(const wxString& fontname) -{ #ifdef __WXGTK20__ - m_nativeFontInfo.FromString( fontname ); - // 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) + pango_font_description_set_size( desc, 12 * PANGO_SCALE); + m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE; - + switch (pango_font_description_get_style( desc )) { case PANGO_STYLE_NORMAL: @@ -272,8 +277,8 @@ wxFontRefData::wxFontRefData(const wxString& fontname) m_weight = wxFONTWEIGHT_BOLD; break; } - - if (m_faceName == wxT("monospaced")) + + if (m_faceName == wxT("monospace")) { m_family = wxFONTFAMILY_TELETYPE; } @@ -281,6 +286,10 @@ wxFontRefData::wxFontRefData(const wxString& fontname) { m_family = wxFONTFAMILY_SWISS; } + else if (m_faceName == wxT("serif")) + { + m_family = wxFONTFAMILY_ROMAN; + } else { m_family = wxFONTFAMILY_UNKNOWN; @@ -291,10 +300,7 @@ wxFontRefData::wxFontRefData(const wxString& fontname) // Cannot we choose that m_encoding = wxFONTENCODING_SYSTEM; -#else - // remember the X font name - m_nativeFontInfo.SetXFontName(fontname); - +#else // GTK 1.x // get the font parameters from the XLFD // ------------------------------------- @@ -389,24 +395,71 @@ 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; } -#endif +#endif // GTK 2.0/1.x } -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) +{ + Init(size, family, style, weight, underlined, faceName, encoding); +} + +wxFontRefData::wxFontRefData(const wxString& fontname) +{ + // VZ: FromString() should really work in both cases, doesn't it? +#ifdef __WXGTK20__ + m_nativeFontInfo.FromString( fontname ); +#else // GTK 1.x + m_nativeFontInfo.SetXFontName(fontname); +#endif // GTK 2.0/1.x + + InitFromNative(); +} + +void wxFontRefData::ClearGdkFonts() { #ifndef __WXGTK20__ - wxNode *node = m_scaled_xfonts.First(); - while (node) + 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; } -#endif + + m_scaled_xfonts.clear(); +#endif // GTK 1.x +} + +wxFontRefData::~wxFontRefData() +{ + ClearGdkFonts(); } // ---------------------------------------------------------------------------- @@ -420,7 +473,7 @@ void wxFontRefData::SetPointSize(int pointSize) #ifdef __WXGTK20__ // Get native info PangoFontDescription *desc = m_nativeFontInfo.description; - + pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE ); #else if ( HasNativeFont() ) @@ -450,7 +503,7 @@ void wxFontRefData::SetStyle(int style) #ifdef __WXGTK20__ // Get native info PangoFontDescription *desc = m_nativeFontInfo.description; - + switch ( style ) { case wxFONTSTYLE_ITALIC: @@ -497,7 +550,27 @@ void wxFontRefData::SetWeight(int weight) { m_weight = weight; -#ifndef __WXGTK20__ +#ifdef __WXGTK20__ + PangoFontDescription *desc = m_nativeFontInfo.description; + switch ( weight ) + { + case wxFONTWEIGHT_BOLD: + pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD); + break; + + case wxFONTWEIGHT_LIGHT: + pango_font_description_set_weight(desc, PANGO_WEIGHT_LIGHT); + break; + + default: + wxFAIL_MSG( _T("unknown font weight") ); + // fall through + + case wxFONTWEIGHT_NORMAL: + // unspecified + pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL); + } +#else //!__WXGTK20__ if ( HasNativeFont() ) { wxString boldness; @@ -561,9 +634,16 @@ void wxFontRefData::SetEncoding(wxFontEncoding encoding) #endif } -// ============================================================================ -// 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 @@ -580,7 +660,7 @@ wxFont::wxFont(const wxNativeFontInfo& info) Init(); #ifdef __WXGTK20__ - Create( info.GetPointSize(), + Create( info.GetPointSize(), info.GetFamily(), info.GetStyle(), info.GetWeight(), @@ -588,7 +668,7 @@ wxFont::wxFont(const wxNativeFontInfo& info) info.GetFaceName(), info.GetEncoding() ); #else - Create(info.GetXFontName()); + (void) Create(info.GetXFontName()); #endif } @@ -600,6 +680,8 @@ bool wxFont::Create( int pointSize, const wxString& face, wxFontEncoding encoding) { + UnRef(); + m_refData = new wxFontRefData(pointSize, family, style, weight, underlined, face, encoding); @@ -643,9 +725,6 @@ 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") ); @@ -695,16 +774,23 @@ wxFontEncoding wxFont::GetEncoding() const return M_FONTDATA->m_encoding; } -wxNativeFontInfo *wxFont::GetNativeFontInfo() const +bool wxFont::GetNoAntiAliasing() +{ + 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") ); -#ifndef __WXGTK20__ // ??? +#ifndef __WXGTK20__ if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() ) GetInternalFont(); #endif - return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo); + return &(M_FONTDATA->m_nativeFontInfo); } bool wxFont::IsFixedWidth() const @@ -732,7 +818,7 @@ bool wxFont::IsFixedWidth() const void wxFont::SetPointSize(int pointSize) { Unshare(); - + M_FONTDATA->SetPointSize(pointSize); } @@ -778,17 +864,25 @@ 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 ); } // ---------------------------------------------------------------------------- // get internal representation of font // ---------------------------------------------------------------------------- +#ifndef __WXGTK20__ static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL; // this is also used from tbargtk.cpp and tooltip.cpp, hence extern @@ -800,13 +894,13 @@ extern GdkFont *GtkGetDefaultGuiFont() GtkStyle *def = gtk_rc_get_style( widget ); if (def) { - g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) ); + g_systemDefaultGuiFont = gdk_font_ref( def->font ); } else { def = gtk_widget_get_default_style(); if (def) - g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) ); + g_systemDefaultGuiFont = gdk_font_ref( def->font ); } gtk_widget_destroy( widget ); } @@ -825,25 +919,14 @@ GdkFont *wxFont::GetInternalFont( float scale ) const wxCHECK_MSG( Ok(), font, wxT("invalid font") ) -#ifdef __WXGTK20__ - if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT)) - { - font = GtkGetDefaultGuiFont(); - } - else - { - PangoFontDescription *font_description = GetNativeFontInfo()->description; - - font = gdk_font_from_description( font_description ); - } -#else 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 { @@ -872,19 +955,14 @@ GdkFont *wxFont::GetInternalFont( float scale ) const M_FONTDATA->m_faceName, M_FONTDATA->m_encoding, &xfontname); - if ( font ) - { - M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); - } } } if ( font ) { - M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font ); + list[int_scale] = font; } } -#endif // GTK 2.0 // it's quite useless to make it a wxCHECK because we're going to crash // anyhow... @@ -892,4 +970,5 @@ GdkFont *wxFont::GetInternalFont( float scale ) const return font; } +#endif // not GTK 2.0