load config values right. load the bool shadow option too now.

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

diff --git a/engines/openbox/theme.c b/engines/openbox/theme.c
index b1e3a98acac229765c9ab92aef15d18f87b8c6c1..154aae83900cd105141674375910de642f5953ab 100644 (file)
--- a/engines/openbox/theme.c
+++ b/engines/openbox/theme.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
-#include "../../kernel/themerc.h"
+#include "../../kernel/config.h"
+#include "../../kernel/openbox.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -128,10 +129,51 @@ gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value)
     gboolean ret = FALSE;
     char *rclass = create_class_name(rname);
     char *rettype;
+    char *s;
+    char *button_dir;
     XrmValue retvalue;
+    int hx, hy; /* ignored */
+    unsigned int w, h;
+    unsigned char *b;
+    ConfigValue theme;
   
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
-       retvalue.addr != NULL) {
+        retvalue.addr != NULL) {
+        if (!config_get("theme", Config_String, &theme))
+            g_assert_not_reached(); /* where's the default!? its not set? */
+
+       button_dir = g_strdup_printf("%s_buttons", theme.string);
+
+        s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+                             "openbox", button_dir, retvalue.addr, NULL);
+
+        if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
+            ret = TRUE;
+        else {
+            g_free(s);
+            s = g_build_filename(THEMEDIR, button_dir, retvalue.addr, NULL);
+       
+            if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
+                ret = TRUE;
+            else {
+                g_free(s);
+                s = g_strdup_printf("%s_buttons/%s", theme.string,
+                                    theme.string);
+                if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
+                    BitmapSuccess) 
+                    ret = TRUE;
+                else
+                    g_message("Unable to find bitmap '%s'", s);
+            }
+        }
+
+        if (ret) {
+            *value = pixmap_mask_new(w, h, (char*)b);
+            XFree(b);
+        }
+      
+        g_free(s);
+        g_free(button_dir);
     }
 
     g_free(rclass);
@@ -139,8 +181,8 @@ gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value)
 }
 
 static void parse_appearance(char *tex, SurfaceColorType *grad,
-                         ReliefType *relief, BevelType *bevel,
-                         gboolean *interlaced, gboolean *border)
+                             ReliefType *relief, BevelType *bevel,
+                             gboolean *interlaced, gboolean *border)
 {
     char *t;
 
@@ -251,11 +293,12 @@ gboolean load()
     XrmDatabase db = NULL;
     Justify winjust;
     char *winjuststr;
+    ConfigValue theme, shadow, offset, font;
 
-    if (themerc_theme != NULL) {
-       db = loaddb(themerc_theme);
+    if (config_get("theme", Config_String, &theme)) {
+       db = loaddb(theme.string);
         if (db == NULL) {
-           g_warning("Failed to load the theme '%s'", themerc_theme);
+           g_warning("Failed to load the theme '%s'", theme.string);
            g_message("Falling back to the default: '%s'", DEFAULT_THEME);
        }
     }
@@ -265,12 +308,29 @@ gboolean load()
            g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
            return FALSE;
        }
+        /* change to reflect what was actually loaded */
+        theme.string = DEFAULT_THEME;
+        config_set("theme", Config_String, theme);
     }
 
-    /* load the font, not from the theme file tho, its in themerc_font */
-    s_winfont_shadow = 1; /* XXX read from themrc */
-    s_winfont_shadow_offset = 1; /* XXX read from themerc */
-    s_winfont = font_open(themerc_font);
+    /* load the font, not from the theme file tho, its in the config */
+
+    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) {
+        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);
+    }
+    s_winfont = font_open(font.string);
     s_winfont_height = font_height(s_winfont, s_winfont_shadow,
                                    s_winfont_shadow_offset);
 
@@ -348,7 +408,7 @@ gboolean load()
     if (!read_appearance(db, "window.button.pressed.focus",
                         a_focused_pressed_max))
        if (!read_appearance(db, "window.button.pressed",
-                            a_focused_pressed_max))
+                             a_focused_pressed_max))
            set_default_appearance(a_focused_pressed_max);
     if (!read_appearance(db, "window.button.pressed.unfocus",
                         a_unfocused_pressed_max))
@@ -357,10 +417,10 @@ gboolean load()
            set_default_appearance(a_unfocused_pressed_max);
     if (!read_appearance(db, "window.button.focus",
                         a_focused_unpressed_max))
-           set_default_appearance(a_focused_unpressed_max);
+       set_default_appearance(a_focused_unpressed_max);
     if (!read_appearance(db, "window.button.unfocus",
                         a_unfocused_unpressed_max))
-           set_default_appearance(a_unfocused_unpressed_max);
+       set_default_appearance(a_unfocused_unpressed_max);
 
     a_unfocused_unpressed_close = appearance_copy(a_unfocused_unpressed_max);
     a_unfocused_pressed_close = appearance_copy(a_unfocused_pressed_max);