X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=151fdf4513ac36f7c246a5863391682dd9464b7a;hb=a70e22c557cb0aebbb39100681b2772b731947de;hp=63ad67944061d60ff882922057a5de22fec935ef;hpb=64c65f3b67364bb82420dbdd05d7e655b1d74d43;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 63ad6794..151fdf45 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,6 +1,7 @@
 /* -*- 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
 
    This program is free software; you can redistribute it and/or modify
@@ -32,7 +33,8 @@ gboolean config_focus_last;
 
 ObPlacePolicy config_place_policy;
 
-gchar *config_theme;
+gchar   *config_theme;
+gboolean config_theme_keepborder;
 
 gchar *config_title_layout;
 
@@ -248,6 +250,8 @@ 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("keepBorder", node)))
+        config_theme_keepborder = parse_bool(doc, n);
 }
 
 static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -295,6 +299,7 @@ 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("popupShow", node))) {
+        config_resize_popup_show = parse_int(doc, n);
         if (parse_contains("Always", doc, n))
             config_resize_popup_show = 2;
         else if (parse_contains("Never", doc, n))
@@ -303,6 +308,7 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_resize_popup_show = 1;
     }
     if ((n = parse_find_node("popupPosition", node))) {
+        config_resize_popup_pos = parse_int(doc, n);
         if (parse_contains("Top", doc, n))
             config_resize_popup_pos = 1;
         else if (parse_contains("Center", doc, n))
@@ -385,6 +391,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer d)
 {
+    xmlNodePtr n;
     for (node = node->children; node; node = node->next) {
         if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
             gchar *c;
@@ -537,6 +544,7 @@ void config_startup(ObParseInst *i)
     config_theme = NULL;
 
     config_title_layout = g_strdup("NLIMC");
+    config_theme_keepborder = TRUE;
 
     parse_register(i, "theme", parse_theme, NULL);
 
@@ -585,7 +593,7 @@ void config_startup(ObParseInst *i)
     parse_register(i, "resistance", parse_resistance, NULL);
 
     config_menu_warppointer = TRUE;
-    config_menu_xorstyle = TRUE;
+    config_menu_xorstyle = FALSE;
     config_menu_hilightfirst = TRUE;
     config_menu_hide_delay = 250;
     config_menu_files = NULL;