From: Dana Jansens <danakj@orodu.net>
Date: Fri, 1 Nov 2002 02:04:13 +0000 (+0000)
Subject: catch last woodblock changes in head since 2_2 before i went ape shit and rm'd everyt... 
X-Git-Tag: openbox-2_1_3^2~28
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7de8635abb8931a692312da620bfa3befce93ddc;p=dana%2Fopenbox.git

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

diff --git a/src/Screen.cc b/src/Screen.cc
index 2351abcc..d6fc2d16 100644
--- 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,