X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d332c5145608d5ba89d75b60be6ed3aa7f60846a..760f0fc2f4b875beb06e5ecd6d69b891d8360efe:/src/gtk/font.cpp?ds=inline diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 4bc698751a..30330dd02d 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/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" @@ -77,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 @@ -102,26 +93,6 @@ public: // 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, @@ -139,18 +110,13 @@ 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, m_weight; bool m_underlined; wxString m_faceName; - wxFontEncoding m_encoding; // Unused under GTK 2.0 + wxFontEncoding m_encoding; bool m_noAA; // No anti-aliasing // The native font info, basicly an XFLD under GTK 1.2 and @@ -191,14 +157,14 @@ void wxFontRefData::Init(int pointSize, 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) ); + pango_font_description_set_family( m_nativeFontInfo.description, + wxGTK_CONV_SYS(m_faceName) ); } else { @@ -222,14 +188,12 @@ 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; @@ -265,107 +229,8 @@ void wxFontRefData::InitFromNative() // 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 - // ------------------------------------- - - 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 + // always with GTK+ 2 + m_encoding = wxFONTENCODING_UTF8; } wxFontRefData::wxFontRefData( const wxFontRefData& data ) @@ -399,29 +264,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() @@ -437,20 +286,7 @@ void wxFontRefData::SetPointSize(int pointSize) { m_pointSize = pointSize; -#ifdef __WXGTK20__ m_nativeFontInfo.SetPointSize(pointSize); -#else - if ( HasNativeFont() ) - { - wxString size; - if ( pointSize == -1 ) - size = _T('*'); - else - size.Printf(_T("%d"), 10*pointSize); - - m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size); - } -#endif } void wxFontRefData::SetFamily(int family) @@ -464,67 +300,14 @@ void wxFontRefData::SetStyle(int style) { m_style = style; -#ifdef __WXGTK20__ m_nativeFontInfo.SetStyle((wxFontStyle)style); -#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 } void wxFontRefData::SetWeight(int weight) { m_weight = weight; -#ifdef __WXGTK20__ m_nativeFontInfo.SetWeight((wxFontWeight)weight); -#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 } void wxFontRefData::SetUnderlined(bool underlined) @@ -538,31 +321,12 @@ void wxFontRefData::SetFaceName(const wxString& facename) { m_faceName = facename; -#ifdef __WXGTK20__ m_nativeFontInfo.SetFaceName(facename); -#else - if ( HasNativeFont() ) - { - m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename); - } -#endif } 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) @@ -582,15 +346,8 @@ 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(), @@ -598,9 +355,6 @@ wxFont::wxFont(const wxNativeFontInfo& info) info.GetUnderlined(), info.GetFaceName(), info.GetEncoding() ); -#else - (void) Create(info.GetXFontName()); -#endif } bool wxFont::Create( int pointSize, @@ -732,15 +486,14 @@ bool wxFont::GetUnderlined() const wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( Ok(), wxFONTENCODING_SYSTEM, wxT("invalid font") ); - // m_encoding is unused in wxGTK2, return encoding that the user set. return M_FONTDATA->m_encoding; } bool wxFont::GetNoAntiAliasing() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( Ok(), false, wxT("invalid font") ); return M_FONTDATA->m_noAA; } @@ -749,16 +502,6 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") ); -#ifndef __WXGTK20__ - 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); } @@ -766,17 +509,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 - wxString spacing = M_FONTDATA-> - m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING); - - return spacing.Upper() == _T('M'); - } -#endif - return wxFontBase::IsFixedWidth(); } @@ -846,102 +578,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 ( int_scale == 100 && 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); - // NB: wxFont::GetNativeFontInfo relies on this - // side-effect of GetInternalFont - if ( int_scale == 100 ) - 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 -