sway

commit e51ecf71aa0afdcce4c9768f0a614222ee79cee2
parent 0a9b0b83ebfffc3b5b456b49d8cfe76736fe011b
Author: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at>
Date:   Tue, 18 Feb 2025 01:52:25 +0100

input/input-manager: remove event listeners on fini

This fixes a crash in wlroots listener checks. See #8509.

Diffstat:
M
include/sway/input/input-manager.h
 | 
2
++
M
sway/input/input-manager.c
 | 
8
++++++++
M
sway/server.c
 | 
1
+

3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
@@ -39,6 +39,8 @@ struct sway_input_manager {
 
 struct sway_input_manager *input_manager_create(struct sway_server *server);
 
+void input_manager_finish(struct sway_input_manager *input);
+
 bool input_manager_has_focus(struct sway_node *node);
 
 void input_manager_set_focus(struct sway_node *node);
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
@@ -493,6 +493,14 @@ struct sway_input_manager *input_manager_create(struct sway_server *server) {
 	return input;
 }
 
+void input_manager_finish(struct sway_input_manager *input) {
+	wl_list_remove(&input->new_input.link);
+	wl_list_remove(&input->virtual_keyboard_new.link);
+	wl_list_remove(&input->virtual_pointer_new.link);
+	wl_list_remove(&input->keyboard_shortcuts_inhibit_new_inhibitor.link);
+	wl_list_remove(&input->transient_seat_create.link);
+}
+
 bool input_manager_has_focus(struct sway_node *node) {
 	struct sway_seat *seat = NULL;
 	wl_list_for_each(seat, &server.input->seats, link) {
diff --git a/sway/server.c b/sway/server.c
@@ -478,6 +478,7 @@ void server_fini(struct sway_server *server) {
 	wl_list_remove(&server->xdg_activation_v1_request_activate.link);
 	wl_list_remove(&server->xdg_activation_v1_new_token.link);
 	wl_list_remove(&server->request_set_cursor_shape.link);
+	input_manager_finish(server->input);
 
 	// TODO: free sway-specific resources
 #if WLR_HAS_XWAYLAND