From c80bf1591e5cea26bd29e1b4b4680d4ef3693833 Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer Date: Sun, 6 May 2018 20:23:10 +0200 Subject: Allow xwayland to start lazily Makes the xwayland startup process two phased. The first phase just initialises the X11 sockets. The second phase starts the Xwayland server itself. When starting xwayland lazily the second phase will be postponed until a client has connected to the X11 socket. Changes in behaviour: The DISPLAY environment is now set immediately after the X11 sockets are created. When the Xwayland server is killed or crashes, the sockets will not be recreated, but reused. Fixes #849: Start up Xwayland lazily --- include/wlr/xwayland.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index b2c23667..a802d32d 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -15,10 +15,12 @@ struct wlr_xwayland { pid_t pid; int display; int x_fd[2], wl_fd[2], wm_fd[2]; + struct wl_event_source *x_fd_read_event[2]; struct wl_client *client; struct wl_display *wl_display; struct wlr_compositor *compositor; time_t server_start; + bool lazy; struct wl_event_source *sigusr1_source; struct wl_listener client_destroy; @@ -168,7 +170,7 @@ struct wlr_xwayland_resize_event { }; struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display, - struct wlr_compositor *compositor); + struct wlr_compositor *compositor, bool lazy); void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland); -- cgit v1.2.3 From 31861b3a7a2a4f3dc278278dadec60a70138c74e Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer Date: Sun, 6 May 2018 22:22:39 +0200 Subject: Add option to rootston to start xwayland lazy --- include/rootston/config.h | 1 + rootston/config.c | 4 ++++ rootston/desktop.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/rootston/config.h b/include/rootston/config.h index 0a67ac1e..97a8baab 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -60,6 +60,7 @@ struct roots_cursor_config { struct roots_config { bool xwayland; + bool xwayland_lazy; struct wl_list outputs; struct wl_list devices; diff --git a/rootston/config.c b/rootston/config.c index 67bf83e9..bbdb7990 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -240,6 +240,9 @@ static int config_ini_handler(void *user, const char *section, const char *name, if (strcmp(name, "xwayland") == 0) { if (strcasecmp(value, "true") == 0) { config->xwayland = true; + } else if (strcasecmp(value, "lazy") == 0) { + config->xwayland = true; + config->xwayland_lazy = true; } else if (strcasecmp(value, "false") == 0) { config->xwayland = false; } else { @@ -389,6 +392,7 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) { } config->xwayland = true; + config->xwayland_lazy = false; wl_list_init(&config->outputs); wl_list_init(&config->devices); wl_list_init(&config->keyboards); diff --git a/rootston/desktop.c b/rootston/desktop.c index 06c188d8..7be1c64a 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -835,7 +835,7 @@ struct roots_desktop *desktop_create(struct roots_server *server, if (config->xwayland) { desktop->xwayland = wlr_xwayland_create(server->wl_display, - desktop->compositor, false); + desktop->compositor, config->xwayland_lazy); wl_signal_add(&desktop->xwayland->events.new_surface, &desktop->xwayland_surface); desktop->xwayland_surface.notify = handle_xwayland_surface; -- cgit v1.2.3 From dbf4f9a2312c378b855db68f18b922e73c746887 Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer Date: Sun, 6 May 2018 22:51:32 +0200 Subject: Make startup command no longer wait for xwayland --- include/rootston/desktop.h | 1 - rootston/main.c | 31 +++++++++++-------------------- 2 files changed, 11 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index f150147b..83ff2ea8 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -65,7 +65,6 @@ struct roots_desktop { #ifdef WLR_HAS_XWAYLAND struct wlr_xwayland *xwayland; struct wl_listener xwayland_surface; - struct wl_listener xwayland_ready; #endif }; diff --git a/rootston/main.c b/rootston/main.c index a61d65c9..18d27a8a 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -14,18 +14,6 @@ struct roots_server server = { 0 }; -static void ready(struct wl_listener *listener, void *data) { - if (server.config->startup_cmd != NULL) { - const char *cmd = server.config->startup_cmd; - pid_t pid = fork(); - if (pid < 0) { - wlr_log(L_ERROR, "cannot execute binding command: fork() failed"); - } else if (pid == 0) { - execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL); - } - } -} - int main(int argc, char **argv) { wlr_log_init(L_DEBUG, NULL); server.config = roots_config_create_from_args(argc, argv); @@ -65,21 +53,24 @@ int main(int argc, char **argv) { } setenv("WAYLAND_DISPLAY", socket, true); -#ifndef WLR_HAS_XWAYLAND - ready(NULL, NULL); -#else +#ifdef WLR_HAS_XWAYLAND if (server.desktop->xwayland != NULL) { struct roots_seat *xwayland_seat = input_get_seat(server.input, ROOTS_CONFIG_DEFAULT_SEAT_NAME); wlr_xwayland_set_seat(server.desktop->xwayland, xwayland_seat->seat); - wl_signal_add(&server.desktop->xwayland->events.ready, - &server.desktop->xwayland_ready); - server.desktop->xwayland_ready.notify = ready; - } else { - ready(NULL, NULL); } #endif + if (server.config->startup_cmd != NULL) { + const char *cmd = server.config->startup_cmd; + pid_t pid = fork(); + if (pid < 0) { + wlr_log(L_ERROR, "cannot execute binding command: fork() failed"); + } else if (pid == 0) { + execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL); + } + } + wl_display_run(server.wl_display); wl_display_destroy(server.wl_display); return 0; -- cgit v1.2.3 From 119a6cf35c4163091a699d5987f8d3bab384c95e Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer Date: Tue, 8 May 2018 22:22:35 +0200 Subject: Make xwayland_finish* clean up wlr_xwayland --- include/wlr/xwayland.h | 22 +++++++++++++--------- xwayland/xwayland.c | 12 ++++++++---- 2 files changed, 21 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index a802d32d..d0f37834 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -13,22 +13,26 @@ struct wlr_xwayland_cursor; struct wlr_xwayland { pid_t pid; - int display; - int x_fd[2], wl_fd[2], wm_fd[2]; - struct wl_event_source *x_fd_read_event[2]; struct wl_client *client; - struct wl_display *wl_display; - struct wlr_compositor *compositor; - time_t server_start; - bool lazy; - struct wl_event_source *sigusr1_source; struct wl_listener client_destroy; struct wl_listener display_destroy; struct wlr_xwm *xwm; struct wlr_xwayland_cursor *cursor; + int wm_fd[2], wl_fd[2]; + + time_t server_start; - /* Anything above seat is reset on Xwayland restart, rest is conserved */ + /* Anything above display is reset on Xwayland restart, rest is conserved */ + + int display; + int x_fd[2]; + struct wl_event_source *x_fd_read_event[2]; + + bool lazy; + + struct wl_display *wl_display; + struct wlr_compositor *compositor; struct wlr_seat *seat; struct wl_listener seat_destroy; diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index 511eb6fc..22d5cdeb 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -151,6 +151,10 @@ static void xwayland_finish_server(struct wlr_xwayland *wlr_xwayland) { safe_close(wlr_xwayland->wl_fd[1]); safe_close(wlr_xwayland->wm_fd[0]); safe_close(wlr_xwayland->wm_fd[1]); + memset(wlr_xwayland, 0, offsetof(struct wlr_xwayland, display)); + wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1; + wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1; + /* We do not kill the Xwayland process, it dies to broken pipe * after we close our side of the wm/wl fds. This is more reliable * than trying to kill something that might no longer be Xwayland. @@ -160,6 +164,7 @@ static void xwayland_finish_server(struct wlr_xwayland *wlr_xwayland) { static void xwayland_finish_display(struct wlr_xwayland *wlr_xwayland) { safe_close(wlr_xwayland->x_fd[0]); safe_close(wlr_xwayland->x_fd[1]); + wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1; wl_list_remove(&wlr_xwayland->display_destroy.link); @@ -274,7 +279,6 @@ static int xwayland_socket_connected(int fd, uint32_t mask, void* data){ static bool xwayland_start_display(struct wlr_xwayland *wlr_xwayland, struct wl_display *wl_display, struct wlr_compositor *compositor) { - wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1; wlr_xwayland->display_destroy.notify = handle_display_destroy; wl_display_add_destroy_listener(wl_display, &wlr_xwayland->display_destroy); @@ -293,8 +297,6 @@ static bool xwayland_start_display(struct wlr_xwayland *wlr_xwayland, } static bool xwayland_start_server(struct wlr_xwayland *wlr_xwayland) { - wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1; - wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1; if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, wlr_xwayland->wl_fd) != 0 || socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, wlr_xwayland->wm_fd) != 0) { @@ -386,7 +388,9 @@ void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland) { struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display, struct wlr_compositor *compositor, bool lazy) { struct wlr_xwayland *wlr_xwayland = calloc(1, sizeof(struct wlr_xwayland)); - memset(wlr_xwayland, 0, offsetof(struct wlr_xwayland, seat)); + if (!wlr_xwayland) { + return NULL; + } wlr_xwayland->wl_display = wl_display; wlr_xwayland->compositor = compositor; -- cgit v1.2.3