change how rc parsing will work. a=b will be parsed in any [section] and given to a separate parsing callback. no more general config infrastructure needed/

3 files changed, 26 insertions, 57 deletions

diff --git a/engines/openbox/obengine.c b/engines/openbox/obengine.c
index 4dda711e..bad7b51e 100644
--- a/engines/openbox/obengine.c
+++ b/engines/openbox/obengine.c
@@ -1,10 +1,10 @@
 #include "obtheme.h"
 #include "obrender.h"
 #include "obengine.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/extensions.h"
-#include "../../kernel/dispatch.h"
-#include "../../kernel/config.h"
+#include "kernel/openbox.h"
+#include "kernel/extensions.h"
+#include "kernel/dispatch.h"
+#include "kernel/engine.h"
 
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
@@ -34,9 +34,6 @@ color_rgb *ob_s_titlebut_focused_color;
 color_rgb *ob_s_titlebut_unfocused_color;
 /* style settings - fonts */
 int ob_s_winfont_height;
-int ob_s_winfont_shadow;
-int ob_s_winfont_shadow_offset;
-int ob_s_winfont_shadow_tint;
 ObFont *ob_s_winfont;
 /* style settings - masks */
 pixmap_mask *ob_s_max_set_mask;
@@ -694,16 +691,12 @@ static void layout_title(ObFrame *self)
     char *lc;
     int x;
     gboolean n, d, i, l, m, c, s;
-    ConfigValue layout;
 
     n = d = i = l = m = c = s = FALSE;
 
-    if (!config_get("titlebar.layout", Config_String, &layout))
-        g_assert_not_reached();
-
     /* figure out whats being shown, and the width of the label */
     self->label_width = self->width - (ob_s_bevel + 1) * 2;
-    for (lc = layout.string; *lc != '\0'; ++lc) {
+    for (lc = engine_layout; *lc != '\0'; ++lc) {
 	switch (*lc) {
 	case 'N':
 	    if (!(self->frame.client->decorations & Decor_Icon)) break;
@@ -761,7 +754,7 @@ static void layout_title(ObFrame *self)
     if (!c) XUnmapWindow(ob_display, self->close);
 
     x = ob_s_bevel + 1;
-    for (lc = layout.string; *lc != '\0'; ++lc) {
+    for (lc = engine_layout; *lc != '\0'; ++lc) {
 	switch (*lc) {
 	case 'N':
 	    if (!n) break;
diff --git a/engines/openbox/obengine.h b/engines/openbox/obengine.h
index b4e46983..2a879b70 100644
--- a/engines/openbox/obengine.h
+++ b/engines/openbox/obengine.h
@@ -28,9 +28,6 @@ extern color_rgb *ob_s_titlebut_focused_color;
 extern color_rgb *ob_s_titlebut_unfocused_color;
 
 extern int ob_s_winfont_height;
-extern int ob_s_winfont_shadow;
-extern int ob_s_winfont_shadow_offset;
-extern int ob_s_winfont_shadow_tint;
 extern ObFont *ob_s_winfont;
 
 extern pixmap_mask *ob_s_max_set_mask;
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;