add stacking_below which moves a window to immediately below another window. use...

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 1b3833b40d700a5fc9ad7ade517ebb65ae672e06..3fa21ded17bb81b0fd51a4132fb91cc38186c7b6 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -42,13 +42,16 @@ static void do_restack(GList *wins, GList *before)
     Window *win;
     int i;
 
+#ifdef DEBUG
     /* pls only restack stuff in the same layer at a time */
     for (it = wins; it; it = next) {
         next = g_list_next(it);
         if (!next) break;
         g_assert (window_layer(it->data) == window_layer(next->data));
     }
-
+    if (before)
+        g_assert(window_layer(it->data) >= window_layer(before->data));
+#endif
 
     win = g_new(Window, g_list_length(wins) + 1);
 
@@ -66,12 +69,14 @@ static void do_restack(GList *wins, GList *before)
         stacking_list = g_list_insert_before(stacking_list, before, it->data);
     }
 
-    /* XXX some debug checking of the stacking list's order */
+#ifdef DEBUG
+    /* some debug checking of the stacking list's order */
     for (it = stacking_list; ; it = next) {
         next = g_list_next(it);
         if (!next) break;
         g_assert(window_layer(it->data) >= window_layer(next->data));
     }
+#endif
 
     XRestackWindows(ob_display, win, i);
     g_free(win);
@@ -272,6 +277,20 @@ void stacking_lower(ObWindow *window)
     g_list_free(wins);
 }
 
+void stacking_below(ObWindow *window, ObWindow *below)
+{
+    GList *wins, *before;
+
+    if (window_layer(window) != window_layer(below))
+        return;
+
+    wins = g_list_append(NULL, window);
+    stacking_list = g_list_remove(stacking_list, window);
+    before = g_list_next(g_list_find(stacking_list, below));
+    do_restack(wins, before);
+    g_list_free(wins);
+}
+
 void stacking_add(ObWindow *win)
 {
     ObStackingLayer l;

diff --git a/openbox/stacking.h b/openbox/stacking.h
index 132ef4902491e988ed8fd3a1fe24a59d1c606d77..083d20249f57559ea92f5df758797257139ccf6d 100644 (file)
--- a/openbox/stacking.h
+++ b/openbox/stacking.h
@@ -32,7 +32,10 @@ void stacking_add_nonintrusive(ObWindow *win);
 /*! Raises a window above all others in its stacking layer */
 void stacking_raise(ObWindow *window);
 
-/*! Lowers a client window below all others in its stacking layer */
+/*! Lowers a window below all others in its stacking layer */
 void stacking_lower(ObWindow *window);
 
+/*! Moves a window below another if its in the same layer */
+void stacking_below(ObWindow *window, ObWindow *below);
+
 #endif