X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=a2b392dab2fd27af22d071770c89c50c90ccb8cb;hb=f999797f01755dcb5de3db010ad282feb8e3ac37;hp=8f197df57adeafddebd0b48f3e21e6473630fc17;hpb=25917a3498c5a756cffdd0472210dbe416f47a52;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 8f197df5..a2b392da 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;
@@ -40,7 +41,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 +76,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 +436,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 +449,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,24 +483,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))) {
-            xmlNodePtr snode;
-            gboolean   s;
 
-            if (parse_attr_bool("enabled", fnode, &s))
-                shadow = s;
-            
-            if ((snode = parse_find_node("offset", fnode->children)))
-                offset = parse_int(doc, snode);
-            if ((snode = parse_find_node("tint", fnode->children))) {
-                tint = parse_int(doc, snode);
-                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);
@@ -648,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);
     }
@@ -669,8 +647,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)))
@@ -816,7 +792,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;
 
@@ -876,7 +851,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;