wlr_xwayland: preserve end of struct on restart

This is more robust than trying to recopy a few fields.
Note: wlr_xwayland->events.ready now resets after each trigger, so one can
hook on it again and be called when restart is ready

1 files changed, 4 insertions, 2 deletions

diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index d4590f97..b6671de1 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -22,16 +22,18 @@ struct wlr_xwayland {
 	struct wl_client *client;
 	struct wl_display *wl_display;
 	struct wlr_compositor *compositor;
-	struct wlr_seat *seat;
 	time_t server_start;
 
 	struct wl_event_source *sigusr1_source;
 	struct wl_listener client_destroy;
 	struct wl_listener display_destroy;
-	struct wl_listener seat_destroy;
 	struct wlr_xwm *xwm;
 	struct wlr_xwayland_cursor *cursor;
 
+	/* Anything above seat is reset on Xwayland restart, rest is conserved */
+	struct wlr_seat *seat;
+	struct wl_listener seat_destroy;
+
 	struct {
 		struct wl_signal ready;
 		struct wl_signal new_surface;