new method for loading menu files etc

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index d03ba0312b36d8c8bdf855904e19c2d8a7ededa7..54ae4c33dbdf060b03931a28ce718fa7ce995c94 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -36,7 +36,7 @@ guint config_keyboard_reset_state;
 gint config_mouse_threshold;
 gint config_mouse_dclicktime;
 
-gchar *config_menu_path;
+GSList *config_menu_files;
 
 gint config_resist_win;
 gint config_resist_edge;
@@ -92,7 +92,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     if (keylist) {
         nact = parse_find_node("action", node);
         while (nact) {
-            if ((action = action_parse(doc, nact))) {
+            if ((action = action_parse(i, doc, nact))) {
                 /* validate that its okay for a key binding */
                 if (action->func == action_moveresize &&
                     action->data.moveresize.corner !=
@@ -165,7 +165,7 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                 goto next_nbut;
             nact = parse_find_node("action", nbut->xmlChildrenNode);
             while (nact) {
-                if ((action = action_parse(doc, nact))) {
+                if ((action = action_parse(i, doc, nact))) {
                     /* validate that its okay for a mouse binding*/
                     if (mact == OB_MOUSE_ACTION_MOTION) {
                         if (action->func != action_moveresize ||
@@ -228,10 +228,14 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     node = node->xmlChildrenNode;
 
     if ((n = parse_find_node("theme", node))) {
+        gchar *c;
+
         g_free(config_theme);
-        config_theme = parse_string(doc, n);
+        c = parse_string(doc, n);
+        config_theme = expand_tilde(c);
+        g_free(c);
     }
-    if ((n = parse_find_node("titlelayout", node))) {
+    if ((n = parse_find_node("titleLayout", node))) {
         g_free(config_title_layout);
         config_title_layout = parse_string(doc, n);
     }
@@ -339,15 +343,15 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
 
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    xmlNodePtr n;
-
-    node = node->xmlChildrenNode;
-    if ((n = parse_find_node("location", node))) {
-        gchar *c;
-
-        c = parse_string(doc, n);
-        config_menu_path = expand_tilde(c);
-        g_free(c);
+    for (node = node->xmlChildrenNode; node; node = node->next) {
+        if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
+            gchar *c;
+
+            c = parse_string(doc, node);
+            config_menu_files = g_slist_append(config_menu_files,
+                                               expand_tilde(c));
+            g_free(c);
+        }
     }
 }
    
@@ -415,7 +419,7 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resistance", parse_resistance, NULL);
 
-    config_menu_path = NULL;
+    config_menu_files = NULL;
 
     parse_register(i, "menu", parse_menu, NULL);
 }
@@ -426,7 +430,11 @@ void config_shutdown()
 
     g_free(config_theme);
 
-    for (it = config_desktops_names; it; it = it->next)
+    for (it = config_desktops_names; it; it = g_slist_next(it))
         g_free(it->data);
     g_slist_free(config_desktops_names);
+
+    for (it = config_menu_files; it; it = g_slist_next(it))
+        g_free(it->data);
+    g_slist_free(config_menu_files);
 }