- Usage of xft-fonts is prefered, except a font-description starts with '-'

- Removed "antialias"-option completly, to enable/disable "antialias"
  use either  <fontname>:antialias=<bool> in the style or use
  Xft.antialias: <bool> in your .Xdefaults
- Added new styleresources: 
    *.font.effect: <halo|shadow>
    *.font.shadow.x : <int>       - shadow x offset
    *.font.shadow.y : <int>       - shadow y offset
    *.font.shadow.color : <color> - color of shadow
    *.font.halo.color : <color>   - color of halo
- Removed 'shadow' and 'halo' options from fontdefinitions:
    !! Style authors have to update their styles !!
- Simplified XmbFontImp to not try all possible fonts to match locale
- Style authors may specify multiple fonts:
    <font1>|<font2>|<font3>
  if loading of font1 fails, fluxbox probes <font2>, etc. The last font is
  "fixed". Hints for style authors:
    - if xft tries to load a font it will _ALWAYS_ return a valid font,
      it doesnt have to look like the one you want to have, read more
      about it: http://fontconfig.org/fontconfig-user.html
    - export XFT_DEBUG=1  before running fluxbox helps to see
      which fonts are picked.
  eg:
      *.font: Verdana,Arial-12:antialias=true|-artwiz-snap-*-
      if fluxbox is compiled with xft this will NEVER try to
      load "-artwiz-snap-*-" since xft gives for sure a font,
      most likely Verdana or Arial but noone knows. So, if
      fluxbox has no xft support the first fontpattern fails
      and fluxbox tries the next one, which might be successful.
      if everything fails, it will use "fixed"
- Added caching of fonts, fonts are only loaded once.
- Fixed #1090902 (slow utf8 start)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index 1d13900..715b130 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -33,7 +33,6 @@ namespace FbTk {
 
 XftFontImp::XftFontImp(const char *name, bool utf8):m_xftfont(0),
                                                     m_utf8mode(utf8) {
-
     if (name != 0)
         load(name);
 }
@@ -47,13 +46,14 @@ bool XftFontImp::load(const std::string &name) {
     //Note: assumes screen 0 for now, changes on draw if needed
 
     Display *disp = App::instance()->display();
-    XftFont *newxftfont = XftFontOpenName(disp, 0, name.c_str());
 
-    if (newxftfont == 0) { // failed to open font, lets test with XLFD
-        newxftfont = XftFontOpenXlfd(disp, 0, name.c_str());
+    XftFont *newxftfont = XftFontOpenXlfd(disp, 0, name.c_str());
+    if (newxftfont == 0) {
+        newxftfont = XftFontOpenName(disp, 0, name.c_str());
         if (newxftfont == 0)
             return false;
     }
+    
     // destroy old font and set new
     if (m_xftfont != 0)
         XftFontClose(disp, m_xftfont);