X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=a2b392dab2fd27af22d071770c89c50c90ccb8cb;hb=a488360f48abbfd6e67576a1844d792b28e6065c;hp=574d13ee7ff8fb730a857935c24b35b41b856453;hpb=e72a1232fa73450c4bfefef5657971ecbacb8f70;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 574d13ee..a2b392da 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -1,8 +1,8 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- config.c for the Openbox window manager - Copyright (c) 2004 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + 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; @@ -39,11 +40,16 @@ gchar *config_theme; gboolean config_theme_keepborder; gboolean config_theme_hidedisabled; -gchar *config_title_layout; +gchar *config_title_layout; + +RrFont *config_font_activewindow; +RrFont *config_font_inactivewindow; +RrFont *config_font_menuitem; +RrFont *config_font_menutitle; gint config_desktops_num; GSList *config_desktops_names; -gint config_screen_firstdesk; +guint config_screen_firstdesk; gboolean config_resize_redraw; gboolean config_resize_four_corners; @@ -70,16 +76,15 @@ gint config_mouse_threshold; gint config_mouse_dclicktime; gboolean config_menu_warppointer; -gboolean config_menu_xorstyle; guint config_menu_hide_delay; +gboolean config_menu_middle; guint config_submenu_show_delay; gboolean config_menu_client_list_icons; GSList *config_menu_files; -gint config_resist_win; -gint config_resist_edge; - +gint config_resist_win; +gint config_resist_edge; gboolean config_resist_layers_below; GSList *config_per_app_settings; @@ -132,6 +137,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, settings->name = name; else settings->name = NULL; + if (class_set) settings->class = class; else @@ -434,6 +440,55 @@ 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); + + n = parse_find_node("font", node); + while (n) { + xmlNodePtr fnode; + RrFont **font; + gchar *name = g_strdup(RrDefaultFontFamily); + gint size = RrDefaultFontSize; + RrFontWeight weight = RrDefaultFontWeight; + RrFontSlant slant = RrDefaultFontSlant; + + if (parse_attr_contains("ActiveWindow", n, "place")) + font = &config_font_activewindow; + else if (parse_attr_contains("InactiveWindow", n, "place")) + font = &config_font_inactivewindow; + else if (parse_attr_contains("MenuTitle", n, "place")) + font = &config_font_menutitle; + else if (parse_attr_contains("MenuItem", n, "place")) + font = &config_font_menuitem; + else + goto next_font; + + if ((fnode = parse_find_node("name", n->children))) { + g_free(name); + name = parse_string(doc, fnode); + } + if ((fnode = parse_find_node("size", n->children))) { + int s = parse_int(doc, fnode); + if (s > 0) size = s; + } + if ((fnode = parse_find_node("weight", n->children))) { + gchar *w = parse_string(doc, fnode); + if (!g_ascii_strcasecmp(w, "Bold")) + weight = RR_FONTWEIGHT_BOLD; + g_free(w); + } + if ((fnode = parse_find_node("slant", n->children))) { + gchar *s = parse_string(doc, fnode); + if (!g_ascii_strcasecmp(s, "Italic")) + slant = RR_FONTSLANT_ITALIC; + if (!g_ascii_strcasecmp(s, "Oblique")) + slant = RR_FONTSLANT_OBLIQUE; + g_free(s); + } + + *font = RrFontOpen(ob_rr_inst, name, size, weight, slant); + g_free(name); + next_font: + n = parse_find_node("font", n->next); + } } static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -451,7 +506,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if ((n = parse_find_node("firstdesk", node))) { gint d = parse_int(doc, n); if (d > 0) - config_screen_firstdesk = d; + config_screen_firstdesk = (unsigned) d; } if ((n = parse_find_node("names", node))) { GSList *it; @@ -571,7 +626,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); } @@ -592,10 +647,10 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } if ((n = parse_find_node("warpPointer", node))) config_menu_warppointer = parse_bool(doc, n); - if ((n = parse_find_node("xorStyle", node))) - config_menu_xorstyle = parse_bool(doc, n); if ((n = parse_find_node("hideDelay", node))) config_menu_hide_delay = parse_int(doc, n); + if ((n = parse_find_node("middle", node))) + config_menu_middle = parse_bool(doc, n); if ((n = parse_find_node("submenuShowDelay", node))) config_submenu_show_delay = parse_int(doc, n); if ((n = parse_find_node("desktopMenuIcons", node))) @@ -712,7 +767,7 @@ static void bind_default_mouse() uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK; break; case OB_MOUSE_ACTION_MOTION: uact = OB_USER_ACTION_MOUSE_MOTION; break; - case OB_NUM_MOUSE_ACTIONS: + default: g_assert_not_reached(); } mouse_bind(it->button, it->context, it->mact, @@ -740,6 +795,11 @@ void config_startup(ObParseInst *i) config_theme_keepborder = TRUE; config_theme_hidedisabled = FALSE; + config_font_activewindow = NULL; + config_font_inactivewindow = NULL; + config_font_menuitem = NULL; + config_font_menutitle = NULL; + parse_register(i, "theme", parse_theme, NULL); config_desktops_num = 4; @@ -791,8 +851,8 @@ void config_startup(ObParseInst *i) parse_register(i, "resistance", parse_resistance, NULL); config_menu_warppointer = TRUE; - config_menu_xorstyle = TRUE; config_menu_hide_delay = 250; + config_menu_middle = FALSE; config_submenu_show_delay = 0; config_menu_client_list_icons = TRUE; config_menu_files = NULL; @@ -812,6 +872,11 @@ void config_shutdown() g_free(config_title_layout); + RrFontClose(config_font_activewindow); + RrFontClose(config_font_inactivewindow); + RrFontClose(config_font_menuitem); + RrFontClose(config_font_menutitle); + for (it = config_desktops_names; it; it = g_slist_next(it)) g_free(it->data); g_slist_free(config_desktops_names);