X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fconfig.c;h=367fb2f9e9b3e335d0ae23ed87beb99fa40fb86a;hb=2b658f3d9bbb78ed3904edb44826b27380e80a1a;hp=d406f8f166c9c9d6c5434f20344e7ba8bed681ba;hpb=e6c82786ff65e7681c980c8adebe082656c16438;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index d406f8f1..367fb2f9 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -2,7 +2,7 @@ config.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "screen.h" #include "parser/parse.h" #include "openbox.h" +#include "gettext.h" gboolean config_focus_new; gboolean config_focus_follow; @@ -41,10 +42,13 @@ gboolean config_theme_hidedisabled; gchar *config_title_layout; +gboolean config_animate_iconify; + RrFont *config_font_activewindow; RrFont *config_font_inactivewindow; RrFont *config_font_menuitem; RrFont *config_font_menutitle; +RrFont *config_font_osd; gint config_desktops_num; GSList *config_desktops_names; @@ -272,47 +276,60 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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); + } } /* @@ -439,6 +456,8 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_theme_keepborder = parse_bool(doc, n); if ((n = parse_find_node("hideDisabled", node))) config_theme_hidedisabled = parse_bool(doc, n); + if ((n = parse_find_node("animateIconify", node))) + config_animate_iconify = parse_bool(doc, n); n = parse_find_node("font", node); while (n) { @@ -453,10 +472,12 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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; @@ -534,8 +555,6 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if ((n = parse_find_node("drawContents", node))) config_resize_redraw = parse_bool(doc, n); - if ((n = parse_find_node("fourCorner", node))) - config_resize_four_corners = parse_bool(doc, n); if ((n = parse_find_node("popupShow", node))) { config_resize_popup_show = parse_int(doc, n); if (parse_contains("Always", doc, n)) @@ -599,11 +618,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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))) { @@ -625,7 +644,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_dock_app_move_button = b; config_dock_app_move_modifiers = s; } else { - g_warning("invalid button '%s'", str); + g_message(_("Invalid button '%s' specified in config file"), str); } g_free(str); } @@ -790,6 +809,7 @@ void config_startup(ObParseInst *i) config_theme = NULL; + config_animate_iconify = TRUE; config_title_layout = g_strdup("NLIMC"); config_theme_keepborder = TRUE; config_theme_hidedisabled = FALSE;