X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0af0d98b5bb65da9f6b64a90dc3cfb642ee188e..848332140be2d53aea32d0702f4c0e06c149d24b:/src/gtk1/font.cpp?ds=sidebyside diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index 560d5f67c8..4d3e493fdd 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -15,10 +15,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "font.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,7 +29,7 @@ #include -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include // ---------------------------------------------------------------------------- @@ -77,20 +73,10 @@ 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 } -#ifndef __WXGTK20__ - // reinitilize the font with the gived XFLD - void ReInit(const wxString& fontname); -#endif - // 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); @@ -102,7 +88,7 @@ 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); @@ -111,7 +97,7 @@ public: // // 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__) +#if defined(__WXDEBUG__) void Dump() const { wxPrintf(_T("%s-%s-%s-%d-%d\n"), @@ -144,10 +130,8 @@ 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, @@ -195,117 +179,12 @@ void wxFontRefData::Init(int pointSize, m_encoding = encoding; m_noAA = FALSE; - -#ifdef __WXGTK20__ - // 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 - { - 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 } 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 ) ); - - // 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 // ------------------------------------- @@ -403,7 +282,6 @@ void wxFontRefData::InitFromNative() // may be give a warning here? or use wxFontMapper? m_encoding = wxFONTENCODING_SYSTEM; } -#endif // GTK 2.0/1.x } wxFontRefData::wxFontRefData( const wxFontRefData& data ) @@ -437,37 +315,14 @@ 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 + // FromString() should really work in GTK1 too, doesn't it? m_nativeFontInfo.SetXFontName(fontname); -#endif // GTK 2.0/1.x InitFromNative(); } -#ifndef __WXGTK20__ - -void wxFontRefData::ReInit(const wxString& fontname) -{ - // calling InitFromNative() resets m_underlined flag as X11 fonts are never - // underlined, but we don't want to lose its old value here so save it ... - bool underlined = m_underlined; - - m_nativeFontInfo.SetXFontName(fontname); - - InitFromNative(); - - // ... and restore it now - m_underlined = underlined; -} - -#endif // !__WXGTK20__ - void wxFontRefData::ClearGdkFonts() { -#ifndef __WXGTK20__ for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin(); i != m_scaled_xfonts.end(); ++i ) @@ -477,7 +332,6 @@ void wxFontRefData::ClearGdkFonts() } m_scaled_xfonts.clear(); -#endif // GTK 1.x } wxFontRefData::~wxFontRefData() @@ -493,12 +347,6 @@ 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; @@ -509,7 +357,6 @@ void wxFontRefData::SetPointSize(int pointSize) m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size); } -#endif } void wxFontRefData::SetFamily(int family) @@ -523,26 +370,6 @@ 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; @@ -566,34 +393,12 @@ 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; @@ -618,7 +423,6 @@ void wxFontRefData::SetWeight(int weight) m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness); } -#endif } void wxFontRefData::SetUnderlined(bool underlined) @@ -632,19 +436,16 @@ 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; @@ -654,7 +455,6 @@ void wxFontRefData::SetEncoding(wxFontEncoding encoding) m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding); } } -#endif } void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) @@ -674,25 +474,9 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -void wxFont::Init() -{ -} - wxFont::wxFont(const wxNativeFontInfo& info) { - Init(); - -#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, @@ -752,35 +536,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 @@ -794,10 +610,11 @@ 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") ); @@ -808,10 +625,13 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") ); -#ifndef __WXGTK20__ - 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(); -#endif + } return &(M_FONTDATA->m_nativeFontInfo); } @@ -820,7 +640,6 @@ 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 @@ -829,7 +648,6 @@ bool wxFont::IsFixedWidth() const return spacing.Upper() == _T('M'); } -#endif return wxFontBase::IsFixedWidth(); } @@ -905,7 +723,6 @@ void wxFont::SetNoAntiAliasing( bool 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 @@ -961,7 +778,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()); } @@ -978,10 +795,10 @@ GdkFont *wxFont::GetInternalFont( float scale ) const M_FONTDATA->m_faceName, M_FONTDATA->m_encoding, &xfontname); - if ( font ) - { - M_FONTDATA->ReInit(xfontname); - } + // NB: wxFont::GetNativeFontInfo relies on this + // side-effect of GetInternalFont + if ( int_scale == 100 ) + M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); } } @@ -997,5 +814,3 @@ GdkFont *wxFont::GetInternalFont( float scale ) const return font; } -#endif // not GTK 2.0 -