[metacity] don't do stacking for override-redirect windows
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] don't do stacking for override-redirect windows
- Date: Tue, 28 Feb 2017 01:54:19 +0000 (UTC)
commit 15997da604228ca249cbf95a9828f6c2a5669e2b
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Mon Jun 15 14:31:04 2009 -0400
don't do stacking for override-redirect windows
Don't add override-redirect windows to MetaStack; we shouldn't
be restacking them.
Since we *aren't* stacking the override-redirect windows, we need to
be careful that to ignore them when looking for the top managed
window.
http://bugzilla.gnome.org/show_bug.cgi?id=585984
src/core/stack.c | 52 ++++++++++++++++++++++++++--------------------
src/core/window-props.c | 3 +-
src/core/window.c | 9 +++++--
3 files changed, 37 insertions(+), 27 deletions(-)
---
diff --git a/src/core/stack.c b/src/core/stack.c
index 1314ee2..cfefe7d 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -993,31 +993,37 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
* to be moved below.
*/
}
- else if (meta_display_lookup_x_window (screen->display,
- children[i]) != NULL)
+ else
{
- XWindowChanges changes;
+ MetaWindow *other;
- /* children[i] is the topmost managed child */
- meta_topic (META_DEBUG_STACK,
- "Moving 0x%lx above topmost managed child window 0x%lx\n",
- xwindow, children[i]);
-
- changes.sibling = children[i];
- changes.stack_mode = Above;
-
- meta_error_trap_push (screen->display);
- meta_stack_tracker_record_raise_above (screen->stack_tracker,
- xwindow,
- children[i],
- XNextRequest (screen->display->xdisplay));
- XConfigureWindow (screen->display->xdisplay,
- xwindow,
- CWSibling | CWStackMode,
- &changes);
- meta_error_trap_pop (screen->display);
-
- break;
+ other = meta_display_lookup_x_window (screen->display, children[i]);
+
+ if (other != NULL && !other->override_redirect)
+ {
+ XWindowChanges changes;
+
+ /* children[i] is the topmost managed child */
+ meta_topic (META_DEBUG_STACK,
+ "Moving 0x%lx above topmost managed child window 0x%lx\n",
+ xwindow, children[i]);
+
+ changes.sibling = children[i];
+ changes.stack_mode = Above;
+
+ meta_error_trap_push (screen->display);
+ meta_stack_tracker_record_raise_above (screen->stack_tracker,
+ xwindow,
+ children[i],
+ XNextRequest (screen->display->xdisplay));
+ XConfigureWindow (screen->display->xdisplay,
+ xwindow,
+ CWSibling | CWStackMode,
+ &changes);
+ meta_error_trap_pop (screen->display);
+
+ break;
+ }
}
--i;
diff --git a/src/core/window-props.c b/src/core/window-props.c
index ba743af..89836e9 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1561,7 +1561,8 @@ reload_transient_for (MetaWindow *window,
meta_window_recalc_window_type (window);
/* update stacking constraints */
- meta_stack_update_transient (window->screen->stack, window);
+ if (!window->override_redirect)
+ meta_stack_update_transient (window->screen->stack, window);
/* possibly change its group. We treat being a window's transient as
* equivalent to making it your group leader, to work around shortcomings
diff --git a/src/core/window.c b/src/core/window.c
index 2c7524e..96f84e0 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -734,8 +734,10 @@ meta_window_new_with_attrs (MetaDisplay *display,
* and thus constraints may try to auto-fullscreen it which also
* means restacking it.
*/
- meta_stack_add (window->screen->stack,
- window);
+ if (!window->override_redirect)
+ meta_stack_add (window->screen->stack, window);
+ else
+ window->layer = META_LAYER_OVERRIDE_REDIRECT; /* otherwise set by MetaStack */
/* Put our state back where it should be,
* passing TRUE for is_configure_request, ICCCM says
@@ -1083,7 +1085,8 @@ meta_window_free (MetaWindow *window,
}
#endif
- meta_stack_remove (window->screen->stack, window);
+ if (!window->override_redirect)
+ meta_stack_remove (window->screen->stack, window);
if (window->frame)
meta_window_destroy_frame (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]