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

diff --git a/openbox/config.c b/openbox/config.c
index 2ec6d5f7..42d479af 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,37 +1,190 @@
 #include "config.h"
+#include "parser/parse.h"
 
-#ifdef HAVE_STDIO_H
-#  include <stdio.h>
-#endif
+gboolean config_focus_new;
+gboolean config_focus_follow;
+gboolean config_focus_last;
+gboolean config_focus_last_on_desktop;
+gboolean config_focus_popup;
 
-static GSList *config = NULL;
+char *config_theme;
 
-/* provided by cparse.l */
-void cparse_go(FILE *);
+int     config_desktops_num;
+GSList *config_desktops_names;
 
+gboolean config_opaque_move;
+gboolean config_opaque_resize;
 
-void config_startup()
+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;
+
+static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
+    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_shutdown()
+static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+    xmlNodePtr n;
+
+    if ((n = parse_find_node("theme", node))) {
+        g_free(config_theme);
+        config_theme = parse_string(doc, n);
+    }
+}
+
+static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
+    xmlNodePtr n;
+
+    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;
+
+        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);
+        }
+    }
 }
 
-void config_parse()
+static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    FILE *file;
-    char *path;
+    xmlNodePtr n;
 
-    path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
-    if ((file = fopen(path, "r")) != NULL) {
-        cparse_go(file);
-        fclose(file);
+    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 parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+    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;
+    }
+    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);
+}
+
+void config_startup()
+{
+    config_focus_new = TRUE;
+    config_focus_follow = FALSE;
+    config_focus_last = TRUE;
+    config_focus_last_on_desktop = TRUE;
+    config_focus_popup = TRUE;
+
+    parse_register("focus", parse_focus, NULL);
+
+    config_theme = NULL;
+
+    parse_register("theme", parse_theme, NULL);
+
+    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_set(char *name, ConfigValueType type, ConfigValue value)
+void config_shutdown()
 {
-    g_message("Setting %s\n", name);
-    return TRUE;
+    GSList *it;
+
+    g_free(config_theme);
+
+    for (it = config_desktops_names; it; it = it->next)
+        g_free(it->data);
+    g_slist_free(config_desktops_names);
 }