X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..3b28eaf5c3ff53c282281925b1c5fd5e64e71add:/src/gtk/font.cpp diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 1fd76d1df0..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 @@ -78,7 +77,13 @@ public: // do we have the native font info? bool HasNativeFont() const { +#ifdef __WXGTK20__ + // 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 // GTK 2.0/1.x } // setters: all of them also take care to modify m_nativeFontInfo if we @@ -91,11 +96,17 @@ 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 // when I ask it to "p fontRefData" :-( -#ifdef __WXDEBUG__ +#if defined(__WXDEBUG__) && !defined(__WXGTK20__) void Dump() const { wxPrintf(_T("%s-%s-%s-%d-%d\n"), @@ -121,31 +132,36 @@ 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 // GTK 2.0/1.x - // 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, @@ -166,41 +182,125 @@ 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_noAA = FALSE; - m_underlined = data.m_underlined; +#ifdef __WXGTK20__ + // Create native font info + m_nativeFontInfo.description = pango_font_description_new(); - m_faceName = data.m_faceName; - m_encoding = data.m_encoding; + // And set its values + if (!m_faceName.empty()) + { + 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; + } + } - m_nativeFontInfo = data.m_nativeFontInfo; + SetStyle( m_style ); + SetPointSize( m_pointSize ); + SetWeight( m_weight ); +#endif // GTK 2.0 } -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) -{ - // remember the X font name - m_nativeFontInfo.SetXFontName(fontname); +#ifdef __WXGTK20__ + // 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: + m_style = wxFONTSTYLE_NORMAL; + break; + case PANGO_STYLE_ITALIC: + m_style = wxFONTSTYLE_ITALIC; + break; + case PANGO_STYLE_OBLIQUE: + m_style = wxFONTSTYLE_SLANT; + break; + } + + switch (pango_font_description_get_weight( desc )) + { + case PANGO_WEIGHT_ULTRALIGHT: + m_weight = wxFONTWEIGHT_LIGHT; + break; + case PANGO_WEIGHT_LIGHT: + m_weight = wxFONTWEIGHT_LIGHT; + break; + case PANGO_WEIGHT_NORMAL: + m_weight = wxFONTWEIGHT_NORMAL; + break; + case PANGO_WEIGHT_BOLD: + m_weight = wxFONTWEIGHT_BOLD; + break; + case PANGO_WEIGHT_ULTRABOLD: + m_weight = wxFONTWEIGHT_BOLD; + break; + case PANGO_WEIGHT_HEAVY: + m_weight = wxFONTWEIGHT_BOLD; + break; + } + + 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_family = wxFONTFAMILY_UNKNOWN; + } + + // Pango description are never underlined (?) + m_underlined = FALSE; + // Cannot we choose that + m_encoding = wxFONTENCODING_SYSTEM; +#else // GTK 1.x // get the font parameters from the XLFD // ------------------------------------- @@ -213,9 +313,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; } @@ -295,21 +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 // GTK 2.0/1.x } -wxFontRefData::~wxFontRefData() +wxFontRefData::wxFontRefData( const wxFontRefData& data ) + : wxObjectRefData() { - wxNode *node = m_scaled_xfonts.First(); - while (node) + 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__ + 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(); +#endif // GTK 1.x +} + +wxFontRefData::~wxFontRefData() +{ + ClearGdkFonts(); } // ---------------------------------------------------------------------------- @@ -320,6 +470,12 @@ void wxFontRefData::SetPointSize(int pointSize) { m_pointSize = pointSize; +#ifdef __WXGTK20__ + // Get native info + PangoFontDescription *desc = m_nativeFontInfo.description; + + pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE ); +#else if ( HasNativeFont() ) { wxString size; @@ -330,6 +486,7 @@ void wxFontRefData::SetPointSize(int pointSize) m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size); } +#endif } void wxFontRefData::SetFamily(int family) @@ -343,6 +500,26 @@ void wxFontRefData::SetStyle(int style) { m_style = style; +#ifdef __WXGTK20__ + // Get native info + PangoFontDescription *desc = m_nativeFontInfo.description; + + switch ( style ) + { + case wxFONTSTYLE_ITALIC: + pango_font_description_set_style( desc, PANGO_STYLE_ITALIC ); + break; + case wxFONTSTYLE_SLANT: + pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE ); + break; + default: + wxFAIL_MSG( _T("unknown font style") ); + // fall through + case wxFONTSTYLE_NORMAL: + pango_font_description_set_style( desc, PANGO_STYLE_NORMAL ); + break; + } +#else if ( HasNativeFont() ) { wxString slant; @@ -366,12 +543,34 @@ void wxFontRefData::SetStyle(int style) m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant); } +#endif } void wxFontRefData::SetWeight(int weight) { m_weight = weight; +#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; @@ -396,6 +595,7 @@ void wxFontRefData::SetWeight(int weight) m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness); } +#endif } void wxFontRefData::SetUnderlined(bool underlined) @@ -409,16 +609,19 @@ void wxFontRefData::SetFaceName(const wxString& facename) { m_faceName = facename; +#ifndef __WXGTK20__ if ( HasNativeFont() ) { m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename); } +#endif } void wxFontRefData::SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; +#ifndef __WXGTK20__ if ( HasNativeFont() ) { wxNativeEncodingInfo info; @@ -428,11 +631,19 @@ void wxFontRefData::SetEncoding(wxFontEncoding encoding) m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding); } } +#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 @@ -448,7 +659,17 @@ wxFont::wxFont(const wxNativeFontInfo& info) { Init(); - Create(info.GetXFontName()); +#ifdef __WXGTK20__ + Create( info.GetPointSize(), + info.GetFamily(), + info.GetStyle(), + info.GetWeight(), + info.GetUnderlined(), + info.GetFaceName(), + info.GetEncoding() ); +#else + (void) Create(info.GetXFontName()); +#endif } bool wxFont::Create( int pointSize, @@ -459,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); @@ -502,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") ); @@ -554,20 +774,30 @@ 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__ 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 { wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); +#ifndef __WXGTK20__ if ( M_FONTDATA->HasNativeFont() ) { // the monospace fonts are supposed to have "M" in the spacing field @@ -576,6 +806,7 @@ bool wxFont::IsFixedWidth() const return spacing.Upper() == _T('M'); } +#endif return wxFontBase::IsFixedWidth(); } @@ -633,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->SetNativeFontInfo( info ); +} + +void wxFont::SetNoAntiAliasing( bool no ) { Unshare(); - M_FONTDATA->m_nativeFontInfo = info; + 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 @@ -655,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 ); } @@ -680,13 +919,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 { @@ -715,16 +955,12 @@ 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; } } @@ -734,4 +970,5 @@ GdkFont *wxFont::GetInternalFont( float scale ) const return font; } +#endif // not GTK 2.0