use WXDFB_FONTPATH variable instead of WXDFB_FONTDIR and search the dirs recursively...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dfb/private/fontmgr.h b/include/wx/dfb/private/fontmgr.h
index c3bd74e73f1e951c9e2c56f7c997ab0b4c6bcd3c..3011384062a8f375eae7995e50f8a8c456089555 100644 (file)
--- a/include/wx/dfb/private/fontmgr.h
+++ b/include/wx/dfb/private/fontmgr.h
@@ -72,6 +72,7 @@ public:
 private:
     // adds all fonts using AddBundle()
     void AddAllFonts();
+    void AddFontsFromDir(const wxString& indexFile);
     void AddFont(const wxString& dir, const wxString& name, wxFileConfig& cfg);
     void SetDefaultFonts(wxFileConfig& cfg);
 

diff --git a/src/dfb/fontmgr.cpp b/src/dfb/fontmgr.cpp
index 53849e210de473fb40c6d52764e6e001969b22e0..76b09cf1b381d4e35c08c6156d8177f6446775a3 100644 (file)
--- a/src/dfb/fontmgr.cpp
+++ b/src/dfb/fontmgr.cpp
@@ -18,6 +18,8 @@
 
 #include "wx/fileconf.h"
 #include "wx/filename.h"
+#include "wx/tokenzr.h"
+#include "wx/dir.h"
 
 #include "wx/private/fontmgr.h"
 #include "wx/dfb/wrapdfb.h"
@@ -91,13 +93,16 @@ wxFontBundle::wxFontBundle(const wxString& name,
 // ----------------------------------------------------------------------------
 
 /*
-   The code below parses font configuration file ${WXDFB_FONTDIR}/FontsIndex.
-   By default, the directory is $prefix/share/wx/fonts, but can be ovewritten
-   by setting WXDFB_FONTDIR environment variable.
+   The code below looks up and parses font configuration files FontsIndex.
+   The files are looked up in directories specified in the WXDFB_FONTPATH
+   environment variable (separated with :, similarly to the PATH variable).
+   If the variable is not set, $prefix/share/wx/fonts directory is used.
+   All subdirectories of directories on the path are scanned for FontsIndex
+   files.
 
-   The file is standard wxFileConfig file text file. Each toplevel group
-   specifies one font bundle, font's name is the name of group. Group's entries
-   look like this:
+   The FontsIndex file is standard wxFileConfig file text file. Each toplevel
+   group specifies one font bundle, font's name is the name of group. Group's
+   entries look like this:
 
    [Font Name]
    # font files (at least one of them must be present):
@@ -125,14 +130,42 @@ wxFontBundle::wxFontBundle(const wxString& name,
 
 void wxFontsManager::AddAllFonts()
 {
-    wxString dir = _T(wxINSTALL_PREFIX "/share/wx/fonts");
-    wxGetEnv(_T("WXDFB_FONTDIR"), &dir);
+    wxString path;
+    if ( !wxGetEnv(_T("WXDFB_FONTPATH"), &path) )
+        path = _T(wxINSTALL_PREFIX "/share/wx/fonts");
 
-    wxString indexFile = dir + _T("/FontsIndex");
+    wxStringTokenizer tkn(path, wxPATH_SEP);
+    while ( tkn.HasMoreTokens() )
+    {
+        wxString dir = tkn.GetNextToken();
+
+        wxArrayString indexFiles;
+        if ( !wxDir::GetAllFiles(dir, &indexFiles, _T("FontsIndex")) )
+            continue;
+
+        for ( wxArrayString::const_iterator i = indexFiles.begin();
+              i != indexFiles.end(); ++i )
+        {
+            AddFontsFromDir(*i);
+        }
+    }
+
+    if ( GetBundles().empty() )
+    {
+        // wxDFB is unusable without fonts, so terminate the app
+        wxLogFatalError(_("No fonts found in %s."), path.c_str());
+    }
+}
+
+void wxFontsManager::AddFontsFromDir(const wxString& indexFile)
+{
+    wxFileName fn(indexFile);
+    wxString dir = fn.GetPath();
 
-    if ( !wxFileName::FileExists(indexFile) )
+    if ( !fn.FileExists() )
     {
-        wxLogWarning(_("No fonts found in %s"), dir.c_str());
+        wxLogWarning(_("Fonts index file %s disappeared while loading fonts."),
+                     indexFile.c_str());
         return;
     }