isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-09 18:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Allow destroying the wl_surface before the xdg_surface

Browse Source 
As resource destruction can happen in any order at shutdown, we
need to be flexible here. A client disconnecting without cleaning
up all its resources should not assert fail.
This commit is contained in:
Jasper St. Pierre 2014-02-18 22:21:33 -05:00
parent c251eb8ec0
commit 7ef8d21e48
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wayland/meta-wayland-surface.c
View File

@ -596,11 +596,14 @@ meta_wayland_surface_window_unmanaged (MetaWaylandSurface *surface)
static void static void
destroy_window (MetaWaylandSurface *surface) destroy_window (MetaWaylandSurface *surface)
{ {
MetaDisplay *display = meta_get_display (); if (surface->window)
guint32 timestamp = meta_display_get_current_time_roundtrip (display); {
MetaDisplay *display = meta_get_display ();
guint32 timestamp = meta_display_get_current_time_roundtrip (display);
meta_window_unmanage (surface->window, timestamp);
}
g_assert (surface->window != NULL);
meta_window_unmanage (surface->window, timestamp);
g_assert (surface->window == NULL); g_assert (surface->window == NULL);
} }
@ -610,11 +613,11 @@ wl_surface_destructor (struct wl_resource *resource)
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
MetaWaylandCompositor *compositor = surface->compositor; MetaWaylandCompositor *compositor = surface->compositor;
/* At the time when the wl_surface is destroyed, we should /* If we still have a window at the time of destruction, that means that
* no longer have a window, unless we're an XWayland window * the client is disconnecting, as the resources are destroyed in a random
* in which case we received the wl_surface.destroy before * order. Simply destroy the window in this case. */
* the UnmapNotify/DestroyNotify. */ if (surface->window)
g_assert (surface->window == NULL || surface->window->client_type == META_WINDOW_CLIENT_TYPE_X11); destroy_window (surface);
compositor->surfaces = g_list_remove (compositor->surfaces, surface); compositor->surfaces = g_list_remove (compositor->surfaces, surface);