From abc67cbdc1c1e61e074f8f312eaecb357cd0aa5c Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 11 Jan 2008 15:28:26 -0500 Subject: make it possible to temporarily raise a window to the top, and restore it. also fix the return val for window_layer. --- openbox/stacking.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'openbox/stacking.c') diff --git a/openbox/stacking.c b/openbox/stacking.c index b23e6eac..bb8975d4 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -105,6 +105,42 @@ static void do_restack(GList *wins, GList *before) stacking_set_list(); } +void stacking_temp_raise(ObWindow *window) +{ + Window win[2]; + GList *it; + + /* 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); + XRestackWindows(ob_display, win, 2); +} + +void stacking_restore() +{ + Window *win; + GList *it; + gint i; + + 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); + XRestackWindows(ob_display, win, i); + g_free(win); +} + static void do_raise(GList *wins) { GList *it; -- cgit v1.2.3 From e61f58462fe0cdd85090b621c6906b2885990071 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 11 Jan 2008 16:29:11 -0500 Subject: freeze onscreen stacking order changes while a temp raise for focus cycling is occuring --- openbox/stacking.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'openbox/stacking.c') diff --git a/openbox/stacking.c b/openbox/stacking.c index bb8975d4..34ab0588 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -28,6 +28,10 @@ #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 */ +gboolean pause_changes = FALSE; void stacking_set_list(void) { @@ -99,7 +103,8 @@ 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(); @@ -125,6 +130,8 @@ void stacking_temp_raise(ObWindow *window) win[1] = window_top(window); XRestackWindows(ob_display, win, 2); + + pause_changes = TRUE; } void stacking_restore() @@ -139,6 +146,8 @@ void stacking_restore() win[i] = window_top(it->data); XRestackWindows(ob_display, win, i); g_free(win); + + pause_changes = FALSE; } static void do_raise(GList *wins) -- cgit v1.2.3 From 0be98fee4743c795b06aa23881b82eff5bab3ef6 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 16 Jan 2008 15:25:08 +0100 Subject: Various fixes for sparse warnings. Define void functions with (void), not (). Add missing includes. Some functions were declared static but defined non-static. Some variables that should be file static were file global but not used in any other file. prop.h defined a new prop_atoms in each file that included it instead of declaring it extern. --- openbox/stacking.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openbox/stacking.c') diff --git a/openbox/stacking.c b/openbox/stacking.c index 34ab0588..b18c02af 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -31,7 +31,7 @@ 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 */ -gboolean pause_changes = FALSE; +static gboolean pause_changes = FALSE; void stacking_set_list(void) { @@ -134,7 +134,7 @@ void stacking_temp_raise(ObWindow *window) pause_changes = TRUE; } -void stacking_restore() +void stacking_restore(void) { Window *win; GList *it; -- cgit v1.2.3