* Change xml parsing to pass the parent node, rather than the first

child.
* Add x,y co-ordinates on showmenu action so we can place menus on keypress.

diff --git a/openbox/config.c b/openbox/config.c
index 42d479aff480ff92d2a7b2688e8978d8f01bc9f4..5089a335f5576d5434ddd0a90a0a5830e837012a 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -28,6 +28,8 @@ static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
     xmlNodePtr n;
 
+    node = node->xmlChildrenNode;
+    
     if ((n = parse_find_node("focusNew", node)))
         config_focus_new = parse_bool(doc, n);
     if ((n = parse_find_node("followMouse", node)))
@@ -44,6 +46,8 @@ static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
     xmlNodePtr n;
 
+    node = node->xmlChildrenNode;
+
     if ((n = parse_find_node("theme", node))) {
         g_free(config_theme);
         config_theme = parse_string(doc, n);
@@ -54,6 +58,8 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
     xmlNodePtr n;
 
+    node = node->xmlChildrenNode;
+    
     if ((n = parse_find_node("number", node)))
         config_desktops_num = parse_int(doc, n);
     if ((n = parse_find_node("names", node))) {
@@ -78,6 +84,8 @@ static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
     xmlNodePtr n;
 
+    node = node->xmlChildrenNode;
+    
     if ((n = parse_find_node("opaqueMove", node)))
         config_opaque_move = parse_bool(doc, n);
     if ((n = parse_find_node("opaqueResize", node)))
@@ -88,6 +96,8 @@ static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
     xmlNodePtr n;
 
+    node = node->xmlChildrenNode;
+
     if ((n = parse_find_node("position", node))) {
         if (parse_contains("TopLeft", doc, n))
             config_dock_floating = FALSE,

diff --git a/openbox/menu.c b/openbox/menu.c
index cd27e1fb3e54ec6d506ef01ea358e0f57f97fb07..c953708bbd9ea5659fe4aabccddc5496523a14db 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -33,20 +33,30 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
     ObMenu *menu = NULL, *parent;
 
     if (newmenu == TRUE) {
-        if (!parse_attr_string("id", node->parent, &id))
+        if (!parse_attr_string("id", node, &id))
             goto parse_menu_fail;
-        if (!parse_attr_string("label", node->parent, &title))
+        if (!parse_attr_string("label", node, &title))
             goto parse_menu_fail;
-
         g_message("menu label %s", title);
 
-        menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
-
+        if (parse_attr_string("plugin", node, &plugin)) {
+            PluginMenuCreateData data = {
+                .doc = doc,
+                .node = node,
+                .parent = menu
+            };
+            parent = plugin_create(plugin, &data);
+            g_free(plugin);
+        } else
+            menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
+            
         if (data)
             *((ObMenu**)data) = menu;
     } else {
         menu = (ObMenu *)data;
     }
+
+    node = node->xmlChildrenNode;
     
     while (node) {
         if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) {
@@ -59,7 +69,7 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
                 g_free(plugin);
             } else {
                 parent = menu;
-                parse_menu(doc, node->xmlChildrenNode, &parent);
+                parse_menu(doc, node, &parent);
                 menu_add_entry(menu, menu_entry_new_submenu(parent->label,
                                                             parent));
             }

diff --git a/parser/parse.c b/parser/parse.c
index 2b81594adcf38032682c6c0aa96f4e1d61631684..72643652e9ce588f5905a8c4a750d581517c9f67 100644 (file)
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -100,7 +100,7 @@ void parse_tree(xmlDocPtr doc, xmlNodePtr node, void *nothing)
         struct Callback *c = g_hash_table_lookup(callbacks, node->name);
 
         if (c)
-            c->func(doc, node->xmlChildrenNode, c->data);
+            c->func(doc, node, c->data);
 
         node = node->next;
     }

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 5ffb3ef5f81ded134435c53c63434d4474d294ec..33f8409ef76bf921861bb9fbdf7a3d30d02d1ddb 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -69,7 +69,7 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist)
 
 static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    parse_key(doc, node, NULL);
+    parse_key(doc, node->xmlChildrenNode, NULL);
 }
 
 void plugin_setup_config()
@@ -249,6 +249,11 @@ static void event(ObEvent *e, void *foo)
                                 grabbed_key = p;
                             }
 
+                            if (act->func == action_showmenu) {
+                                act->data.showmenu.x = e->data.x.e->xkey.x_root;
+                                act->data.showmenu.y = e->data.x.e->xkey.y_root;
+                            }
+
                             act->data.any.c = focus_client;
                             act->func(&act->data);
                         }

diff --git a/plugins/menu/fifo_menu.c b/plugins/menu/fifo_menu.c
index 71326225974ec18d5a49ea54cc13f78ccce96226..3443294e2ced983b66c85e424956c6a71056bfb2 100644 (file)
--- a/plugins/menu/fifo_menu.c
+++ b/plugins/menu/fifo_menu.c
@@ -133,6 +133,11 @@ void plugin_destroy (ObMenu *m)
         FIFO_MENU_DATA(m)->fifo = NULL;
     }
 
+    if (FIFO_MENU_DATA(m)->buf != NULL) {
+        g_free(FIFO_MENU_DATA(m)->buf);
+        FIFO_MENU_DATA(m)->buf = NULL;
+    }
+ 
     g_free(m->plugin_data);
 
     menu_free(m->name);
@@ -162,9 +167,11 @@ void *plugin_create(PluginMenuCreateData *data)
     m = menu_new( (label != NULL ? label : ""),
                   (id != NULL ? id : PLUGIN_NAME),
                   data->parent);
-    menu_add_entry(data->parent, menu_entry_new_submenu(
-                       (label != NULL ? label : ""),
-                       m));
+
+    if (data->parent)
+        menu_add_entry(data->parent, menu_entry_new_submenu(
+                           (label != NULL ? label : ""),
+                           m));
 
     g_free(label);
     g_free(id);

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index 91ff7c4b18dd4ee358d44a42d67b4a0983584758..6ac7bab0a69e703e1eaf87794f765dbd3aa75c41 100644 (file)
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -31,6 +31,8 @@ static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
     MouseAction mact;
     Action *action;
 
+    node = node->xmlChildrenNode;
+    
     if ((n = parse_find_node("dragThreshold", node)))
         threshold = parse_int(doc, n);
     if ((n = parse_find_node("doubleClickTime", node)))

diff --git a/plugins/placement/history.c b/plugins/placement/history.c
index eeff1f63f39a976cf2b143e2a7dfe5fe20647a39..27efa677c526e84fea2613b8fc9d19d6d0684795 100644 (file)
--- a/plugins/placement/history.c
+++ b/plugins/placement/history.c
@@ -181,7 +181,7 @@ static void save_history()
     xmlIndentTreeOutput = 1;
     xmlSaveFormatFile(history_path, doc, 1);
 
-    xmlFree(doc);
+    xmlFreeDoc(doc);
 }
 
 static void load_history()
@@ -236,7 +236,7 @@ static void load_history()
         g_free(name); g_free(class); g_free(role);
         node = parse_find_node("entry", node->next);
     }
-    xmlFree(doc);
+    xmlFreeDoc(doc);
 }
 
 void history_startup()