isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11-display: Handle mapped XIDs per type

Browse Source 
Starting from commit 7713006f5, during X11 disposition we also unmanage the
windows using the xids hash table values list.
However, this is also populated by the X11 Meta barrier implementation and then
contains both Windows and Barriers.

So when going through the values list, check whether we're handling a window or
a barrier and based on that, unmanage or destroy it.

Fixes https://gitlab.gnome.org/GNOME/mutter/issues/624
https://gitlab.gnome.org/GNOME/mutter/merge_requests/605
This commit is contained in:
Marco Trevisan (Treviño) 2019-06-05 00:57:40 +02:00 committed by Marco Trevisan
parent e94a0fced9
commit 0487d672ed
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/x11/meta-x11-display.c
View File

@ -99,7 +99,6 @@ static void
meta_x11_display_unmanage_windows (MetaX11Display *x11_display) meta_x11_display_unmanage_windows (MetaX11Display *x11_display)
{ {
GList *windows, *l; GList *windows, *l;
MetaWindow *window;
if (!x11_display->xids) if (!x11_display->xids)
return; return;
@ -109,9 +108,17 @@ meta_x11_display_unmanage_windows (MetaX11Display *x11_display)
for (l = windows; l; l = l->next) for (l = windows; l; l = l->next)
{ {
window = l->data; if (META_IS_WINDOW (l->data))
if (!window->unmanaging) {
meta_window_unmanage (window, META_CURRENT_TIME); MetaWindow *window = l->data;
if (!window->unmanaging)
meta_window_unmanage (window, META_CURRENT_TIME);
}
else if (META_IS_BARRIER (l->data))
meta_barrier_destroy (META_BARRIER (l->data));
else
g_assert_not_reached ();
} }
g_list_free_full (windows, g_object_unref); g_list_free_full (windows, g_object_unref);
} }