Committing in .

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index fdc00b91422ed147845829ca2c16cfdef894f378..63bcf5c4fccfa7a144b5c91ccb0a5a8a220d1194 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -24,21 +24,32 @@
 #include "wx/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"

+#include "wx/regex.h"

 #include "wx/utils.h"
 
 #include "wx/utils.h"
 

+#include "wx/fontmap.h"

 #include "wx/fontenum.h"
 #include "wx/fontenum.h"

+#include "wx/fontutil.h"

 
 

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

 #include <X11/Xlib.h>
 #include <X11/Xlib.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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
 
 // 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);
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts);


@@ -56,44 +67,69 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

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

 {
 {

+    wxNativeEncodingInfo info;
+    wxGetNativeFontEncoding(encoding, &info);
+
+#if wxUSE_FONTMAP
+    if ( !wxTestFontEncoding(info) )
+    {
+        // ask font mapper for a replacement
+        (void)wxTheFontMapper->GetAltForEncoding(encoding, &info);
+    }
+#endif // wxUSE_FONTMAP
+

     wxString pattern;
     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
 
     // 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,
                                         char **fonts,
                                         int nFonts)
 {
 }
 
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts)
 {

+#if wxUSE_REGEX
+    wxRegEx re(wxT("^(-[^-]*){14}$"), wxRE_NOSUB);
+#endif // wxUSE_REGEX
+

     // extract the list of (unique) font families
     wxSortedArrayString families;
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];
     // extract the list of (unique) font families
     wxSortedArrayString families;
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];

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

         {
             // it's not a full font name (probably an alias)
             continue;
         }
         {
             // 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
         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;
             }
 
             {
                 // stop enumerating
                 return FALSE;
             }
 

-            families.Add(family);
+            families.Add(fam);

         }
         //else: already seen
     }
         }
         //else: already seen
     }


@@ -105,7 +141,8 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
 
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
 

-bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
+bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
+                                          bool fixedWidthOnly)

 {
     int nFonts;
     char **fonts;
 {
     int nFonts;
     char **fonts;


@@ -113,7 +150,7 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
     if ( fixedWidthOnly )
     {
         bool cont = TRUE;
     if ( fixedWidthOnly )
     {
         bool cont = TRUE;

-        fonts = CreateFontList(wxT('m'), &nFonts);
+        fonts = CreateFontList(wxT('m'), encoding, &nFonts);

         if ( fonts )
         {
             cont = ProcessFamiliesFromFontList(this, fonts, nFonts);
         if ( fonts )
         {
             cont = ProcessFamiliesFromFontList(this, fonts, nFonts);


@@ -126,7 +163,7 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
             return TRUE;
         }
 
             return TRUE;
         }
 

-        fonts = CreateFontList(wxT('c'), &nFonts);
+        fonts = CreateFontList(wxT('c'), encoding, &nFonts);

         if ( !fonts )
         {
             return TRUE;
         if ( !fonts )
         {
             return TRUE;


@@ -134,11 +171,14 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly)
     }
     else
     {
     }
     else
     {

-        fonts = CreateFontList(wxT('*'), &nFonts);
+        fonts = CreateFontList(wxT('*'), encoding, &nFonts);

 
         if ( !fonts )
         {
 
         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;
         }
 
             return FALSE;
         }


@@ -159,7 +199,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     // get the list of all fonts
     int nFonts;
 
     // 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 )
                               32767, &nFonts);
 
     if ( !fonts )


@@ -173,7 +213,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];
     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;
         {
             // it's not a full font name (probably an alias)
             continue;