Commited Bryan Petty's blind fix patch.

[wxWidgets.git] / src / unix / fontutil.cpp

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 5230c5a09e912c0285cf8f774764540c8c1afa23..93df3b0ced18602095f28df0ef3e5ad5de3ddfd8 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -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/module.h"
+#include "wx/fontenum.h"
 
 #if wxUSE_PANGO
 
@@ -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_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_SYS( 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;
 }
 
 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)
@@ -343,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
@@ -748,9 +782,10 @@ 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 WXUNUSED(family))