xwayland: don't set DISPLAY

Let the compositor set it. This allows for multiple Xwayland instances to run
at the same time.

Fixes https://github.com/swaywm/wlroots/issues/1442

1 files changed, 5 insertions, 5 deletions

diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 40cc8848..e2c8d81b 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -24,7 +24,6 @@ struct wlr_xwayland {
 	pid_t pid;
 	struct wl_client *client;
 	struct wl_event_source *sigusr1_source;
-	struct wl_listener client_destroy;
 	struct wlr_xwm *xwm;
 	struct wlr_xwayland_cursor *cursor;
 	int wm_fd[2], wl_fd[2];
@@ -34,10 +33,9 @@ struct wlr_xwayland {
 	/* Anything above display is reset on Xwayland restart, rest is conserved */
 
 	int display;
+	char display_name[16];
 	int x_fd[2];
 	struct wl_event_source *x_fd_read_event[2];
-	struct wl_listener display_destroy;
-
 	bool lazy;
 
 	struct wl_display *wl_display;
@@ -49,8 +47,6 @@ struct wlr_xwayland {
 		struct wl_signal new_surface;
 	} events;
 
-	struct wl_listener seat_destroy;
-
 	/**
 	 * Add a custom event handler to xwayland. Return 1 if the event was
 	 * handled or 0 to use the default wlr-xwayland handler. wlr-xwayland will
@@ -58,6 +54,10 @@ struct wlr_xwayland {
 	 */
 	int (*user_event_handler)(struct wlr_xwm *xwm, xcb_generic_event_t *event);
 
+	struct wl_listener client_destroy;
+	struct wl_listener display_destroy;
+	struct wl_listener seat_destroy;
+
 	void *data;
 };