RrFont *config_font_inactivewindow;
RrFont *config_font_menuitem;
RrFont *config_font_menutitle;
+RrFont *config_font_osd;
gint config_desktops_num;
GSList *config_desktops_names;
if (!parse_attr_string("key", node, &key))
return;
+
parse_attr_bool("chroot", node, &is_chroot);
keylist = g_list_append(keylist, key);
- /* a node either contains actions or key bindings */
if ((n = parse_find_node("keybind", node->children))) {
while (n) {
parse_key(i, doc, n, keylist);
n = parse_find_node("keybind", n->next);
}
- } else if ((n = parse_find_node("action", node->children))) {
+ }
+ else if ((n = parse_find_node("action", node->children))) {
while (n) {
ObAction *action;
g_free(key);
keylist = g_list_delete_link(keylist, g_list_last(keylist));
-
- /* go to next sibling */
- if (node->next) parse_key(i, doc, node->next, keylist);
}
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
if ((n = parse_find_node("keybind", node->children)))
- parse_key(i, doc, n, NULL);
+ while (n) {
+ parse_key(i, doc, n, NULL);
+ n = parse_find_node("keybind", n->next);
+ }
}
/*
font = &config_font_activewindow;
else if (parse_attr_contains("InactiveWindow", n, "place"))
font = &config_font_inactivewindow;
- else if (parse_attr_contains("MenuTitle", n, "place"))
+ else if (parse_attr_contains("MenuHeader", n, "place"))
font = &config_font_menutitle;
else if (parse_attr_contains("MenuItem", n, "place"))
font = &config_font_menuitem;
+ else if (parse_attr_contains("OnScreenDisplay", n, "place"))
+ font = &config_font_osd;
else
goto next_font;