focus on middle click on client

[chaz/openbox] / engines / openbox / theme.c

diff --git a/engines/openbox/theme.c b/engines/openbox/theme.c
index 3c7c26970e8dc730b966d7246d60a2925a357f7c..c775ff9ecdbfc0e3fd355785b03d9f813636f69d 100644 (file)
--- a/engines/openbox/theme.c
+++ b/engines/openbox/theme.c
@@ -156,9 +156,13 @@ gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value)
             if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
                 ret = TRUE;
             else {
+                char *themename;
+
                 g_free(s);
+                themename = g_path_get_basename(theme.string);
                 s = g_strdup_printf("%s_buttons/%s", theme.string,
-                                    theme.string);
+                                    themename);
+                g_free(themename);
                 if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
                     BitmapSuccess) 
                     ret = TRUE;
@@ -314,12 +318,18 @@ gboolean load()
     }
 
     /* load the font, not from the theme file tho, its in the config */
-    s_winfont_shadow = 1; /* XXX read from themrc */
+
+    if (!config_get("font.shadow", Config_Bool, &shadow)) {
+        shadow.bool = TRUE; /* default */
+        config_set("font.shadow", Config_Bool, shadow);
+    }
+    s_winfont_shadow = shadow.bool;
     if (!config_get("font.shadow.offset", Config_Integer, &offset) ||
         offset.integer < 0 || offset.integer >= 10) {
-        s_winfont_shadow_offset = 1; /* default */
+        offset.integer = 1; /* default */
+        config_set("font.shadow.offset", Config_Integer, offset);
     }
-    
+    s_winfont_shadow_offset = offset.integer;
     if (!config_get("font", Config_String, &font)) {
         font.string = DEFAULT_FONT;
         config_set("font", Config_String, font);