revert a commit xor made in 2003 that always annoyed me, now docks (panels) go in...

diff --git a/openbox/client.c b/openbox/client.c
index 6aec7b295254b730732829ed2e4ab0b390af2307..eaf6907aab304182d5663d9477ae66ebffecb56d 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1795,9 +1795,8 @@ static ObStackingLayer calc_layer(ObClient *self)
     else if (self->type == OB_CLIENT_TYPE_DESKTOP)
         l = OB_STACKING_LAYER_DESKTOP;
     else if (self->type == OB_CLIENT_TYPE_DOCK) {
-        if (self->above) l = OB_STACKING_LAYER_DOCK_ABOVE;
-        else if (self->below) l = OB_STACKING_LAYER_DOCK_BELOW;
-        else l = OB_STACKING_LAYER_DOCK_NORMAL;
+        if (self->below) l = OB_STACKING_LAYER_NORMAL;
+        else l = OB_STACKING_LAYER_ABOVE;
     }
     else if (self->above) l = OB_STACKING_LAYER_ABOVE;
     else if (self->below) l = OB_STACKING_LAYER_BELOW;

diff --git a/openbox/config.c b/openbox/config.c
index cc44e129ac7e113e04fb9830935c60466a0ed132..ad1ea8c674ab3b53ce7363a1f5e29cdb0b82502e 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -364,11 +364,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     }
     if ((n = parse_find_node("stacking", node))) {
         if (parse_contains("top", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
+            config_dock_layer = OB_STACKING_LAYER_ABOVE;
         else if (parse_contains("normal", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_DOCK_NORMAL;
+            config_dock_layer = OB_STACKING_LAYER_NORMAL;
         else if (parse_contains("bottom", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_DOCK_BELOW;
+            config_dock_layer = OB_STACKING_LAYER_BELOW;
     }
     if ((n = parse_find_node("direction", node))) {
         if (parse_contains("horizontal", doc, n))
@@ -568,7 +568,7 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resize", parse_resize, NULL);
 
-    config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
+    config_dock_layer = OB_STACKING_LAYER_ABOVE;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
     config_dock_floating = FALSE;
     config_dock_x = 0;

diff --git a/openbox/stacking.h b/openbox/stacking.h
index 2b18f820137abc6dddad5d774ce521a31ae25dba..409535aef3a729343c9ed07f90e4c67ece04d9de 100644 (file)
--- a/openbox/stacking.h
+++ b/openbox/stacking.h
@@ -27,14 +27,11 @@
 /*! The possible stacking layers a client window can be a part of */
 typedef enum {
     OB_STACKING_LAYER_DESKTOP,     /*!< 0 - desktop windows */
-    OB_STACKING_LAYER_DOCK_BELOW,  /*!< 1 - dock windows set to below */
-    OB_STACKING_LAYER_BELOW,       /*!< 2 - normal windows w/ below */
-    OB_STACKING_LAYER_NORMAL,      /*!< 3 - normal windows */
-    OB_STACKING_LAYER_ABOVE,       /*!< 4 - normal windows w/ above */
-    OB_STACKING_LAYER_DOCK_NORMAL, /*!< 5 - dock windows set to on top */
-    OB_STACKING_LAYER_DOCK_ABOVE,  /*!< 6 - dock windows set to on top */
-    OB_STACKING_LAYER_FULLSCREEN,  /*!< 7 - fullscreeen windows */
-    OB_STACKING_LAYER_INTERNAL,    /*!< 8 - openbox windows/menus */
+    OB_STACKING_LAYER_BELOW,       /*!< 1 - normal windows w/ below */
+    OB_STACKING_LAYER_NORMAL,      /*!< 2 - normal windows */
+    OB_STACKING_LAYER_ABOVE,       /*!< 3 - normal windows w/ above */
+    OB_STACKING_LAYER_FULLSCREEN,  /*!< 4 - fullscreeen windows */
+    OB_STACKING_LAYER_INTERNAL,    /*!< 5 - openbox windows/menus */
     OB_NUM_STACKING_LAYERS
 } ObStackingLayer;