X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9045ad9dfc9d205ad645e6d496bec9ccddd91ced..18e989043be8f46e5744735fbf2d56840d2c34a7:/src/gtk/font.cpp diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 8735f843f7..120d0a87e5 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,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" @@ -74,13 +73,8 @@ 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 @@ -94,31 +88,11 @@ public: void SetEncoding(wxFontEncoding encoding); void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; } - bool GetNoAntiAliasing() { return m_noAA; } + 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" :-( -#if defined(__WXDEBUG__) && !defined(__WXGTK20__) - 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, @@ -136,11 +110,6 @@ 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 - int m_pointSize; int m_family, m_style, @@ -188,7 +157,6 @@ void wxFontRefData::Init(int pointSize, m_noAA = FALSE; -#ifdef __WXGTK20__ // Create native font info m_nativeFontInfo.description = pango_font_description_new(); @@ -219,56 +187,26 @@ void wxFontRefData::Init(int pointSize, SetStyle( m_style ); SetPointSize( m_pointSize ); SetWeight( m_weight ); -#endif // GTK 2.0 } void wxFontRefData::InitFromNative() { m_noAA = FALSE; -#ifdef __WXGTK20__ // Get native info PangoFontDescription *desc = m_nativeFontInfo.description; // init fields m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) ); - m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE; + // Pango sometimes needs to have a size + int pango_size = pango_font_description_get_size( desc ); + if (pango_size == 0) + m_nativeFontInfo.SetPointSize(12); - 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; - } + m_pointSize = m_nativeFontInfo.GetPointSize(); + m_style = m_nativeFontInfo.GetStyle(); + m_weight = m_nativeFontInfo.GetWeight(); if (m_faceName == wxT("monospace")) { @@ -292,105 +230,6 @@ void wxFontRefData::InitFromNative() // Cannot we choose that m_encoding = wxFONTENCODING_SYSTEM; -#else // GTK 1.x - // 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') && (!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; - } - 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? or use wxFontMapper? - m_encoding = wxFONTENCODING_SYSTEM; - } -#endif // GTK 2.0/1.x } wxFontRefData::wxFontRefData( const wxFontRefData& data ) @@ -424,29 +263,13 @@ wxFontRefData::wxFontRefData(int size, int family, int style, 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 = i->second; - gdk_font_unref( font ); - } - - m_scaled_xfonts.clear(); -#endif // GTK 1.x } wxFontRefData::~wxFontRefData() @@ -462,23 +285,7 @@ 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; - if ( pointSize == -1 ) - size = _T('*'); - else - size.Printf(_T("%d"), 10*pointSize); - - m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size); - } -#endif + m_nativeFontInfo.SetPointSize(pointSize); } void wxFontRefData::SetFamily(int family) @@ -492,102 +299,14 @@ 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; - 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); - } -#endif + m_nativeFontInfo.SetStyle((wxFontStyle)style); } 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; - switch ( weight ) - { - case wxFONTWEIGHT_BOLD: - boldness = _T("bold"); - break; - - case wxFONTWEIGHT_LIGHT: - boldness = _T("light"); - break; - - default: - wxFAIL_MSG( _T("unknown font weight") ); - // fall through - - case wxFONTWEIGHT_NORMAL: - // unspecified - boldness = _T("medium"); - } - - m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness); - } -#endif + m_nativeFontInfo.SetWeight((wxFontWeight)weight); } void wxFontRefData::SetUnderlined(bool underlined) @@ -601,29 +320,12 @@ void wxFontRefData::SetFaceName(const wxString& facename) { m_faceName = facename; -#ifndef __WXGTK20__ - if ( HasNativeFont() ) - { - m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename); - } -#endif + m_nativeFontInfo.SetFaceName(facename); } void wxFontRefData::SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; - -#ifndef __WXGTK20__ - if ( HasNativeFont() ) - { - wxNativeEncodingInfo info; - if ( wxGetNativeFontEncoding(encoding, &info) ) - { - m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry); - m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding); - } - } -#endif } void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) @@ -651,7 +353,6 @@ wxFont::wxFont(const wxNativeFontInfo& info) { Init(); -#ifdef __WXGTK20__ Create( info.GetPointSize(), info.GetFamily(), info.GetStyle(), @@ -659,9 +360,6 @@ wxFont::wxFont(const wxNativeFontInfo& info) info.GetUnderlined(), info.GetFaceName(), info.GetEncoding() ); -#else - (void) Create(info.GetXFontName()); -#endif } bool wxFont::Create( int pointSize, @@ -721,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 @@ -763,43 +493,28 @@ 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() +bool wxFont::GetNoAntiAliasing() const { wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); return M_FONTDATA->m_noAA; } -wxNativeFontInfo *wxFont::GetNativeFontInfo() const +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 - wxString spacing = M_FONTDATA-> - m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING); - - return spacing.Upper() == _T('M'); - } -#endif - return wxFontBase::IsFixedWidth(); } @@ -869,102 +584,3 @@ void wxFont::SetNoAntiAliasing( bool no ) 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 -extern GdkFont *GtkGetDefaultGuiFont() -{ - if (!g_systemDefaultGuiFont) - { - GtkWidget *widget = gtk_button_new(); - GtkStyle *def = gtk_rc_get_style( widget ); - if (def) - { - g_systemDefaultGuiFont = gdk_font_ref( def->font ); - } - else - { - def = gtk_widget_get_default_style(); - if (def) - g_systemDefaultGuiFont = gdk_font_ref( def->font ); - } - gtk_widget_destroy( widget ); - } - else - { - // already have it, but ref it once more before returning - gdk_font_ref(g_systemDefaultGuiFont); - } - - return g_systemDefaultGuiFont; -} - -GdkFont *wxFont::GetInternalFont( float scale ) const -{ - GdkFont *font = (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); - - wxScaledFontList& list = M_FONTDATA->m_scaled_xfonts; - wxScaledFontList::iterator i = list.find(int_scale); - if ( i != list.end() ) - { - font = i->second; - } - else // we don't have this font in this size yet - { - if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT)) - { - font = GtkGetDefaultGuiFont(); - } - - if ( !font ) - { - // 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); - } - } - } - - if ( font ) - { - list[int_scale] = font; - } - } - - // 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?") ); - - return font; -} -#endif // not GTK 2.0 -