X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstacking.c;h=92a5285d79f3a1ec22882868bbccd136fa5a7675;hb=3b0f41dc66da86aaad4f0343bbfb632c7bbfd0c7;hp=4a58d91ed87c2a39ae5539db95168a7db3e25805;hpb=5ae93282f93ecafc491202a363f944d9604d3437;p=chaz%2Fopenbox

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 4a58d91e..92a5285d 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -25,11 +25,16 @@
 #include "group.h"
 #include "frame.h"
 #include "window.h"
+#include "event.h"
 #include "debug.h"
 
 GList  *stacking_list = NULL;
+/*! When true, stacking changes will not be reflected on the screen.  This is
+  to freeze the on-screen stacking order while a window is being temporarily
+  raised during focus cycling */
+static gboolean pause_changes = FALSE;
 
-void stacking_set_list()
+void stacking_set_list(void)
 {
     Window *windows = NULL;
     GList *it;
@@ -99,12 +104,59 @@ static void do_restack(GList *wins, GList *before)
     }
 #endif
 
-    XRestackWindows(ob_display, win, i);
+    if (!pause_changes)
+        XRestackWindows(ob_display, win, i);
     g_free(win);
 
     stacking_set_list();
 }
 
+void stacking_temp_raise(ObWindow *window)
+{
+    Window win[2];
+    GList *it;
+    gulong start;
+
+    /* don't use this for internal windows..! it would lower them.. */
+    g_assert(window_layer(window) < OB_STACKING_LAYER_INTERNAL);
+
+    /* find the window to drop it underneath */
+    win[0] = screen_support_win;
+    for (it = stacking_list; it; it = g_list_next(it)) {
+        ObWindow *w = it->data;
+        if (window_layer(w) >= OB_STACKING_LAYER_INTERNAL)
+            win[0] = window_top(w);
+        else
+            break;
+    }
+
+    win[1] = window_top(window);
+    start = event_start_ignore_all_enters();
+    XRestackWindows(ob_display, win, 2);
+    event_end_ignore_all_enters(start);
+
+    pause_changes = TRUE;
+}
+
+void stacking_restore(void)
+{
+    Window *win;
+    GList *it;
+    gint i;
+    gulong start;
+
+    win = g_new(Window, g_list_length(stacking_list) + 1);
+    win[0] = screen_support_win;
+    for (i = 1, it = stacking_list; it; ++i, it = g_list_next(it))
+        win[i] = window_top(it->data);
+    start = event_start_ignore_all_enters();
+    XRestackWindows(ob_display, win, i);
+    event_end_ignore_all_enters(start);
+    g_free(win);
+
+    pause_changes = FALSE;
+}
+
 static void do_raise(GList *wins)
 {
     GList *it;
@@ -366,7 +418,7 @@ void stacking_add(ObWindow *win)
 }
 
 static GList *find_highest_relative(ObClient *client)
-{    
+{
     GList *ret = NULL;
 
     if (client->parents) {
@@ -383,7 +435,7 @@ static GList *find_highest_relative(ObClient *client)
                 /* only look at windows in the same layer and that are
                    visible */
                 if (c->layer == client->layer &&
-                    !c->iconic && 
+                    !c->iconic &&
                     (c->desktop == client->desktop ||
                      c->desktop == DESKTOP_ALL ||
                      client->desktop == DESKTOP_ALL))
@@ -411,6 +463,7 @@ void stacking_add_nonintrusive(ObWindow *win)
     ObClient *client;
     GList *it_below = NULL; /* this client will be below us */
     GList *it_above;
+    GList *wins;
 
     if (!WINDOW_IS_CLIENT(win)) {
         stacking_add(win); /* no special rules for others */
@@ -468,7 +521,7 @@ void stacking_add_nonintrusive(ObWindow *win)
             break;
     }
 
-    GList *wins = g_list_append(NULL, win);
+    wins = g_list_append(NULL, win);
     do_restack(wins, it_below);
     g_list_free(wins);
 }