catch last woodblock changes in head since 2_2 before i went ape shit and rm'd everyt...

diff --git a/src/Screen.cc b/src/Screen.cc
index 2351abcceb2bdc2e7d7445c4954c418712742778..d6fc2d16f9d8c537ff5716c44f2252e1abde9b59 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2307,8 +2307,9 @@ bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
       for (; it != end; ++it) {
         const string& fname = *it;
 
-        if (fname[fname.size()-1] == '~')
-          continue;
+        //ignore backups and dot files
+        if (fname[fname.size()-1] == '~' || fname[0] == '.')
+            continue;
 
         string style = stylesdir;
         style += '/';
@@ -2743,11 +2744,13 @@ BFont *BScreen::readDatabaseFont(const string &rbasename,
         offset = 1;
     }
 
-    unsigned char tint = 0x40;
+    int tint = 25;
     if (style.getValue(rbasename + "xft.shadow.tint", s)) {
       tint = atoi(s.c_str());
     }
 
+    if (tint > 100) tint = 100;
+    else if (tint < -100) tint = -100;
     
     BFont *b = new BFont(blackbox->getXDisplay(), this, family, i, bold,
                          italic, dropShadow && resource.shadow_fonts, offset,