Hello community, here is the log from the commit of package cage for openSUSE:Factory checked in at 2020-04-02 17:44:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cage (Old) and /work/SRC/openSUSE:Factory/.cage.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cage" Thu Apr 2 17:44:50 2020 rev:3 rq:790836 version:0.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cage/cage.changes 2020-01-24 13:12:31.937466062 +0100 +++ /work/SRC/openSUSE:Factory/.cage.new.3248/cage.changes 2020-04-02 17:45:12.537518735 +0200 @@ -1,0 +2,6 @@ +Thu Apr 2 10:03:21 UTC 2020 - Michael Vetter <mvet...@suse.com> + +- Add cage-0.1.1-dont-terminate-display.patch: dont terminate display + Some applications wont work correctly otherwise. + +------------------------------------------------------------------- New: ---- cage-0.1.1-dont-terminate-display.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cage.spec ++++++ --- /var/tmp/diff_new_pack.bszTbS/_old 2020-04-02 17:45:15.113521847 +0200 +++ /var/tmp/diff_new_pack.bszTbS/_new 2020-04-02 17:45:15.117521852 +0200 @@ -1,7 +1,7 @@ # # spec file for package cage # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ URL: https://www.hjdskes.nl/projects/cage/ Source: https://github.com/Hjdskes/cage/archive/v%{version}.tar.gz Patch0: cage-0.1.1-new-wlroots.patch +Patch1: cage-0.1.1-dont-terminate-display.patch BuildRequires: libpixman-1-0-devel BuildRequires: meson >= 0.43.0 BuildRequires: pkgconfig @@ -39,6 +40,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %meson ++++++ cage-0.1.1-dont-terminate-display.patch ++++++ >From 5d7ff9e64dc71cdcfd66097571b1c995e1556e47 Mon Sep 17 00:00:00 2001 From: Matthew Bauer <mjbaue...@gmail.com> Date: Mon, 16 Mar 2020 15:32:24 -0400 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20terminate=20display=20when=20no?= =?UTF-8?q?=20view=20is=20found=20(#132)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Don’t terminate display when no view is found Some apps like RetroArch will quit and fork itself to switch modes (like from the menu to a loaded core). This means that for a very short period of time we have no view available for Wayland. Right now, Cage doesn’t actually exit when it does this terminate, so you get this kind of zombie child process that is running but not showing anything on the screen because there is no compositor. The solution I have here is to just keep Cage’s Wayland server running to avoid this issue. I’m open to other idea, but this seems sane to me. Perhaps an alternative is to check if the process is still alive when this happens, if not then we can do the quitting behavior. In addition, we could make this an option if some users don’t want this behavior. * Remove "ever_been_mapped" from cg_wayland_view --- view.c | 12 ------------ xwayland.c | 1 - xwayland.h | 15 --------------- 3 files changed, 28 deletions(-) diff --git a/view.c b/view.c index 3dc7b34..0b8d377 100644 --- a/view.c +++ b/view.c @@ -259,14 +259,6 @@ void view_destroy(struct cg_view *view) { struct cg_server *server = view->server; - bool ever_been_mapped = true; - -#if CAGE_HAS_XWAYLAND - if (view->type == CAGE_XWAYLAND_VIEW) { - struct cg_xwayland_view *xwayland_view = xwayland_view_from_view(view); - ever_been_mapped = xwayland_view->ever_been_mapped; - } -#endif if (view->wlr_surface != NULL) { view_unmap(view); @@ -279,10 +271,6 @@ view_destroy(struct cg_view *view) if (!empty) { struct cg_view *prev = wl_container_of(server->views.next, prev, link); seat_set_focus(server->seat, prev); - } else if (ever_been_mapped) { - /* The list is empty and the last view has been - mapped, so we can safely exit. */ - wl_display_terminate(server->wl_display); } } diff --git a/xwayland.c b/xwayland.c index 1aca1cc..53c9768 100644 --- a/xwayland.c +++ b/xwayland.c @@ -151,7 +151,6 @@ handle_xwayland_surface_map(struct wl_listener *listener, void *data) xwayland_view->commit.notify = handle_xwayland_surface_commit; wl_signal_add(&xwayland_view->xwayland_surface->surface->events.commit, &xwayland_view->commit); - xwayland_view->ever_been_mapped = true; view_map(view, xwayland_view->xwayland_surface->surface); view_damage_whole(view); diff --git a/xwayland.h b/xwayland.h index 4cfd4b0..d257f57 100644 --- a/xwayland.h +++ b/xwayland.h @@ -9,21 +9,6 @@ struct cg_xwayland_view { struct cg_view view; struct wlr_xwayland_surface *xwayland_surface; - - /* 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 ever been mapped and exits - only if 1) the XWayland surface has ever been mapped and 2) - this was the last surface Cage manages. */ - bool ever_been_mapped; - struct wl_listener destroy; struct wl_listener unmap; struct wl_listener map;
