fixed typo (missing comma) in MIME test

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index bb2dbed7895196e0087e6d604336fefc450ef3c0..bc76c80086df7ab67ad50027e7e7fa217dcef8ca 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -24,11 +24,21 @@
 #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


@@ -39,7 +49,7 @@ static char **CreateFontList(wxChar spacing, wxFontEncoding encoding,
                              int *nFonts);
 
 // extract all font families from the given font list and call our
                              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);
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts);


@@ -57,16 +67,27 @@ 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)
 {

-    wxString xencoding, xregistry;
-    wxGetXFontEncoding(encoding, &xregistry, &xencoding);
+    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;
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),
 
     wxString pattern;
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),

-                   spacing, xregistry.c_str(), xencoding.c_str());
+                   spacing,
+                   info.xregistry.c_str(),
+                   info.xencoding.c_str());

 
     // get the list of all fonts
     return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts);
 
     // get the list of all fonts
     return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts);


@@ -76,17 +97,25 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts)
 {
                                         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 wxUSE_REGEX
+        if ( !re.Matches(font) )
+#else // !wxUSE_REGEX

         if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
         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, '-');
         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');


@@ -95,7 +124,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 
         if ( families.Index(fam) == wxNOT_FOUND )
         {
 
         if ( families.Index(fam) == wxNOT_FOUND )
         {

-            if ( !This->OnFontFamily(fam) )
+            if ( !This->OnFacename(fam) )

             {
                 // stop enumerating
                 return FALSE;
             {
                 // stop enumerating
                 return FALSE;


@@ -108,14 +137,19 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 
     return TRUE;
 }
 
     return TRUE;
 }

+#endif
+  // wxUSE_NANOX

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

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

 {
 {

+#if wxUSE_NANOX
+    return FALSE;
+#else

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


@@ -159,12 +193,16 @@ bool wxFontEnumerator::EnumerateFamilies(wxFontEncoding encoding,
     (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-*-*-*-*-*-*-*-*-*-*-*-*"),
                    family.IsEmpty() ? wxT("*") : family.c_str());
     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
                    family.IsEmpty() ? wxT("*") : family.c_str());


@@ -229,4 +267,6 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     XFreeFontNames(fonts);
 
     return TRUE;
     XFreeFontNames(fonts);
 
     return TRUE;

+#endif
+    // wxUSE_NANOX

 }
 }