applying patch, fixes #10523

[wxWidgets.git] / src / dfb / fontmgr.cpp

diff --git a/src/dfb/fontmgr.cpp b/src/dfb/fontmgr.cpp
index 8d94c2300ea0e1160fb6bcd3aa60f6bdcdd10275..28f954ac5cef6c5d20f996f42b9717fb7705f2c6 100644 (file)
--- a/src/dfb/fontmgr.cpp
+++ b/src/dfb/fontmgr.cpp
@@ -17,6 +17,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/gdicmn.h"

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


@@ -37,27 +38,32 @@
 // wxFontInstance
 // ----------------------------------------------------------------------------
 
 // wxFontInstance
 // ----------------------------------------------------------------------------
 

+// This is a fake "filename" for DirectFB's builtin font (which isn't loaded
+// from a file); we can't use empty string, because that's already used for
+// "this face is not available" by wxFontsManagerBase
+#define BUILTIN_DFB_FONT_FILENAME   "/dev/null"
+

 wxFontInstance::wxFontInstance(float ptSize, bool aa,
                                const wxString& filename)
     : wxFontInstanceBase(ptSize, aa)
 {
 wxFontInstance::wxFontInstance(float ptSize, bool aa,
                                const wxString& filename)
     : wxFontInstanceBase(ptSize, aa)
 {

-    int scrSizePx, scrSizeMM;
-    wxDisplaySize(NULL, &scrSizePx);
-    wxDisplaySizeMM(NULL, &scrSizeMM);
-    double dpi = (scrSizePx / (scrSizeMM * mm2inches));

     // NB: DFB's fract_height value is 32bit integer with the last 6 bit
     //     representing fractional value, hence the multiplication by 64;
     //     1pt=1/72inch, hence "/ 72"
     // NB: DFB's fract_height value is 32bit integer with the last 6 bit
     //     representing fractional value, hence the multiplication by 64;
     //     1pt=1/72inch, hence "/ 72"

-    int pixSize = int(ptSize * dpi * 64 / 72);
+    int pixSize = int(ptSize * wxGetDisplayPPI().y * 64 / 72);

 
     DFBFontDescription desc;
     desc.flags = (DFBFontDescriptionFlags)(
                     DFDESC_ATTRIBUTES | DFDESC_FRACT_HEIGHT);
     desc.attributes = aa ? DFFA_NONE : DFFA_MONOCHROME;
     desc.fract_height = pixSize;
 
     DFBFontDescription desc;
     desc.flags = (DFBFontDescriptionFlags)(
                     DFDESC_ATTRIBUTES | DFDESC_FRACT_HEIGHT);
     desc.attributes = aa ? DFFA_NONE : DFFA_MONOCHROME;
     desc.fract_height = pixSize;

-    m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc);

 
 

-    wxASSERT_MSG( m_font, _T("cannot create font instance") );
+    if ( filename == BUILTIN_DFB_FONT_FILENAME )
+        m_font = wxIDirectFB::Get()->CreateFont(NULL, &desc);
+    else
+        m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc);
+
+    wxASSERT_MSG( m_font, "cannot create font instance" );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -136,7 +142,7 @@ wxFontBundle::wxFontBundle(const wxString& name,
 void wxFontsManager::AddAllFonts()
 {
     wxString path;
 void wxFontsManager::AddAllFonts()
 {
     wxString path;

-    if ( !wxGetEnv(_T("WXDFB_FONTPATH"), &path) )
+    if ( !wxGetEnv("WXDFB_FONTPATH", &path) )

         path = _T(wxINSTALL_PREFIX "/share/wx/fonts");
 
     wxStringTokenizer tkn(path, wxPATH_SEP);
         path = _T(wxINSTALL_PREFIX "/share/wx/fonts");
 
     wxStringTokenizer tkn(path, wxPATH_SEP);


@@ -144,8 +150,14 @@ void wxFontsManager::AddAllFonts()
     {
         wxString dir = tkn.GetNextToken();
 
     {
         wxString dir = tkn.GetNextToken();
 

+        if ( !wxDir::Exists(dir) )
+        {
+            wxLogDebug("font directory %s doesn't exist", dir);
+            continue;
+        }
+

         wxArrayString indexFiles;
         wxArrayString indexFiles;

-        if ( !wxDir::GetAllFiles(dir, &indexFiles, _T("FontsIndex")) )
+        if ( !wxDir::GetAllFiles(dir, &indexFiles, "FontsIndex") )

             continue;
 
         for ( wxArrayString::const_iterator i = indexFiles.begin();
             continue;
 
         for ( wxArrayString::const_iterator i = indexFiles.begin();


@@ -157,8 +169,23 @@ void wxFontsManager::AddAllFonts()
 
     if ( GetBundles().empty() )
     {
 
     if ( GetBundles().empty() )
     {

-        // wxDFB is unusable without fonts, so terminate the app
-        wxLogFatalError(_("No fonts found in %s."), path.c_str());
+        // We can fall back to the builtin default font if no other fonts are
+        // defined:
+        wxLogTrace("font",
+                   _("no fonts found in %s, using builtin font"), path);
+
+        AddBundle
+        (
+          new wxFontBundle
+              (
+                _("Default font"),
+                BUILTIN_DFB_FONT_FILENAME,
+                wxEmptyString,
+                wxEmptyString,
+                wxEmptyString,
+                false // IsFixed
+              )
+        );

     }
 }
 
     }
 }
 


@@ -174,7 +201,7 @@ void wxFontsManager::AddFontsFromDir(const wxString& indexFile)
         return;
     }
 
         return;
     }
 

-    wxLogTrace(_T("font"), _T("adding fonts from %s"), dir.c_str());
+    wxLogTrace("font", "adding fonts from %s", dir.c_str());

 
     wxFileConfig cfg(wxEmptyString, wxEmptyString,
                      indexFile, wxEmptyString,
 
     wxFileConfig cfg(wxEmptyString, wxEmptyString,
                      indexFile, wxEmptyString,


@@ -201,27 +228,27 @@ ReadFilePath(const wxString& name, const wxString& dir, wxFileConfig& cfg)
     if ( p.empty() || wxFileName(p).IsAbsolute() )
         return p;
 
     if ( p.empty() || wxFileName(p).IsAbsolute() )
         return p;
 

-    return dir + _T("/") + p;
+    return dir + "/" + p;

 }
 
 void wxFontsManager::AddFont(const wxString& dir,
                              const wxString& name,
                              wxFileConfig& cfg)
 {
 }
 
 void wxFontsManager::AddFont(const wxString& dir,
                              const wxString& name,
                              wxFileConfig& cfg)
 {

-    wxLogTrace(_T("font"), _T("adding font '%s'"), name.c_str());
+    wxLogTrace("font", "adding font '%s'", name.c_str());

 
 

-    wxConfigPathChanger ch(&cfg, wxString::Format(_T("/%s/"), name.c_str()));
+    wxConfigPathChanger ch(&cfg, wxString::Format("/%s/", name.c_str()));

 
     AddBundle
     (
       new wxFontBundle
           (
             name,
 
     AddBundle
     (
       new wxFontBundle
           (
             name,

-            ReadFilePath(_T("Regular"), dir, cfg),
-            ReadFilePath(_T("Italic"), dir, cfg),
-            ReadFilePath(_T("Bold"), dir, cfg),
-            ReadFilePath(_T("BoldItalic"), dir, cfg),
-            cfg.Read(_T("IsFixed"), (long)false)
+            ReadFilePath("Regular", dir, cfg),
+            ReadFilePath("Italic", dir, cfg),
+            ReadFilePath("Bold", dir, cfg),
+            ReadFilePath("BoldItalic", dir, cfg),
+            cfg.Read("IsFixed", (long)false)

           )
     );
 }
           )
     );
 }


@@ -230,7 +257,7 @@ void wxFontsManager::SetDefaultFonts(wxFileConfig& cfg)
 {
     wxString name;
 
 {
     wxString name;
 

-    if ( cfg.Read(_T("Default"), &name) )
+    if ( cfg.Read("Default", &name) )

     {
         m_defaultFacenames[wxFONTFAMILY_DECORATIVE] =
         m_defaultFacenames[wxFONTFAMILY_ROMAN] =
     {
         m_defaultFacenames[wxFONTFAMILY_DECORATIVE] =
         m_defaultFacenames[wxFONTFAMILY_ROMAN] =


@@ -240,16 +267,16 @@ void wxFontsManager::SetDefaultFonts(wxFileConfig& cfg)
         m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name;
     }
 
         m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name;
     }
 

-    if ( cfg.Read(_T("DefaultDecorative"), &name) )
+    if ( cfg.Read("DefaultDecorative", &name) )

         m_defaultFacenames[wxFONTFAMILY_DECORATIVE] = name;
         m_defaultFacenames[wxFONTFAMILY_DECORATIVE] = name;

-    if ( cfg.Read(_T("DefaultRoman"), &name) )
+    if ( cfg.Read("DefaultRoman", &name) )

         m_defaultFacenames[wxFONTFAMILY_ROMAN] = name;
         m_defaultFacenames[wxFONTFAMILY_ROMAN] = name;

-    if ( cfg.Read(_T("DefaultScript"), &name) )
+    if ( cfg.Read("DefaultScript", &name) )

         m_defaultFacenames[wxFONTFAMILY_SCRIPT] = name;
         m_defaultFacenames[wxFONTFAMILY_SCRIPT] = name;

-    if ( cfg.Read(_T("DefaultSwiss"), &name) )
+    if ( cfg.Read("DefaultSwiss", &name) )

         m_defaultFacenames[wxFONTFAMILY_SWISS] = name;
         m_defaultFacenames[wxFONTFAMILY_SWISS] = name;

-    if ( cfg.Read(_T("DefaultModern"), &name) )
+    if ( cfg.Read("DefaultModern", &name) )

         m_defaultFacenames[wxFONTFAMILY_MODERN] = name;
         m_defaultFacenames[wxFONTFAMILY_MODERN] = name;

-    if ( cfg.Read(_T("DefaultTeletype"), &name) )
+    if ( cfg.Read("DefaultTeletype", &name) )

         m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name;
 }
         m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name;
 }