noStrut actually works now

diff --git a/CHANGELOG b/CHANGELOG
index 8ccc070973e282d1254abed749469296e916b90b..5a4a2f81cad91dd65d77568cccf3bf7aba37d105 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
   * Fixed some typos and errors in rc.xsd
   * Add the noStrut option to the dock (to allow maximizing windows over it),
     useful when it is not in the above layer.
+  * Fix transparent terminals not updating when using ToggleDecor.
 
 3.3-rc1:
   * Poked around a bit in the code that keeps windows onscreen, if you

diff --git a/openbox/config.c b/openbox/config.c
index f086a1a37c9e41bc7553ce1da732c0d4339d2954..8c86b973fbcf3bb703a6354d17fb2e506b7bbe8d 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -49,6 +49,7 @@ gint     config_resize_popup_pos;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
+gboolean        config_dock_nostrut;
 ObDirection     config_dock_pos;
 gint            config_dock_x;
 gint            config_dock_y;
@@ -363,7 +364,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_dock_y = parse_int(doc, n);
     } else {
         if ((n = parse_find_node("noStrut", node)))
-            config_dock_floating = parse_bool(doc, n);
+            config_dock_nostrut = parse_bool(doc, n);
     }
     if ((n = parse_find_node("stacking", node))) {
         if (parse_contains("top", doc, n))
@@ -574,6 +575,7 @@ void config_startup(ObParseInst *i)
     config_dock_layer = OB_STACKING_LAYER_ABOVE;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
     config_dock_floating = FALSE;
+    config_dock_nostrut = FALSE;
     config_dock_x = 0;
     config_dock_y = 0;
     config_dock_orient = OB_ORIENTATION_VERT;

diff --git a/openbox/config.h b/openbox/config.h
index d7fc51f74a0ad1b85d97e33ac376bdc88c6e342e..b04d06af9ea0f83e3b317b37ff4177195814464a 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -58,6 +58,8 @@ extern gint config_resize_popup_pos;
 extern ObStackingLayer config_dock_layer;
 /*! Is the dock floating */
 extern gboolean config_dock_floating;
+/*! Don't use a strut for the dock */
+extern gboolean config_dock_nostrut;
 /*! Where to place the dock if not floating */
 extern ObDirection config_dock_pos;
 /*! If config_dock_floating, this is the top-left corner's

diff --git a/openbox/dock.c b/openbox/dock.c
index b127d40b376e4dfc6a3ba2078ad72bd6b8fc0140..ac09a91332e19a77873232bac42a9746cfdd4261 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -410,7 +410,7 @@ void dock_configure()
     if (!dock->dock_apps) {
         STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0);
-    } else if (config_dock_floating) {
+    } else if (config_dock_floating || config_dock_nostrut) {
         STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0);
     } else {