X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=inline;f=engines%2Fopenbox%2Fobtheme.c;h=59c1b45ac2e4294072d041d07a54b6e207e190cb;hb=cbbf90a718ecc6836ef7a77b9040aebb9da348b8;hp=3f45c20949ec24e503fc2ee0b8a9571dfe030b47;hpb=71c8b0b7b2cf2fa79ac4c81b7756f2b230f2de7a;p=chaz%2Fopenbox

diff --git a/engines/openbox/obtheme.c b/engines/openbox/obtheme.c
index 3f45c209..59c1b45a 100644
--- 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/engine.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", engine_theme);
 
         s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
                              "openbox", button_dir, retvalue.addr, NULL);
@@ -139,8 +136,8 @@ 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 = g_path_get_basename(engine_theme);
+                s = g_strdup_printf("%s_buttons/%s", engine_theme,
                                     themename);
                 g_free(themename);
                 if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
@@ -277,12 +274,11 @@ gboolean obtheme_load()
     XrmDatabase db = NULL;
     Justify winjust;
     char *winjuststr;
-    ConfigValue theme, shadow, offset, font, tint;
 
-    if (config_get("theme", Config_String, &theme)) {
-	db = loaddb(theme.string);
+    if (engine_theme) {
+	db = loaddb(engine_theme);
         if (db == NULL) {
-	    g_warning("Failed to load the theme '%s'", theme.string);
+	    g_warning("Failed to load the theme '%s'", 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(engine_theme);
+        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))
-        g_assert_not_reached();
-    ob_s_winfont_shadow = shadow.bool;
-    if (!config_get("font.shadow.offset", Config_Integer, &offset))
-        g_assert_not_reached();
-    ob_s_winfont_shadow_offset = offset.integer;
-    if (!config_get("font.shadow.tint", Config_Integer, &tint))
-        g_assert_not_reached();
-    /* XXX put these checks into the config system somehow!!! */
-    if (tint.integer < -100) tint.integer = -100;
-    if (tint.integer > 100) tint.integer = 100;
-    config_set("font.shadow.tint", Config_Integer, tint);
-    ob_s_winfont_shadow_tint = tint.integer;
-    if (!config_get("font", Config_String, &font))
-        g_assert_not_reached();
-    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(engine_font);
+    ob_s_winfont_height = font_height(ob_s_winfont, engine_shadow,
+                                      engine_shadow_offset);
 
     winjust = Justify_Left;
     if (read_string(db, "window.justify", &winjuststr)) {
@@ -492,19 +473,17 @@ 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.offset =
-        ob_s_winfont_shadow_offset;
-    ob_a_focused_label->texture[0].data.text.tint = ob_s_winfont_shadow_tint;
+    ob_a_focused_label->texture[0].data.text.shadow = engine_shadow;
+    ob_a_focused_label->texture[0].data.text.offset = engine_shadow_offset;
+    ob_a_focused_label->texture[0].data.text.tint = engine_shadow_tint;
     ob_a_focused_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.offset =
-        ob_s_winfont_shadow_offset;
-    ob_a_unfocused_label->texture[0].data.text.tint = ob_s_winfont_shadow_tint;
+    ob_a_unfocused_label->texture[0].data.text.shadow = engine_shadow;
+    ob_a_unfocused_label->texture[0].data.text.offset = engine_shadow_offset;
+    ob_a_unfocused_label->texture[0].data.text.tint = engine_shadow_tint;
     ob_a_unfocused_label->texture[0].data.text.color =
         ob_s_title_unfocused_color;