added functions for setting the columns order in wxListCtrl (modified patch 1828074)

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index d89102efb237ceea6be0a6af8f9eb427dfc115cc..b7a026e5b6ce71837f808a776574808586fa1b92 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -17,19 +17,91 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "fontenum.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_FONTENUM
+
+#include "wx/fontenum.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/dynarray.h"
-#include "wx/string.h"

 #include "wx/regex.h"
 #include "wx/regex.h"

-#include "wx/utils.h"
-

 #include "wx/fontmap.h"
 #include "wx/fontmap.h"

-#include "wx/fontenum.h"

 #include "wx/fontutil.h"
 #include "wx/fontutil.h"

+#include "wx/encinfo.h"
+
+// ----------------------------------------------------------------------------
+// Pango
+// ----------------------------------------------------------------------------
+
+#if wxUSE_PANGO
+
+#include "pango/pango.h"
+
+#ifdef __WXGTK20__
+#include "gtk/gtk.h"
+extern GtkWidget *wxGetRootWindow();
+#endif // __WXGTK20__
+
+extern "C" int wxCMPFUNC_CONV
+wxCompareFamilies (const void *a, const void *b)
+{
+  const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
+  const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);
+
+  return g_utf8_collate (a_name, b_name);
+}
+
+bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
+                                          bool fixedWidthOnly)
+{
+    if ( encoding != wxFONTENCODING_SYSTEM && encoding != wxFONTENCODING_UTF8 )
+    {
+        // Pango supports only UTF-8 encoding (and system means any, so we
+        // accept it too)
+        return false;
+    }
+
+    PangoFontFamily **families = NULL;
+    gint n_families = 0;
+    pango_context_list_families (
+#ifdef __WXGTK20__
+        gtk_widget_get_pango_context( wxGetRootWindow() ),
+#else
+        wxTheApp->GetPangoContext(),
+#endif
+        &families, &n_families );
+    qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareFamilies);
+
+    for ( int i = 0; i < n_families; i++ )
+    {
+#if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+        if ( !fixedWidthOnly ||
+            pango_font_family_is_monospace(families[i]) )
+#endif
+        {
+            const gchar *name = pango_font_family_get_name(families[i]);
+            OnFacename(wxString(name, wxConvUTF8));
+        }
+    }
+    g_free(families);
+
+    return true;
+}
+
+bool wxFontEnumerator::EnumerateEncodings(const wxString& facename)
+{
+    return EnumerateEncodingsUTF8(facename);
+}
+
+
+#else // !wxUSE_PANGO

 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here
 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here


@@ -67,6 +139,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

+#if !wxUSE_NANOX

 static char **CreateFontList(wxChar spacing,
                              wxFontEncoding encoding,
                              int *nFonts)
 static char **CreateFontList(wxChar spacing,
                              wxFontEncoding encoding,
                              int *nFonts)


@@ -78,7 +151,7 @@ static char **CreateFontList(wxChar spacing,
     if ( !wxTestFontEncoding(info) )
     {
         // ask font mapper for a replacement
     if ( !wxTestFontEncoding(info) )
     {
         // ask font mapper for a replacement

-        (void)wxTheFontMapper->GetAltForEncoding(encoding, &info);
+        (void)wxFontMapper::Get()->GetAltForEncoding(encoding, &info);

     }
 #endif // wxUSE_FONTMAP
 
     }
 #endif // wxUSE_FONTMAP
 


@@ -106,7 +179,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
     {
         char *font = fonts[n];
 #if wxUSE_REGEX
     {
         char *font = fonts[n];
 #if wxUSE_REGEX

-        if ( re.Matches(font) )
+        if ( !re.Matches(font) )

 #else // !wxUSE_REGEX
         if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
 #endif // wxUSE_REGEX/!wxUSE_REGEX
 #else // !wxUSE_REGEX
         if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
 #endif // wxUSE_REGEX/!wxUSE_REGEX


@@ -115,6 +188,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
             continue;
         }
 
             continue;
         }
 

+        // coverity[returned_null]

         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');
         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');


@@ -126,7 +200,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
             if ( !This->OnFacename(fam) )
             {
                 // stop enumerating
             if ( !This->OnFacename(fam) )
             {
                 // stop enumerating

-                return FALSE;
+                return false;

             }
 
             families.Add(fam);
             }
 
             families.Add(fam);


@@ -134,8 +208,10 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
         //else: already seen
     }
 
         //else: already seen
     }
 

-    return TRUE;
+    return true;

 }
 }

+#endif
+  // wxUSE_NANOX

 
 // ----------------------------------------------------------------------------
 // wxFontEnumerator
 
 // ----------------------------------------------------------------------------
 // wxFontEnumerator


@@ -144,12 +220,15 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {

+#if wxUSE_NANOX
+    return false;
+#else

     int nFonts;
     char **fonts;
 
     if ( fixedWidthOnly )
     {
     int nFonts;
     char **fonts;
 
     if ( fixedWidthOnly )
     {

-        bool cont = TRUE;
+        bool cont = true;

         fonts = CreateFontList(wxT('m'), encoding, &nFonts);
         if ( fonts )
         {
         fonts = CreateFontList(wxT('m'), encoding, &nFonts);
         if ( fonts )
         {


@@ -160,13 +239,13 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
         if ( !cont )
         {
 
         if ( !cont )
         {

-            return TRUE;
+            return true;

         }
 
         fonts = CreateFontList(wxT('c'), encoding, &nFonts);
         if ( !fonts )
         {
         }
 
         fonts = CreateFontList(wxT('c'), encoding, &nFonts);
         if ( !fonts )
         {

-            return TRUE;
+            return true;

         }
     }
     else
         }
     }
     else


@@ -180,22 +259,26 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
             wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
                          wxT("No fonts at all on this system?"));
 
             wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
                          wxT("No fonts at all on this system?"));
 

-            return FALSE;
+            return false;

         }
     }
 
     (void)ProcessFamiliesFromFontList(this, fonts, nFonts);
 
     XFreeFontNames(fonts);
         }
     }
 
     (void)ProcessFamiliesFromFontList(this, fonts, nFonts);
 
     XFreeFontNames(fonts);

-
-    return TRUE;
+    return true;
+#endif
+    // wxUSE_NANOX

 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {

+#if wxUSE_NANOX
+    return false;
+#else

     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),

-                   family.IsEmpty() ? wxT("*") : family.c_str());
+                   family.empty() ? wxT("*") : family.c_str());

 
     // get the list of all fonts
     int nFonts;
 
     // get the list of all fonts
     int nFonts;


@@ -205,7 +288,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     if ( !fonts )
     {
         // unknown family?
     if ( !fonts )
     {
         // unknown family?

-        return FALSE;
+        return false;

     }
 
     // extract the list of (unique) encodings
     }
 
     // extract the list of (unique) encodings


@@ -225,7 +308,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
         dash = strchr(familyFont, '-');
         *dash = '\0'; // !NULL because Matches() above succeeded
 
         dash = strchr(familyFont, '-');
         *dash = '\0'; // !NULL because Matches() above succeeded
 

-        if ( !family.IsEmpty() && (family != familyFont) )
+        if ( !family.empty() && (family != familyFont) )

         {
             // family doesn't match
             continue;
         {
             // family doesn't match
             continue;


@@ -256,5 +339,11 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     XFreeFontNames(fonts);
 
 
     XFreeFontNames(fonts);
 

-    return TRUE;
+    return true;
+#endif
+    // wxUSE_NANOX

 }
 }

+
+#endif // !wxUSE_PANGO
+
+#endif // wxUSE_FONTENUM