RrFont *config_font_inactivewindow;
RrFont *config_font_menuitem;
RrFont *config_font_menutitle;
+RrFont *config_font_osd;
gint config_desktops_num;
GSList *config_desktops_names;
GList *keylist)
{
gchar *key;
- ObAction *action;
- xmlNodePtr n, nact;
- GList *it;
+ xmlNodePtr n;
+ gboolean is_chroot = FALSE;
- if ((n = parse_find_node("chainQuitKey", node))) {
- key = parse_string(doc, n);
- translate_key(key, &config_keyboard_reset_state,
- &config_keyboard_reset_keycode);
- g_free(key);
- }
+ if (!parse_attr_string("key", node, &key))
+ return;
- n = parse_find_node("keybind", node);
- while (n) {
- if (parse_attr_string("key", n, &key)) {
- keylist = g_list_append(keylist, key);
+ parse_attr_bool("chroot", node, &is_chroot);
- parse_key(i, doc, n->children, keylist);
+ keylist = g_list_append(keylist, key);
- it = g_list_last(keylist);
- g_free(it->data);
- keylist = g_list_delete_link(keylist, it);
+ if ((n = parse_find_node("keybind", node->children))) {
+ while (n) {
+ parse_key(i, doc, n, keylist);
+ n = parse_find_node("keybind", n->next);
}
- n = parse_find_node("keybind", n->next);
}
- if (keylist) {
- nact = parse_find_node("action", node);
- while (nact) {
- if ((action = action_parse(i, doc, nact,
- OB_USER_ACTION_KEYBOARD_KEY)))
+ else if ((n = parse_find_node("action", node->children))) {
+ while (n) {
+ ObAction *action;
+
+ action = action_parse(i, doc, n, OB_USER_ACTION_KEYBOARD_KEY);
+ if (action)
keyboard_bind(keylist, action);
- nact = parse_find_node("action", nact->next);
+ n = parse_find_node("action", n->next);
}
}
+
+ if (is_chroot)
+ keyboard_chroot(keylist);
+
+ g_free(key);
+ keylist = g_list_delete_link(keylist, g_list_last(keylist));
}
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
gpointer d)
{
+ xmlNodePtr n;
+ gchar *key;
+
keyboard_unbind_all();
- parse_key(i, doc, node->children, NULL);
+ if ((n = parse_find_node("chainQuitKey", node->children))) {
+ key = parse_string(doc, n);
+ translate_key(key, &config_keyboard_reset_state,
+ &config_keyboard_reset_keycode);
+ g_free(key);
+ }
+
+ if ((n = parse_find_node("keybind", node->children)))
+ 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;
config_dock_nostrut = parse_bool(doc, n);
}
if ((n = parse_find_node("stacking", node))) {
- if (parse_contains("top", doc, n))
+ if (parse_contains("above", doc, n))
config_dock_layer = OB_STACKING_LAYER_ABOVE;
else if (parse_contains("normal", doc, n))
config_dock_layer = OB_STACKING_LAYER_NORMAL;
- else if (parse_contains("bottom", doc, n))
+ else if (parse_contains("below", doc, n))
config_dock_layer = OB_STACKING_LAYER_BELOW;
}
if ((n = parse_find_node("direction", node))) {