two hands raised, keepBorder added to <theme> section

diff --git a/openbox/client.c b/openbox/client.c
index a465f566326d58d29256d1addaef02eee7eef64b..12bfb6a693d6c4b308fe2cd3042119c5523a78d4 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1257,8 +1257,12 @@ void client_setup_decor_and_functions(ObClient *self)
 
     /* finally, the user can have requested no decorations, which overrides
        everything (but doesnt give it a border if it doesnt have one) */
-    if (self->undecorated)
-        self->decorations = 0; //&= OB_FRAME_DECOR_BORDER;
+    if (self->undecorated) {
+        if (config_theme_keepborder)
+            self->decorations &= OB_FRAME_DECOR_BORDER;
+        else
+            self->decorations = 0;
+    }
 
     /* if we don't have a titlebar, then we cannot shade! */
     if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))

diff --git a/openbox/config.c b/openbox/config.c
index 4b58fbd969d29ea46c279daf8418337b5a92199d..151fdf4513ac36f7c246a5863391682dd9464b7a 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -33,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;
 
@@ -249,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,
@@ -541,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);