move config option loading for the kernel into config.c/h

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

diff --git a/engines/openbox/obtheme.c b/engines/openbox/obtheme.c
index ccd17cc0bf7da1ff8f1c629703cf834c274bb38a..533559f9af4edb5900e13c2fe13d12109bc21a28 100644 (file)
--- a/engines/openbox/obtheme.c
+++ b/engines/openbox/obtheme.c
@@ -1,6 +1,6 @@
 #include "obengine.h"
-#include "../../kernel/config.h"
-#include "../../kernel/openbox.h"
+#include "kernel/openbox.h"
+#include "kernel/config.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -115,14 +115,11 @@ static gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value)
     int hx, hy; /* ignored */
     unsigned int w, h;
     unsigned char *b;
-    ConfigValue theme;
   
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
         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);
+       button_dir = g_strdup_printf("%s_buttons", config_engine_theme);
 
         s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
                              "openbox", button_dir, retvalue.addr, NULL);
@@ -139,15 +136,15 @@ static gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value)
                 char *themename;
 
                 g_free(s);
-                themename = g_path_get_basename(theme.string);
-                s = g_strdup_printf("%s_buttons/%s", theme.string,
-                                    themename);
+                themename = g_path_get_basename(config_engine_theme);
+                s = g_strdup_printf("%s/%s_buttons/%s", config_engine_theme,
+                                    themename, retvalue.addr);
                 g_free(themename);
                 if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
                     BitmapSuccess) 
                     ret = TRUE;
                 else
-                    g_message("Unable to find bitmap '%s'", s);
+                    g_message("Unable to find bitmap '%s'", retvalue.addr);
             }
         }
 
@@ -277,12 +274,11 @@ gboolean obtheme_load()
     XrmDatabase db = NULL;
     Justify winjust;
     char *winjuststr;
-    ConfigValue theme, shadow, offset, font;
 
-    if (config_get("theme", Config_String, &theme)) {
-       db = loaddb(theme.string);
+    if (config_engine_theme) {
+       db = loaddb(config_engine_theme);
         if (db == NULL) {
-           g_warning("Failed to load the theme '%s'", theme.string);
+           g_warning("Failed to load the theme '%s'", config_engine_theme);
            g_message("Falling back to the default: '%s'", DEFAULT_THEME);
        }
     }
@@ -292,31 +288,16 @@ gboolean obtheme_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);
+        /* set it to what was loaded */
+        g_free(config_engine_theme);
+        config_engine_theme = g_strdup(DEFAULT_THEME);
     }
 
     /* 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);
-    }
-    ob_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);
-    }
-    ob_s_winfont_shadow_offset = offset.integer;
-    if (!config_get("font", Config_String, &font)) {
-        font.string = DEFAULT_FONT;
-        config_set("font", Config_String, font);
-    }
-    ob_s_winfont = font_open(font.string);
-    ob_s_winfont_height = font_height(ob_s_winfont, ob_s_winfont_shadow,
-                                      ob_s_winfont_shadow_offset);
+    ob_s_winfont = font_open(config_engine_font);
+    ob_s_winfont_height = font_height(ob_s_winfont, config_engine_shadow,
+                                      config_engine_shadow_offset);
 
     winjust = Justify_Left;
     if (read_string(db, "window.justify", &winjuststr)) {
@@ -420,6 +401,7 @@ gboolean obtheme_load()
         ob_s_close_mask = pixmap_mask_new(7, 7, data);
     }        
 
+    /* read the decoration textures */
     if (!read_appearance(db, "window.title.focus", ob_a_focused_title))
        set_default_appearance(ob_a_focused_title);
     if (!read_appearance(db, "window.title.unfocus", ob_a_unfocused_title))
@@ -437,6 +419,26 @@ gboolean obtheme_load()
     if (!read_appearance(db, "window.grip.unfocus", ob_a_unfocused_grip))
        set_default_appearance(ob_a_unfocused_grip);
 
+    /* read the appearances for rendering non-decorations. these cannot be
+       parent-relative */
+    if (ob_a_focused_label->surface.data.planar.grad !=
+        Background_ParentRelative) {
+        if (!read_appearance(db, "window.label.focus", ob_app_hilite_label))
+            set_default_appearance(ob_app_hilite_label);
+    } else {
+        if (!read_appearance(db, "window.title.focus", ob_app_hilite_label))
+            set_default_appearance(ob_app_hilite_label);
+    }
+    if (ob_a_unfocused_label->surface.data.planar.grad !=
+        Background_ParentRelative) {
+        if (!read_appearance(db, "window.label.unfocus",ob_app_unhilite_label))
+            set_default_appearance(ob_app_unhilite_label);
+    } else {
+        if (!read_appearance(db, "window.title.unfocus",ob_app_unhilite_label))
+            set_default_appearance(ob_app_unhilite_label);
+    }
+
+    /* read buttons textures */
     if (!read_appearance(db, "window.button.pressed.focus",
                         ob_a_focused_pressed_max))
        if (!read_appearance(db, "window.button.pressed",
@@ -492,19 +494,39 @@ gboolean obtheme_load()
     ob_a_focused_label->texture[0].type = Text;
     ob_a_focused_label->texture[0].data.text.justify = winjust;
     ob_a_focused_label->texture[0].data.text.font = ob_s_winfont;
-    ob_a_focused_label->texture[0].data.text.shadow = ob_s_winfont_shadow;
+    ob_a_focused_label->texture[0].data.text.shadow = config_engine_shadow;
     ob_a_focused_label->texture[0].data.text.offset =
-        ob_s_winfont_shadow_offset;
+        config_engine_shadow_offset;
+    ob_a_focused_label->texture[0].data.text.tint = config_engine_shadow_tint;
     ob_a_focused_label->texture[0].data.text.color = ob_s_title_focused_color;
+    ob_app_hilite_label->texture[0].type = Text;
+    ob_app_hilite_label->texture[0].data.text.justify = winjust;
+    ob_app_hilite_label->texture[0].data.text.font = ob_s_winfont;
+    ob_app_hilite_label->texture[0].data.text.shadow = config_engine_shadow;
+    ob_app_hilite_label->texture[0].data.text.offset =
+        config_engine_shadow_offset;
+    ob_app_hilite_label->texture[0].data.text.tint = config_engine_shadow_tint;
+    ob_app_hilite_label->texture[0].data.text.color = ob_s_title_focused_color;
 
     ob_a_unfocused_label->texture[0].type = Text;
     ob_a_unfocused_label->texture[0].data.text.justify = winjust;
     ob_a_unfocused_label->texture[0].data.text.font = ob_s_winfont;
-    ob_a_unfocused_label->texture[0].data.text.shadow = ob_s_winfont_shadow;
+    ob_a_unfocused_label->texture[0].data.text.shadow = config_engine_shadow;
     ob_a_unfocused_label->texture[0].data.text.offset =
-        ob_s_winfont_shadow_offset;
+        config_engine_shadow_offset;
+    ob_a_unfocused_label->texture[0].data.text.tint =config_engine_shadow_tint;
     ob_a_unfocused_label->texture[0].data.text.color =
         ob_s_title_unfocused_color;
+    ob_app_unhilite_label->texture[0].type = Text;
+    ob_app_unhilite_label->texture[0].data.text.justify = winjust;
+    ob_app_unhilite_label->texture[0].data.text.font = ob_s_winfont;
+    ob_app_unhilite_label->texture[0].data.text.shadow = config_engine_shadow;
+    ob_app_unhilite_label->texture[0].data.text.offset =
+        config_engine_shadow_offset;
+    ob_app_unhilite_label->texture[0].data.text.tint =
+        config_engine_shadow_tint;
+    ob_app_unhilite_label->texture[0].data.text.color =
+        ob_s_title_unfocused_color;
 
     ob_a_focused_unpressed_max->texture[0].type = 
         ob_a_focused_pressed_max->texture[0].type =