X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=d406f8f166c9c9d6c5434f20344e7ba8bed681ba;hb=66c350763fa85cfda0b6561ace9c032d3aa03b71;hp=66c836ea16d0238e0178e47a68bc1c9f7e44442e;hpb=17b2d57717504e2018d3ba23e0deffe55fc6d084;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 66c836ea..d406f8f1 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -40,7 +40,6 @@ gboolean config_theme_keepborder; gboolean config_theme_hidedisabled; gchar *config_title_layout; -gboolean config_title_number; RrFont *config_font_activewindow; RrFont *config_font_inactivewindow; @@ -76,7 +75,6 @@ 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; @@ -437,8 +435,6 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, g_free(config_title_layout); config_title_layout = parse_string(doc, n); } - if ((n = parse_find_node("titleNumber", node))) - config_title_number = parse_bool(doc, n); if ((n = parse_find_node("keepBorder", node))) config_theme_keepborder = parse_bool(doc, n); if ((n = parse_find_node("hideDisabled", node))) @@ -452,9 +448,6 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gint size = RrDefaultFontSize; RrFontWeight weight = RrDefaultFontWeight; RrFontSlant slant = RrDefaultFontSlant; - gboolean shadow = RrDefaultFontShadow; - gint offset = RrDefaultFontShadowOffset; - gchar tint = RrDefaultFontShadowTint; if (parse_attr_contains("ActiveWindow", n, "place")) font = &config_font_activewindow; @@ -489,18 +482,8 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, slant = RR_FONTSLANT_OBLIQUE; g_free(s); } - if ((fnode = parse_find_node("shadow", n->children))) - shadow = parse_bool(doc, fnode); - if ((fnode = parse_find_node("shadowoffset", n->children))) - offset = parse_int(doc, fnode); - if ((fnode = parse_find_node("shadowtint", n->children))) { - tint = parse_int(doc, fnode); - if (tint > 100) tint = 100; - else if (tint < -100) tint = -100; - } - *font = RrFontOpen(ob_rr_inst, name, size, weight, slant, - shadow, offset, tint); + *font = RrFontOpen(ob_rr_inst, name, size, weight, slant); g_free(name); next_font: n = parse_find_node("font", n->next); @@ -663,8 +646,6 @@ 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))) @@ -810,7 +791,6 @@ void config_startup(ObParseInst *i) config_theme = NULL; config_title_layout = g_strdup("NLIMC"); - config_title_number = TRUE; config_theme_keepborder = TRUE; config_theme_hidedisabled = FALSE; @@ -870,7 +850,6 @@ 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;