X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=42d479aff480ff92d2a7b2688e8978d8f01bc9f4;hb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;hp=b9c24dedc147f8f9d9b855096f4c8a00415ee033;hpb=4cc0d9b72d4bb084e6736c60319fd8e2ab92ef6a;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index b9c24ded..42d479af 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,211 +1,190 @@
 #include "config.h"
+#include "parser/parse.h"
 
-#ifdef HAVE_STDIO_H
-#  include <stdio.h>
-#endif
-
-static void config_free_entry(ConfigEntry *entry);
-static void config_set_entry(char *name, ConfigValueType type,
-                             ConfigValue value);
-static void config_def_free(ConfigDefEntry *entry);
-static void print_config(GQuark q, gpointer data, gpointer fonk){
-    ConfigDefEntry *e = (ConfigDefEntry *)data;
-    g_message("config: %s %d", e->name, e->hasList);
-}
-
-static GData *config = NULL;
-static GData *config_def = NULL;
-
-/* provided by cparse.l */
-void cparse_go(char *filename, FILE *);
+gboolean config_focus_new;
+gboolean config_focus_follow;
+gboolean config_focus_last;
+gboolean config_focus_last_on_desktop;
+gboolean config_focus_popup;
 
+char *config_theme;
 
-void config_startup()
-{
-    /* set up built in variables! and their default values! */
+int     config_desktops_num;
+GSList *config_desktops_names;
 
-    config_def_set(config_def_new("engine", Config_String));
-    config_def_set(config_def_new("theme", Config_String));
-    config_def_set(config_def_new("font", Config_String));
-    config_def_set(config_def_new("font.shadow.offset", Config_Integer));
-    config_def_set(config_def_new("font.shadow.tint", Config_Integer));
-    config_def_set(config_def_new("titlebar.layout", Config_String));
+gboolean config_opaque_move;
+gboolean config_opaque_resize;
 
-    /*g_datalist_foreach(&config_def, print_config, NULL);*/
-}
+ObStackingLayer config_dock_layer;
+gboolean        config_dock_floating;
+ObDirection     config_dock_pos;
+gint            config_dock_x;
+gint            config_dock_y;
+ObOrientation   config_dock_orient;
+gboolean        config_dock_hide;
+guint           config_dock_hide_timeout;
 
-void config_shutdown()
+static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    g_datalist_clear(&config);
-    g_datalist_clear(&config_def);
+    xmlNodePtr n;
+
+    if ((n = parse_find_node("focusNew", node)))
+        config_focus_new = parse_bool(doc, n);
+    if ((n = parse_find_node("followMouse", node)))
+        config_focus_follow = parse_bool(doc, n);
+    if ((n = parse_find_node("focusLast", node)))
+        config_focus_last = parse_bool(doc, n);
+    if ((n = parse_find_node("focusLastOnDesktop", node)))
+        config_focus_last_on_desktop = parse_bool(doc, n);
+    if ((n = parse_find_node("cyclingDialog", node)))
+        config_focus_popup = parse_bool(doc, n);
 }
 
-void config_parse()
+static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    FILE *file;
-    char *path;
-    gboolean load = FALSE;
-
-    /* load the user rc */
-    path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
-    if ((file = fopen(path, "r")) != NULL) {
-        cparse_go(path, file);
-        fclose(file);
-        load = TRUE;
-    }
-    g_free(path);
-    g_free(path);
-
-    if (!load) {
-        /* load the system wide rc */
-        path = g_build_filename(RCDIR, "rc3", NULL);
-        if ((file = fopen(path, "r")) != NULL) {
-            cparse_go(path, file);
-            fclose(file);
-        }
+    xmlNodePtr n;
+
+    if ((n = parse_find_node("theme", node))) {
+        g_free(config_theme);
+        config_theme = parse_string(doc, n);
     }
 }
 
-gboolean config_set(char *name, ConfigValueType type, ConfigValue value)
+static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    ConfigDefEntry *def;
-    gboolean ret = FALSE;
-
-    name = g_ascii_strdown(name, -1);
-    g_message("Setting %s", name);
-
-    /*g_datalist_foreach(&config_def, print_config, NULL);*/
-    def = g_datalist_get_data(&config_def, name);
-
-    if (def == NULL) {
-        g_message("Invalid config option '%s'", name);
-    } else {
-        if (def->hasList) {
-            gboolean found = FALSE;
-            GSList *it;
-
-            it = def->values;
-            g_assert(it != NULL);
-            do {
-                if (g_ascii_strcasecmp(it->data, value.string) == 0) {
-                    found = TRUE;
-                    break;
-                }
-            } while ((it = it->next));
-
-            if (!found)
-                g_message("Invalid value '%s' for config option '%s'",
-                          value.string, name);
-            else
-                ret = TRUE;
-        } else
-            ret = TRUE;
+    xmlNodePtr n;
 
-    }
-
-    if (ret)
-        config_set_entry(name, type, value);
-    else
-        g_free(name);
+    if ((n = parse_find_node("number", node)))
+        config_desktops_num = parse_int(doc, n);
+    if ((n = parse_find_node("names", node))) {
+        GSList *it;
+        xmlNodePtr nname;
 
-    return ret;
-}
-
-gboolean config_get(char *name, ConfigValueType type, ConfigValue *value)
-{
-    ConfigEntry *entry;
-    gboolean ret = FALSE;
-
-    name = g_ascii_strdown(name, -1);
-    entry = g_datalist_get_data(&config, name);
-    if (entry != NULL && entry->type == type) {
-        *value = entry->value;
-        ret = TRUE;
+        for (it = config_desktops_names; it; it = it->next)
+            g_free(it->data);
+        g_slist_free(config_desktops_names);
+        config_desktops_names = NULL;
+
+        nname = parse_find_node("name", n->xmlChildrenNode);
+        while (nname) {
+            config_desktops_names = g_slist_append(config_desktops_names,
+                                                   parse_string(doc, nname));
+            nname = parse_find_node("name", nname->next);
+        }
     }
-    g_free(name);
-    return ret;
 }
 
-static void config_set_entry(char *name, ConfigValueType type,
-                             ConfigValue value)
+static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    ConfigEntry *entry = NULL;
-
-    entry = g_new(ConfigEntry, 1);
-    entry->name = name;
-    entry->type = type;
-    if (type == Config_String)
-        entry->value.string = g_strdup(value.string);
-    else
-        entry->value = value;
-
-    g_datalist_set_data_full(&config, name, entry,
-                             (GDestroyNotify)config_free_entry);
+    xmlNodePtr n;
+
+    if ((n = parse_find_node("opaqueMove", node)))
+        config_opaque_move = parse_bool(doc, n);
+    if ((n = parse_find_node("opaqueResize", node)))
+        config_opaque_resize = parse_bool(doc, n);
 }
 
-static void config_free_entry(ConfigEntry *entry)
+static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    g_free(entry->name);
-    entry->name = NULL;
-    if(entry->type == Config_String) {
-        g_free(entry->value.string);
-        entry->value.string = NULL;
+    xmlNodePtr n;
+
+    if ((n = parse_find_node("position", node))) {
+        if (parse_contains("TopLeft", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_NORTHWEST;
+        else if (parse_contains("Top", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_NORTH;
+        else if (parse_contains("TopRight", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_NORTHEAST;
+        else if (parse_contains("Right", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_EAST;
+        else if (parse_contains("BottomRight", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_SOUTHEAST;
+        else if (parse_contains("Bottom", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_SOUTH;
+        else if (parse_contains("BottomLeft", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_SOUTHWEST;
+        else if (parse_contains("Left", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_WEST;
+        else if (parse_contains("Floating", doc, n))
+            config_dock_floating = TRUE;
+    }
+    if (config_dock_floating) {
+        if ((n = parse_find_node("floatingX", node)))
+            config_dock_x = parse_int(doc, n);
+        if ((n = parse_find_node("floatingY", node)))
+            config_dock_y = parse_int(doc, n);
+    }
+    if ((n = parse_find_node("stacking", node))) {
+        if (parse_contains("top", doc, n))
+            config_dock_layer = OB_STACKING_LAYER_TOP;
+        else if (parse_contains("normal", doc, n))
+            config_dock_layer = OB_STACKING_LAYER_NORMAL;
+        else if (parse_contains("bottom", doc, n))
+            config_dock_layer = OB_STACKING_LAYER_BELOW;
     }
-    g_free(entry);
+    if ((n = parse_find_node("direction", node))) {
+        if (parse_contains("horizontal", doc, n))
+            config_dock_orient = OB_ORIENTATION_HORZ;
+        else if (parse_contains("vertical", doc, n))
+            config_dock_orient = OB_ORIENTATION_VERT;
+    }
+    if ((n = parse_find_node("autoHide", node)))
+        config_dock_hide = parse_bool(doc, n);
+    if ((n = parse_find_node("hideTimeout", node)))
+        config_dock_hide_timeout = parse_int(doc, n);
 }
 
-ConfigDefEntry *config_def_new(char *name, ConfigValueType type)
+void config_startup()
 {
-    ConfigDefEntry *entry;
-
-    entry = g_new(ConfigDefEntry, 1);
-    entry->name = g_ascii_strdown(name, -1);
-    entry->hasList = FALSE;
-    entry->type = type;
-    entry->values = NULL;
-    return entry;
-}
+    config_focus_new = TRUE;
+    config_focus_follow = FALSE;
+    config_focus_last = TRUE;
+    config_focus_last_on_desktop = TRUE;
+    config_focus_popup = TRUE;
 
-static void config_def_free(ConfigDefEntry *entry)
-{
-    GSList *it;
+    parse_register("focus", parse_focus, NULL);
 
-    g_free(entry->name);
-    if (entry->hasList) {
-        for (it = entry->values; it != NULL; it = it->next)
-            g_free(it->data);
-        g_slist_free(entry->values);
-    }
-    g_free(entry);
-}
+    config_theme = NULL;
 
-gboolean config_def_add_value(ConfigDefEntry *entry, char *value)
-{
-    if (entry->type != Config_String) {
-        g_warning("Tried adding value to non-string config definition");
-        return FALSE;
-    }
+    parse_register("theme", parse_theme, NULL);
 
-    entry->hasList = TRUE;
-    entry->values = g_slist_append(entry->values, g_ascii_strdown(value, -1));
-    return TRUE;
+    config_desktops_num = 4;
+    config_desktops_names = NULL;
+
+    parse_register("desktops", parse_desktops, NULL);
+
+    config_opaque_move = TRUE;
+    config_opaque_resize = TRUE;
+
+    parse_register("moveresize", parse_moveresize, NULL);
+
+    config_dock_layer = OB_STACKING_LAYER_TOP;
+    config_dock_pos = OB_DIRECTION_NORTHEAST;
+    config_dock_floating = FALSE;
+    config_dock_x = 0;
+    config_dock_y = 0;
+    config_dock_orient = OB_ORIENTATION_VERT;
+    config_dock_hide = FALSE;
+    config_dock_hide_timeout = 3000;
+
+    parse_register("dock", parse_dock, NULL);
 }
 
-gboolean config_def_set(ConfigDefEntry *entry)
+void config_shutdown()
 {
-    gboolean ret = FALSE;
-    ConfigDefEntry *def;
-
-    if ((def = g_datalist_get_data(&config_def, entry->name))) {
-        g_assert(def != entry); /* adding it twice!? */
-        g_warning("Definition already set for config option '%s'. ",
-                  entry->name);
-        config_def_free(entry);
-    } else {
-        g_datalist_set_data_full(&config_def, entry->name, entry,
-                                 (GDestroyNotify)config_def_free);
-        ret = TRUE;
-    }
+    GSList *it;
+
+    g_free(config_theme);
 
-    return ret;
+    for (it = config_desktops_names; it; it = it->next)
+        g_free(it->data);
+    g_slist_free(config_desktops_names);
 }