added a note about where to find makegen

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index fdc00b91422ed147845829ca2c16cfdef894f378..a1d374896eee08ef33c08ab9ca2fa7124d2c5d7e 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -26,7 +26,9 @@
 #include "wx/string.h"
 #include "wx/utils.h"
 
+#include "wx/fontmap.h"
 #include "wx/fontenum.h"
+#include "wx/fontutil.h"
 
 #include <X11/Xlib.h>
 
@@ -34,11 +36,12 @@
 // private functions
 // ----------------------------------------------------------------------------
 
-// create the list of all fonts with the given spacing
-static char **CreateFontList(wxChar spacing, int *nFonts);
+// create the list of all fonts with the given spacing and encoding
+static char **CreateFontList(wxChar spacing, wxFontEncoding encoding,
+                             int *nFonts);
 
 // extract all font families from the given font list and call our
-// OnFontFamily() for each of them
+// OnFacename() for each of them
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts);
@@ -56,13 +59,27 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // helpers
 // ----------------------------------------------------------------------------
 
-static char **CreateFontList(wxChar spacing, int *nFonts)
+static char **CreateFontList(wxChar spacing,
+                             wxFontEncoding encoding,
+                             int *nFonts)
 {
+    wxNativeEncodingInfo info;
+    wxGetNativeFontEncoding(encoding, &info);
+
+    if ( !wxTestFontEncoding(info) )
+    {
+        // ask font mapper for a replacement
+        (void)wxTheFontMapper->GetAltForEncoding(encoding, &info);
+    }
+
     wxString pattern;
-    pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-*-*"), spacing);
+    pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),
+                   spacing,
+                   info.xregistry.c_str(),
+                   info.xencoding.c_str());
 
     // get the list of all fonts
-    return XListFonts((Display *)wxGetDisplay(), pattern, 32767, nFonts);
+    return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts);
 }
 
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
@@ -74,26 +91,27 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];
-        if ( !wxString(font).Matches("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") )
+        if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
         {
             // it's not a full font name (probably an alias)
             continue;
         }
-        
+
         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');
         *dash = '\0'; // !NULL because Matches() above succeeded
+        wxString fam(family);
 
-        if ( families.Index(family) == wxNOT_FOUND )
+        if ( families.Index(fam) == wxNOT_FOUND )
         {
-            if ( !This->OnFontFamily(family) )
+            if ( !This->OnFacename(fam) )
             {
                 // stop enumerating
                 return FALSE;
             }
 
-            families.Add(family);
+            families.Add(fam);
         }
         //else: already seen
     }
@@ -105,7 +123,8 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
 
-bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
+bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
+                                          bool fixedWidthOnly)
 {
     int nFonts;
     char **fonts;
@@ -113,7 +132,7 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
     if ( fixedWidthOnly )
     {
         bool cont = TRUE;
-        fonts = CreateFontList(wxT('m'), &nFonts);
+        fonts = CreateFontList(wxT('m'), encoding, &nFonts);
         if ( fonts )
         {
             cont = ProcessFamiliesFromFontList(this, fonts, nFonts);
@@ -126,7 +145,7 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
             return TRUE;
         }
 
-        fonts = CreateFontList(wxT('c'), &nFonts);
+        fonts = CreateFontList(wxT('c'), encoding, &nFonts);
         if ( !fonts )
         {
             return TRUE;
@@ -134,11 +153,14 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
     }
     else
     {
-        fonts = CreateFontList(wxT('*'), &nFonts);
+        fonts = CreateFontList(wxT('*'), encoding, &nFonts);
 
         if ( !fonts )
         {
-            wxFAIL_MSG(wxT("No fonts at all on this system?"));
+            // it's ok if there are no fonts in given encoding - but it's not
+            // ok if there are no fonts at all
+            wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
+                         wxT("No fonts at all on this system?"));
 
             return FALSE;
         }
@@ -159,7 +181,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     // get the list of all fonts
     int nFonts;
-    char **fonts = XListFonts((Display *)wxGetDisplay(), pattern,
+    char **fonts = XListFonts((Display *)wxGetDisplay(), pattern.mb_str(),
                               32767, &nFonts);
 
     if ( !fonts )
@@ -173,7 +195,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];
-        if ( !wxString(font).Matches("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") )
+        if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
         {
             // it's not a full font name (probably an alias)
             continue;