mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: test whether XWayland surfaces have been mapped

Browse source 
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.
This commit is contained in:
Jente Hidskes 2019-01-18 16:37:15 +01:00
parent a324d22dfe
commit 443d955dfd
1 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

34
view.c
View file

@ -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);
}
}