X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=a496ae4530edd6ddcdcef82f577f6d1c18fdc739;hb=a43303bdcbb5460f8d50823c4d0cedc30de6bb57;hp=be87bde79e01a20e0389044310ff359de2c4c252;hpb=1afc4180d72d335d93cb9ad8ec9a0dc4d5ae003b;p=chaz%2Fopenbox

diff --git a/openbox/stacking.c b/openbox/stacking.c
index be87bde7..a496ae45 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   stacking.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "openbox.h"
 #include "prop.h"
 #include "screen.h"
@@ -42,13 +60,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 +87,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,7 +228,9 @@ static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise)
     return ret;
 }
 
-static GList *pick_group_windows(ObClient *top, ObClient *selected, gboolean raise)
+#if 0
+static GList *pick_group_windows(ObClient *top, ObClient *selected,
+                                 gboolean raise)
 {
     GList *ret = NULL;
     GList *it, *next, *prev;
@@ -232,6 +257,7 @@ static GList *pick_group_windows(ObClient *top, ObClient *selected, gboolean rai
     }
     return ret;
 }
+#endif
 
 void stacking_raise(ObWindow *window)
 {
@@ -241,9 +267,9 @@ void stacking_raise(ObWindow *window)
         ObClient *c;
         ObClient *selected;
         selected = WINDOW_AS_CLIENT(window);
-        c = client_search_top_transient(selected);
+        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));
+        /*wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE));*/
     } else {
         wins = g_list_append(NULL, window);
         stacking_list = g_list_remove(stacking_list, window);
@@ -262,7 +288,7 @@ void stacking_lower(ObWindow *window)
         selected = WINDOW_AS_CLIENT(window);
         c = client_search_top_transient(selected);
         wins = pick_windows(c, selected, FALSE);
-        wins = g_list_concat(pick_group_windows(c, selected, FALSE), wins);
+        /*wins = g_list_concat(pick_group_windows(c, selected, FALSE), wins);*/
     } else {
         wins = g_list_append(NULL, window);
         stacking_list = g_list_remove(stacking_list, window);
@@ -271,6 +297,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;