mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: add wlr_xwayland_server_options.terminate_delay

Browse source 
This allows users to specify a delay after which the Xwayland process
terminates itself when there are no more X11 clients connected.
This commit is contained in:
Simon Ser 2021-06-25 12:00:26 +02:00 • committed by Kenny Levinsen
parent 7ad67e0f1d
commit 352064d76d
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
xwayland/server.c
View file

@ -49,9 +49,18 @@ noreturn static void exec_xwayland(struct wlr_xwayland_server *server,
argv[i++] = "Xwayland";
argv[i++] = server->display_name;
argv[i++] = "-rootless";
argv[i++] = "-terminate";
argv[i++] = "-core";
argv[i++] = "-terminate";
#if HAVE_XWAYLAND_TERMINATE_DELAY
char terminate_delay[16];
if (server->options.terminate_delay > 0) {
snprintf(terminate_delay, sizeof(terminate_delay), "%d",
server->options.terminate_delay);
argv[i++] = terminate_delay;
}
#endif
#if HAVE_XWAYLAND_LISTENFD
argv[i++] = "-listenfd";
argv[i++] = listenfd0;
@ -436,6 +445,10 @@ struct wlr_xwayland_server *wlr_xwayland_server_create(
server->wl_display = wl_display;
server->options = *options;
#if !HAVE_XWAYLAND_TERMINATE_DELAY
server->options.terminate_delay = 0;
#endif
server->x_fd[0] = server->x_fd[1] = -1;
server->wl_fd[0] = server->wl_fd[1] = -1;
server->wm_fd[0] = server->wm_fd[1] = -1;