From 3e8b12c19b1e9cd478288c1045d5ee8da6fe0b61 Mon Sep 17 00:00:00 2001 From: Jente Hidskes Date: Fri, 18 Jan 2019 16:37:15 +0100 Subject: [PATCH] view: test whether XWayland surfaces have been mapped This is to work around "misbehaving" (for lack of a better term) clients. At the moment, Firefox Nightly and Google Chrome/Chromium are known to be suchs client: When XWayland support is enabled, Firefox first creates an XWayland surface, closes this (before mapping it) and then opens an XDG toplevel surface. Cage tries to manage the first XWayland surface, but when it closes, Cage has no surfaces left and hence closes as well. Hence, Cage terminates before it picks up on Firefox's XDG toplevel, and Firefox (rightly) prints it cannot read the Wayland pipe. In Chromium's case, it simply opens an XWayland surface which it immediately closes, before opening the "real" XWayland surface. The workaround is to track whether an XWayland surface has been mapped and, if it hasn't, to not exit when we have no views left. Firefox's behavior and the workaround are discussed in #18. This commit fixes #18 and is part of the fix for #19. --- view.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/view.c b/view.c index 5e7ee05..c213a65 100644 --- a/view.c +++ b/view.c @@ -112,22 +112,40 @@ void view_destroy(struct cg_view *view) { struct cg_server *server = view->server; + bool mapped = true; + +#if CAGE_HAS_XWAYLAND + /* Some applications that aren't yet Wayland-native or + otherwise "special" (e.g. Firefox Nightly and Google + Chrome/Chromium) spawn an XWayland surface upon startup + that is almost immediately closed again. This makes Cage + think there are no views left, which results in it + exiting. However, after this initial (unmapped) surface, + the "real" application surface is opened. This leads to + these applications' startup sequences being interrupted by + Cage exiting. Hence, to work around this issue, Cage checks + whether an XWayland surface has been mapped and exits only + if 1) the XWayland surface has been mapped and 2) this was + the last surface Cage manages. */ + if (view->type == CAGE_XWAYLAND_VIEW) { + mapped = view->xwayland_surface->mapped; + } +#endif if (view->wlr_surface != NULL) { view_unmap(view); } free(view); - /* If this was our last primary view, exit. Otherwise, focus the - previous (i.e., next highest in the stack) view. Since - we're still here, we know there is at least one view in the - list. */ - bool terminate = wl_list_empty(&server->views); - if (terminate) { - wl_display_terminate(server->wl_display); - } else { + /* If there is a previous view in the list, focus that. */ + bool empty = wl_list_empty(&server->views); + if (!empty) { struct cg_view *prev = wl_container_of(server->views.next, prev, link); seat_set_focus(server->seat, prev); + } else if (mapped) { + /* The list is empty and the last view has been + mapped, so we can safely exit. */ + wl_display_terminate(server->wl_display); } }