aboutsummaryrefslogtreecommitdiff
path: root/xwayland
diff options
context:
space:
mode:
Diffstat (limited to 'xwayland')
-rw-r--r--xwayland/server.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/xwayland/server.c b/xwayland/server.c
index f5c6b060..58ba1a8e 100644
--- a/xwayland/server.c
+++ b/xwayland/server.c
@@ -64,8 +64,13 @@ noreturn static void exec_xwayland(struct wlr_xwayland_server *server) {
char *argv[] = {
"Xwayland", NULL /* display, e.g. :1 */,
"-rootless", "-terminate", "-core",
+#if HAVE_XWAYLAND_LISTENFD
+ "-listenfd", NULL /* x_fd[0] */,
+ "-listenfd", NULL /* x_fd[1] */,
+#else
"-listen", NULL /* x_fd[0] */,
"-listen", NULL /* x_fd[1] */,
+#endif
"-wm", NULL /* wm_fd[1] */,
NULL,
};
@@ -91,7 +96,7 @@ noreturn static void exec_xwayland(struct wlr_xwayland_server *server) {
snprintf(wayland_socket_str, sizeof(wayland_socket_str), "%d", server->wl_fd[1]);
setenv("WAYLAND_SOCKET", wayland_socket_str, true);
- wlr_log(WLR_INFO, "WAYLAND_SOCKET=%d Xwayland :%d -rootless -terminate -core -listen %d -listen %d -wm %d",
+ wlr_log(WLR_INFO, "WAYLAND_SOCKET=%d Xwayland :%d -rootless -terminate -core -listenfd %d -listenfd %d -wm %d",
server->wl_fd[1], server->display, server->x_fd[0],
server->x_fd[1], server->wm_fd[1]);