From b5fd7de8ab9289696d104869a04e63cff848a00a Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 4 Mar 2024 13:48:43 +0100
Subject: [PATCH] input/seat: handle wlr_seat destroy

---
 include/sway/input/seat.h |  3 +--
 sway/config.c             |  2 +-
 sway/input/seat.c         | 11 +++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 475753d8..4d281ea1 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -118,6 +118,7 @@ struct sway_seat {
 
 	struct sway_input_method_relay im_relay;
 
+	struct wl_listener destroy;
 	struct wl_listener focus_destroy;
 	struct wl_listener new_node;
 	struct wl_listener request_start_drag;
@@ -151,8 +152,6 @@ struct sway_keyboard_shortcuts_inhibitor {
 
 struct sway_seat *seat_create(const char *seat_name);
 
-void seat_destroy(struct sway_seat *seat);
-
 void seat_add_device(struct sway_seat *seat,
 		struct sway_input_device *device);
 
diff --git a/sway/config.c b/sway/config.c
index 568c8b53..5b04b3a1 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -191,7 +191,7 @@ static void destroy_removed_seats(struct sway_config *old_config,
 				seat_name_cmp, seat_config->name) < 0) {
 			seat = input_manager_get_seat(seat_config->name, false);
 			if (seat) {
-				seat_destroy(seat);
+				wlr_seat_destroy(seat->wlr_seat);
 			}
 		}
 	}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index f2486893..1da2b1b2 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -66,9 +66,13 @@ static void seat_node_destroy(struct sway_seat_node *seat_node) {
 	free(seat_node);
 }
 
-void seat_destroy(struct sway_seat *seat) {
+static void handle_destroy(struct wl_listener *listener, void *data) {
+	struct sway_seat *seat = wl_container_of(listener, seat, destroy);
 	if (seat == config->handler_context.seat) {
 		config->handler_context.seat = input_manager_get_default_seat();
+		if (seat == config->handler_context.seat) {
+			config->handler_context.seat = NULL;
+		}
 	}
 	struct sway_seat_device *seat_device, *next;
 	wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
@@ -82,12 +86,12 @@ void seat_destroy(struct sway_seat *seat) {
 	sway_input_method_relay_finish(&seat->im_relay);
 	sway_cursor_destroy(seat->cursor);
 	wl_list_remove(&seat->new_node.link);
+	wl_list_remove(&seat->destroy.link);
 	wl_list_remove(&seat->request_start_drag.link);
 	wl_list_remove(&seat->start_drag.link);
 	wl_list_remove(&seat->request_set_selection.link);
 	wl_list_remove(&seat->request_set_primary_selection.link);
 	wl_list_remove(&seat->link);
-	wlr_seat_destroy(seat->wlr_seat);
 	for (int i = 0; i < seat->deferred_bindings->length; i++) {
 		free_sway_binding(seat->deferred_bindings->items[i]);
 	}
@@ -555,6 +559,9 @@ struct sway_seat *seat_create(const char *seat_name) {
 	wl_signal_add(&root->events.new_node, &seat->new_node);
 	seat->new_node.notify = handle_new_node;
 
+	wl_signal_add(&seat->wlr_seat->events.destroy, &seat->destroy);
+	seat->destroy.notify = handle_destroy;
+
 	wl_signal_add(&seat->wlr_seat->events.request_start_drag,
 		&seat->request_start_drag);
 	seat->request_start_drag.notify = handle_request_start_drag;