Replaced SOCKLEN_T by WX_SOCKLEN_T to resolve conflict with AIX system headers.

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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 08e33a21c1453a73022d5cf103c89d45c8f35026..84d09f9931dd80845ff6d33e0ab589ec785796ee 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -138,43 +138,67 @@ wxString wxNativeFontInfo::GetFaceName() const
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
 {
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
 {

-#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
-    if (g_ascii_strcasecmp( pango_font_description_get_family( description ), "monospace" ) == 0)
-        return wxFONTFAMILY_TELETYPE;
-#else
-
-    PangoFontFamily **families;
-    PangoFontFamily  *family;
-    int n_families;
-    pango_context_list_families(
+    wxFontFamily ret = wxFONTFAMILY_DEFAULT;
+    char *family_text = g_ascii_strdown( pango_font_description_get_family( description ), -1 );
+    // 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"
+    else if (strncmp( family_text, "courier", 7 ) == 0)
+        ret = wxFONTFAMILY_TELETYPE; // begins with "Courier"
+#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+    else
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+#endif
+    {
+        PangoFontFamily **families;
+        PangoFontFamily  *family = NULL;
+        int n_families;
+        pango_context_list_families(

 #ifdef __WXGTK20__
 #ifdef __WXGTK20__

-            gtk_widget_get_pango_context( wxGetRootWindow() ),
+                gtk_widget_get_pango_context( wxGetRootWindow() ),

 #else
 #else

-            wxTheApp->GetPangoContext(),
+                wxTheApp->GetPangoContext(),

 #endif
 #endif

-            &families, &n_families);
+                &families, &n_families);

 
 

-    for (int i = 0;i < n_families;++i)
-    {
-        if (g_ascii_strcasecmp(pango_font_family_get_name( families[i] ), pango_font_description_get_family( description )) == 0 )
+        for (int i = 0;i < n_families;++i)

         {
         {

-            family = families[i];
-            break;
+            if (g_ascii_strcasecmp(pango_font_family_get_name( families[i] ), pango_font_description_get_family( description )) == 0 )
+            {
+                family = families[i];
+                break;
+            }

         }
         }

-    }

 
 

-    g_free(families);
+        g_free(families);

 
 

-    wxASSERT_MSG( family, wxT("wxNativeFontInfo::GetFamily() - No appropriate PangoFontFamily found for ::description") );
+        // Some gtk+ systems might query for a non-existing font from wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)
+        // on initialization, don't assert until wxSystemSettings::GetFont is checked for this - MR
+        // wxASSERT_MSG( family, wxT("wxNativeFontInfo::GetFamily() - No appropriate PangoFontFamily found for ::description") );

 
 

-    //BCI: Cache the wxFontFamily inside the class. Validate cache with
-    //BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0
+        //BCI: Cache the wxFontFamily inside the class. Validate cache with
+        //BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0

 
 

-    if (pango_font_family_is_monospace( family ))
-        return wxFONTFAMILY_TELETYPE;
-#endif // pango_font_family_is_monospace
+        if (family != NULL && pango_font_family_is_monospace( family ))
+            ret = wxFONTFAMILY_TELETYPE; // is deemed a monospace font by pango
+    }
+#endif // gtk24 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE

 
 

-    return wxFONTFAMILY_SWISS;
+    if (ret == wxFONTFAMILY_DEFAULT)
+    {
+        if (strstr( family_text, "sans" ) != NULL) // checked before serif, so that "* Sans Serif" fonts are detected correctly
+            ret = wxFONTFAMILY_SWISS; // contains "Sans"
+        else if (strstr( family_text, "serif" ) != NULL)
+            ret = wxFONTFAMILY_ROMAN; // contains "Serif"
+        else if (strncmp( family_text, "times", 5 ) == 0)
+            ret = wxFONTFAMILY_ROMAN; // begins with "Times"
+        else if (strncmp( family_text, "old", 3 ) == 0)
+            ret = wxFONTFAMILY_DECORATIVE; // Begins with "Old" - "Old English", "Old Town"
+    }
+
+    free(family_text);
+    return ret;

 }
 
 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 }
 
 wxFontEncoding wxNativeFontInfo::GetEncoding() const


@@ -183,19 +207,46 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 }
 
 
 }
 
 

-void wxNativeFontInfo::SetPointSize(int WXUNUSED(pointsize))
+void wxNativeFontInfo::SetPointSize(int pointsize)

 {
 {

-    wxFAIL_MSG( _T("not implemented") );
+    pango_font_description_set_size( description, pointsize * PANGO_SCALE );

 }
 
 }
 

-void wxNativeFontInfo::SetStyle(wxFontStyle WXUNUSED(style))
+void wxNativeFontInfo::SetStyle(wxFontStyle style)

 {
 {

-    wxFAIL_MSG( _T("not implemented") );
+    switch (style)
+    {
+        case wxFONTSTYLE_ITALIC:
+            pango_font_description_set_style( description, PANGO_STYLE_ITALIC );
+            break;
+        case wxFONTSTYLE_SLANT:
+            pango_font_description_set_style( description, PANGO_STYLE_OBLIQUE );
+            break;
+        default:
+            wxFAIL_MSG( _T("unknown font style") );
+            // fall through
+        case wxFONTSTYLE_NORMAL:
+            pango_font_description_set_style( description, PANGO_STYLE_NORMAL );
+            break;
+    }

 }
 
 }
 

-void wxNativeFontInfo::SetWeight(wxFontWeight WXUNUSED(weight))
+void wxNativeFontInfo::SetWeight(wxFontWeight weight)

 {
 {

-    wxFAIL_MSG( _T("not implemented") );
+    switch (weight)
+    {
+        case wxFONTWEIGHT_BOLD:
+            pango_font_description_set_weight(description, PANGO_WEIGHT_BOLD);
+            break;
+        case wxFONTWEIGHT_LIGHT:
+            pango_font_description_set_weight(description, PANGO_WEIGHT_LIGHT);
+            break;
+        default:
+            wxFAIL_MSG( _T("unknown font weight") );
+            // fall through
+        case wxFONTWEIGHT_NORMAL:
+            pango_font_description_set_weight(description, PANGO_WEIGHT_NORMAL);
+    }

 }
 
 void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
 }
 
 void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))


@@ -203,9 +254,9 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     wxFAIL_MSG( _T("not implemented") );
 }
 
     wxFAIL_MSG( _T("not implemented") );
 }
 

-void wxNativeFontInfo::SetFaceName(wxString WXUNUSED(facename))
+void wxNativeFontInfo::SetFaceName(wxString facename)

 {
 {

-    wxFAIL_MSG( _T("not implemented") );
+    pango_font_description_set_family( description, wxGTK_CONV(facename) );

 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))