diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/config.c | 10 | ||||
| -rw-r--r-- | openbox/menu.c | 22 |
2 files changed, 26 insertions, 6 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)); } |