X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..8d361e835331bd48245957e1ca9461d1b119f7f8:/src/unix/fontutil.cpp diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index cf77187acb..93df3b0ced 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/fontutil.cpp +// Name: src/unix/fontutil.cpp // Purpose: Font helper functions for X11 (GDK/X) // Author: Vadim Zeitlin // Modified by: @@ -24,16 +24,20 @@ #pragma hdrstop #endif +#include "wx/fontutil.h" + #ifndef WX_PRECOMP + #include "wx/app.h" #include "wx/font.h" // wxFont enums #include "wx/encinfo.h" + #include "wx/hash.h" + #include "wx/utils.h" // for wxGetDisplay() #endif // PCH -#include "wx/fontutil.h" #include "wx/fontmap.h" #include "wx/tokenzr.h" -#include "wx/hash.h" #include "wx/module.h" +#include "wx/fontenum.h" #if wxUSE_PANGO @@ -122,7 +126,7 @@ wxFontWeight wxNativeFontInfo::GetWeight() const bool wxNativeFontInfo::GetUnderlined() const { - return FALSE; + return false; } wxString wxNativeFontInfo::GetFaceName() const @@ -139,7 +143,11 @@ wxFontFamily wxNativeFontInfo::GetFamily() const // around a bug in the 64-bit glib shipped with solaris 10, -1 causes it // to try to allocate 2^32 bytes. const char *family_name = pango_font_description_get_family( description ); - char *family_text = g_ascii_strdown( family_name, family_name ? strlen( family_name ) : 0 ); + if ( !family_name ) + return ret; + + wxGtkString family_text(g_ascii_strdown(family_name, strlen(family_name))); + // Check for some common fonts, to salvage what we can from the current win32 centric wxFont API: if (strncmp( family_text, "monospace", 9 ) == 0) ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace" @@ -197,7 +205,6 @@ wxFontFamily wxNativeFontInfo::GetFamily() const ret = wxFONTFAMILY_DECORATIVE; // Begins with "Old" - "Old English", "Old Town" } - free(family_text); return ret; } @@ -254,9 +261,10 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) wxFAIL_MSG( _T("not implemented") ); } -void wxNativeFontInfo::SetFaceName(const wxString& facename) +bool wxNativeFontInfo::SetFaceName(const wxString& facename) { - pango_font_description_set_family( description, wxGTK_CONV(facename) ); + pango_font_description_set_family(description, wxGTK_CONV_SYS(facename)); + return true; } void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family)) @@ -276,18 +284,45 @@ bool wxNativeFontInfo::FromString(const wxString& s) if (description) pango_font_description_free( description ); - description = pango_font_description_from_string( wxGTK_CONV( s ) ); + // there is a bug in at least pango <= 1.13 which makes it (or its backends) + // segfault for very big point sizes and for negative point sizes. + // To workaround that bug for pango <= 1.13 + // (see http://bugzilla.gnome.org/show_bug.cgi?id=340229) + // we do the check on the size here using same (arbitrary) limits used by + // pango > 1.13. Note that the segfault could happen also for pointsize + // smaller than this limit !! + wxString str(s); + const size_t pos = str.find_last_of(_T(" ")); + double size; + if ( pos != wxString::npos && wxString(str, pos + 1).ToDouble(&size) ) + { + wxString sizeStr; + if ( size < 1 ) + sizeStr = _T("1"); + else if ( size >= 1E6 ) + sizeStr = _T("1E6"); + + if ( !sizeStr.empty() ) + { + // replace the old size with the adjusted one + str = wxString(s, 0, pos) + sizeStr; + } + } + + description = pango_font_description_from_string( wxGTK_CONV_SYS( str ) ); + + // ensure a valid facename is selected + if (!wxFontEnumerator::IsValidFacename(GetFaceName())) + SetFaceName(wxNORMAL_FONT->GetFaceName()); - return TRUE; + return true; } wxString wxNativeFontInfo::ToString() const { - char *str = pango_font_description_to_string( description ); - wxString tmp = wxGTK_CONV_BACK( str ); - g_free( str ); + wxGtkString str(pango_font_description_to_string( description )); - return tmp; + return wxGTK_CONV_BACK(str); } bool wxNativeFontInfo::FromUserString(const wxString& s) @@ -304,9 +339,9 @@ wxString wxNativeFontInfo::ToUserString() const // wxNativeEncodingInfo // ---------------------------------------------------------------------------- -bool wxNativeEncodingInfo::FromString(const wxString& s) +bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s)) { - return FALSE; + return false; } wxString wxNativeEncodingInfo::ToString() const @@ -314,24 +349,19 @@ wxString wxNativeEncodingInfo::ToString() const return wxEmptyString; } -bool wxTestFontEncoding(const wxNativeEncodingInfo& info) +bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info)) { - return TRUE; + return true; } bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info) { - // we *must* return true for default encoding as otherwise wxFontMapper - // considers that we can't load any font and aborts with wxLogFatalError! - if ( encoding == wxFONTENCODING_SYSTEM ) - { - info->facename.clear(); - info->encoding = wxFONTENCODING_SYSTEM; - } + // all encodings are available in GTK+ 2 because we translate text in any + // encoding to UTF-8 internally anyhow + info->facename.clear(); + info->encoding = encoding; - // pretend that we support everything, it's better than to always return - // false as the old code did return true; } @@ -348,7 +378,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, #pragma message enable nosimpint #endif - #include "wx/utils.h" // for wxGetDisplay() #elif defined(__WXGTK__) // we have to declare struct tm to avoid problems with first forward // declaring it in C code (glib.h included from gdk.h does it) and then @@ -431,28 +460,28 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) wxString encid = tokenizer.GetNextToken(); long enc; if ( !encid.ToLong(&enc) ) - return FALSE; + return false; encoding = (wxFontEncoding)enc; xregistry = tokenizer.GetNextToken(); if ( !xregistry ) - return FALSE; + return false; xencoding = tokenizer.GetNextToken(); if ( !xencoding ) - return FALSE; + return false; // ok even if empty facename = tokenizer.GetNextToken(); - return TRUE; + return true; } wxString wxNativeEncodingInfo::ToString() const { wxString s; s << (long)encoding << _T(';') << xregistry << _T(';') << xencoding; - if ( !!facename ) + if ( !facename.empty() ) { s << _T(';') << facename; } @@ -466,7 +495,7 @@ wxString wxNativeEncodingInfo::ToString() const void wxNativeFontInfo::Init() { - m_isDefault = TRUE; + m_isDefault = true; } bool wxNativeFontInfo::FromString(const wxString& s) @@ -476,13 +505,13 @@ bool wxNativeFontInfo::FromString(const wxString& s) // check the version wxString token = tokenizer.GetNextToken(); if ( token != _T('0') ) - return FALSE; + return false; xFontName = tokenizer.GetNextToken(); // this should be the end if ( tokenizer.HasMoreTokens() ) - return FALSE; + return false; return FromXFontName(xFontName); } @@ -512,13 +541,13 @@ bool wxNativeFontInfo::HasElements() const wxString wxNativeFontInfo::GetXFontComponent(wxXLFDField field) const { - wxCHECK_MSG( field < wxXLFD_MAX, _T(""), _T("invalid XLFD field") ); + wxCHECK_MSG( field < wxXLFD_MAX, wxEmptyString, _T("invalid XLFD field") ); if ( !HasElements() ) { // const_cast if ( !((wxNativeFontInfo *)this)->FromXFontName(xFontName) ) - return _T(""); + return wxEmptyString; } return fontElements[field]; @@ -531,7 +560,7 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) // skip the leading, usually empty field (font name registry) if ( !tokenizer.HasMoreTokens() ) - return FALSE; + return false; (void)tokenizer.GetNextToken(); @@ -540,14 +569,14 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) if ( !tokenizer.HasMoreTokens() ) { // not enough elements in the XLFD - or maybe an alias - return FALSE; + return false; } wxString field = tokenizer.GetNextToken(); if ( !field.empty() && field != _T('*') ) { // we're really initialized now - m_isDefault = FALSE; + m_isDefault = false; } fontElements[n] = field; @@ -555,9 +584,9 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) // this should be all if ( tokenizer.HasMoreTokens() ) - return FALSE; + return false; - return TRUE; + return true; } wxString wxNativeFontInfo::GetXFontName() const @@ -615,7 +644,7 @@ void wxNativeFontInfo::SetXFontName(const wxString& xFontName_) xFontName = xFontName_; - m_isDefault = FALSE; + m_isDefault = false; } int wxNativeFontInfo::GetPointSize() const @@ -668,7 +697,7 @@ wxFontWeight wxNativeFontInfo::GetWeight() const bool wxNativeFontInfo::GetUnderlined() const { // X fonts are never underlined - return FALSE; + return false; } wxString wxNativeFontInfo::GetFaceName() const @@ -753,12 +782,13 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) // can't do this under X } -void wxNativeFontInfo::SetFaceName(const wxString& facename) +bool wxNativeFontInfo::SetFaceName(const wxString& facename) { SetXFontComponent(wxXLFD_FAMILY, facename); + return true; } -void wxNativeFontInfo::SetFamily(wxFontFamily family) +void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family)) { // wxFontFamily -> X foundry, anyone? wxFAIL_MSG( _T("not implemented") ); @@ -783,7 +813,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info) { - wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") ); + wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") ); if ( encoding == wxFONTENCODING_DEFAULT ) { @@ -860,12 +890,12 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, default: // don't know how to translate this encoding into X fontspec - return FALSE; + return false; } info->encoding = encoding; - return TRUE; + return true; } bool wxTestFontEncoding(const wxNativeEncodingInfo& info) @@ -929,7 +959,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, wxNativeFont font = 0; // if we already have the X font name, try to use it - if( xFontName && !xFontName->IsEmpty() ) + if( xFontName && !xFontName->empty() ) { // // Make sure point size is correct for scale factor. @@ -1042,7 +1072,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, if ( !font ) { font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL, - FALSE, wxEmptyString, + false, wxEmptyString, info.xregistry, info.xencoding, xFontName); @@ -1055,7 +1085,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL, - FALSE, wxEmptyString, + false, wxEmptyString, _T("*"), _T("*"), xFontName); } @@ -1071,20 +1101,20 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, // private functions // ---------------------------------------------------------------------------- -// returns TRUE if there are any fonts matching this font spec +// returns true if there are any fonts matching this font spec static bool wxTestFontSpec(const wxString& fontspec) { // some X servers will fail to load this font because there are too many // matches so we must test explicitly for this if ( fontspec == _T("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") ) { - return TRUE; + return true; } wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec ); if (test) { - return TRUE; + return true; } test = wxLoadFont(fontspec); @@ -1094,11 +1124,11 @@ static bool wxTestFontSpec(const wxString& fontspec) { wxFreeFont(test); - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -1195,7 +1225,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize, #else wxString fontSpec; - if (!facename.IsEmpty()) + if (!facename.empty()) { fontSpec.Printf(wxT("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str()); @@ -1393,7 +1423,7 @@ bool wxFontModule::OnInit() { g_fontHash = new wxHashTable( wxKEY_STRING ); - return TRUE; + return true; } void wxFontModule::OnExit() @@ -1404,4 +1434,3 @@ void wxFontModule::OnExit() } #endif // GTK 2.0/1.x -