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

[chaz/openbox] / plugins / keyboard / keyboard.c

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);
                         }