[mutter] stack: Rewrite to not be based on X11 xtransient_for properties
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] stack: Rewrite to not be based on X11 xtransient_for properties
- Date: Wed, 13 Aug 2014 23:04:08 +0000 (UTC)
commit e76be14dbb88865a8e8e0de9ba711f22ef5de4e7
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Aug 13 18:21:31 2014 -0400
stack: Rewrite to not be based on X11 xtransient_for properties
This fixes some stacking issues with Wayland windows.
src/core/stack.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/core/stack.c b/src/core/stack.c
index 4c97656..0234b47 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -45,10 +45,8 @@
w->type == META_WINDOW_MENU || \
w->type == META_WINDOW_UTILITY)
-#define WINDOW_TRANSIENT_FOR_WHOLE_GROUP(w) \
- ((w->xtransient_for == None || \
- w->transient_parent_is_root_window) && \
- WINDOW_HAS_TRANSIENT_TYPE (w))
+#define WINDOW_TRANSIENT_FOR_WHOLE_GROUP(w) \
+ (WINDOW_HAS_TRANSIENT_TYPE (w) && w->transient_for == NULL)
#define WINDOW_IN_STACK(w) (w->stack_position >= 0)
@@ -414,8 +412,7 @@ compute_layer (MetaWindow *window)
*/
if (window->layer != META_LAYER_DESKTOP &&
WINDOW_HAS_TRANSIENT_TYPE(window) &&
- (window->xtransient_for == None ||
- window->transient_parent_is_root_window))
+ window->transient_for == NULL)
{
/* We only do the group thing if the dialog is NOT transient for
* a particular window. Imagine a group with a normal window, a dock,
@@ -636,13 +633,11 @@ create_constraints (Constraint **constraints,
g_slist_free (group_windows);
}
- else if (w->xtransient_for != None &&
- !w->transient_parent_is_root_window)
+ else if (w->transient_for != NULL)
{
MetaWindow *parent;
- parent =
- meta_display_lookup_x_window (w->display, w->xtransient_for);
+ parent = w->transient_for;
if (parent && WINDOW_IN_STACK (parent) &&
parent->screen == w->screen)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]