isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

stack: Stack both wayland and X hidden windows below the guard window

Browse Source 
Stacking hidden X windows below the guard window is a necessity to
ensure input events aren't delivered to them. Wayland windows don't
need this because the decision to send them input events is done by us
looking at the clutter scene graph.

But, since we don't stack hidden wayland windows along with their X
siblings we lose their relative stack positions while hidden. As
there's no ill side effect to re-stacking hidden wayland windows below
the X guard window we can fix this by just doing it regardless of
window type.

https://bugzilla.gnome.org/show_bug.cgi?id=764844
This commit is contained in:
Rui Matos 2016-05-12 18:04:47 +02:00
parent 6cc688d575
commit c5637c52bd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/stack.c
View File

@ -1038,7 +1038,7 @@ stack_sync_to_xserver (MetaStack *stack)
GArray *x11_stacked; GArray *x11_stacked;
GArray *all_root_children_stacked; /* wayland OR x11 */ GArray *all_root_children_stacked; /* wayland OR x11 */
GList *tmp; GList *tmp;
GArray *x11_hidden_stack_ids; GArray *hidden_stack_ids;
/* Bail out if frozen */ /* Bail out if frozen */
if (stack->freeze_count > 0) if (stack->freeze_count > 0)
@ -1053,7 +1053,7 @@ stack_sync_to_xserver (MetaStack *stack)
x11_stacked = g_array_new (FALSE, FALSE, sizeof (Window)); x11_stacked = g_array_new (FALSE, FALSE, sizeof (Window));
all_root_children_stacked = g_array_new (FALSE, FALSE, sizeof (guint64)); all_root_children_stacked = g_array_new (FALSE, FALSE, sizeof (guint64));
x11_hidden_stack_ids = g_array_new (FALSE, FALSE, sizeof (guint64)); hidden_stack_ids = g_array_new (FALSE, FALSE, sizeof (guint64));
meta_topic (META_DEBUG_STACK, "Bottom to top: "); meta_topic (META_DEBUG_STACK, "Bottom to top: ");
meta_push_no_msg_prefix (); meta_push_no_msg_prefix ();
@ -1087,8 +1087,7 @@ stack_sync_to_xserver (MetaStack *stack)
* the screens fullscreen guard_window. */ * the screens fullscreen guard_window. */
if (w->hidden) if (w->hidden)
{ {
if (w->client_type == META_WINDOW_CLIENT_TYPE_X11) g_array_append_val (hidden_stack_ids, stack_id);
g_array_append_val (x11_hidden_stack_ids, top_level_window);
continue; continue;
} }
@ -1101,7 +1100,7 @@ stack_sync_to_xserver (MetaStack *stack)
/* The screen guard window sits above all hidden windows and acts as /* The screen guard window sits above all hidden windows and acts as
* a barrier to input reaching these windows. */ * a barrier to input reaching these windows. */
guint64 guard_window_id = stack->screen->guard_window; guint64 guard_window_id = stack->screen->guard_window;
g_array_append_val (x11_hidden_stack_ids, guard_window_id); g_array_append_val (hidden_stack_ids, guard_window_id);
/* Sync to server */ /* Sync to server */
@ -1112,8 +1111,8 @@ stack_sync_to_xserver (MetaStack *stack)
(guint64 *)all_root_children_stacked->data, (guint64 *)all_root_children_stacked->data,
all_root_children_stacked->len); all_root_children_stacked->len);
meta_stack_tracker_restack_at_bottom (stack->screen->stack_tracker, meta_stack_tracker_restack_at_bottom (stack->screen->stack_tracker,
(guint64 *)x11_hidden_stack_ids->data, (guint64 *)hidden_stack_ids->data,
x11_hidden_stack_ids->len); hidden_stack_ids->len);
/* Sync _NET_CLIENT_LIST and _NET_CLIENT_LIST_STACKING */ /* Sync _NET_CLIENT_LIST and _NET_CLIENT_LIST_STACKING */
@ -1133,7 +1132,7 @@ stack_sync_to_xserver (MetaStack *stack)
x11_stacked->len); x11_stacked->len);
g_array_free (x11_stacked, TRUE); g_array_free (x11_stacked, TRUE);
g_array_free (x11_hidden_stack_ids, TRUE); g_array_free (hidden_stack_ids, TRUE);
g_array_free (all_root_children_stacked, TRUE); g_array_free (all_root_children_stacked, TRUE);
} }