summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--openbox/config.c10
-rw-r--r--openbox/menu.c22
-rw-r--r--parser/parse.c2
-rw-r--r--plugins/keyboard/keyboard.c7
-rw-r--r--plugins/menu/fifo_menu.c13
-rw-r--r--plugins/mouse/mouse.c2
-rw-r--r--plugins/placement/history.c4
7 files changed, 47 insertions, 13 deletions
diff --git a/openbox/config.c b/openbox/config.c
index 42d479af..5089a335 100644
--- 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 cd27e1fb..c953708b 100644
--- 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 2b81594a..72643652 100644
--- 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 5ffb3ef5..33f8409e 100644
--- 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 71326225..3443294e 100644
--- 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 91ff7c4b..6ac7bab0 100644
--- 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 eeff1f63..27efa677 100644
--- 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()
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-17 11:08:49 +0000