break focus. or maybe make it better.

[chaz/openbox] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 1b3833b40d700a5fc9ad7ade517ebb65ae672e06..4d04bb24bcce44f7193d912df676c028e6cdd9c6 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);
@@ -205,6 +210,7 @@ static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise)
     return ret;
 }
 
+#if 0
 static GList *pick_group_windows(ObClient *top, ObClient *selected,
                                  gboolean raise)
 {
@@ -233,6 +239,7 @@ static GList *pick_group_windows(ObClient *top, ObClient *selected,
     }
     return ret;
 }
+#endif
 
 void stacking_raise(ObWindow *window)
 {
@@ -242,7 +249,8 @@ void stacking_raise(ObWindow *window)
         ObClient *c;
         ObClient *selected;
         selected = WINDOW_AS_CLIENT(window);
-        c = client_search_top_transient(selected);
+        g_message("raising 0x%x", selected->window);
+        /*c = client_search_top_transient(selected);*/ c = selected;
         wins = pick_windows(c, selected, TRUE);
         /*wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE));*/
     } else {
@@ -272,6 +280,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;