[mutter/wip/carlosg/x11less-preparations] wayland: Drop -terminate argument to Xwayland
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/x11less-preparations] wayland: Drop -terminate argument to Xwayland
- Date: Fri, 24 May 2019 11:13:48 +0000 (UTC)
commit 77316c6ab0e32afb6713e25fd4a54a073c6b010b
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri May 24 11:47:49 2019 +0200
wayland: Drop -terminate argument to Xwayland
This argument instructs Xwayland to exit when there are no further
client connections. However we eventually want to handle restarts
ourselves (where, notably, mutter's will be at least the last client
connection).
This behavior could also induce race conditions on startup with clients
that quickly open and close a display, which is a more pressing issue.
Also, add -noreset back (which was removed in the same commit that added
-terminate). We don't want to reset the X server to a pristine state in
that situation either.
src/wayland/meta-xwayland.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index e426f485e..43bf4c1e3 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -506,16 +506,10 @@ meta_xwayland_init_xserver (MetaXWaylandManager *manager)
g_subprocess_launcher_setenv (launcher, "WAYLAND_SOCKET", "3", TRUE);
- /* Use the -terminate parameter to ensure that Xwayland exits cleanly
- * after the last client disconnects. Fortunately that includes the window
- * manager so it won't exit prematurely either. This ensures that Xwayland
- * won't try to reconnect and crash, leaving uninteresting core dumps. We do
- * want core dumps from Xwayland but only if a real bug occurs...
- */
manager->proc = g_subprocess_launcher_spawn (launcher, &error,
XWAYLAND_PATH, manager->display_name,
"-rootless",
- "-terminate",
+ "-noreset",
"-accessx",
"-core",
"-listen", "4",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]