X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=21f03d3e27dea11e6cc692469b2c9781e6534156;hb=06fb4c7382a9c2a25e74adefbbc267417af5aadd;hp=f0b78d7d6f0defe59affcc8610694d7b798475de;hpb=f7eb47dba4b091b67a28404ce461b15dffcb4298;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index f0b78d7d..21f03d3e 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -4,13 +4,12 @@
 #include "prop.h"
 #include "translate.h"
 #include "parser/parse.h"
+#include "openbox.h"
 
 gboolean config_focus_new;
 gboolean config_focus_follow;
 gboolean config_focus_last;
 gboolean config_focus_last_on_desktop;
-gboolean config_focus_popup;
-gboolean config_desktop_popup;
 
 char *config_theme;
 
@@ -36,21 +35,11 @@ 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;
 
-gchar *expand_tilde(const gchar *f)
-{
-    if (!f)
-        return NULL;
-    else if (f[0] != '~')
-        return g_strdup(f);
-    else
-        return g_strconcat(g_get_home_dir(), f+1, NULL);
-}
-
 /*
 
 <keybind key="C-x">
@@ -216,8 +205,6 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr 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);
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -228,10 +215,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 = ob_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);
     }
@@ -262,8 +253,6 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             nname = parse_find_node("name", nname->next);
         }
     }
-    if ((n = parse_find_node("cyclingDialog", node)))
-        config_desktop_popup = parse_bool(doc, n);
 }
 
 static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -339,15 +328,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,
+                                               ob_expand_tilde(c));
+            g_free(c);
+        }
     }
 }
    
@@ -369,7 +358,6 @@ void config_startup(ObParseInst *i)
     config_focus_follow = FALSE;
     config_focus_last = TRUE;
     config_focus_last_on_desktop = TRUE;
-    config_focus_popup = TRUE;
 
     parse_register(i, "focus", parse_focus, NULL);
 
@@ -381,7 +369,6 @@ void config_startup(ObParseInst *i)
 
     config_desktops_num = 4;
     config_desktops_names = NULL;
-    config_desktop_popup = TRUE;
 
     parse_register(i, "desktops", parse_desktops, NULL);
 
@@ -415,7 +402,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 +413,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);
 }