From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 6 Feb 2005 16:00:24 +0000 (+0000)
Subject: revert a commit xor made in 2003 that always annoyed me, now docks (panels) go in... 
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=e74fbdaa0e8ee61b747b4efb4f66ae3992af925c;p=chaz%2Fopenbox

revert a commit xor made in 2003 that always annoyed me, now docks (panels) go in the same layers as normal windows again. docks that dont specify layer go in the ABOVE layer and those that specify BELOW get put in the NORMAL layer.
---

diff --git a/openbox/client.c b/openbox/client.c
index 6aec7b29..eaf6907a 100644
--- 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 cc44e129..ad1ea8c6 100644
--- 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 2b18f820..409535ae 100644
--- 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;