sway

commit 98eece53ad87dd3b9a9c96df0714683e12dafe44
parent 53f5197c26f1ea88f004a6c19504bd8f25b85462
Author: Andri Yngvason <andri@yngvason.is>
Date:   Mon, 28 Dec 2020 02:07:41 +0000

input: Clean up input_method_relay in seat_destoy()

This fixes a crash that happens when input_method_new or text_method_new
events are emitted after the seat has been freed.

Diffstat:
M
include/sway/input/text_input.h
 | 
2
++
M
sway/input/seat.c
 | 
1
+
M
sway/input/text_input.c
 | 
5
+++++

3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
@@ -53,6 +53,8 @@ struct sway_text_input {
 void sway_input_method_relay_init(struct sway_seat *seat,
 	struct sway_input_method_relay *relay);
 
+void sway_input_method_relay_finish(struct sway_input_method_relay *relay);
+
 // Updates currently focused surface. Surface must belong to the same seat.
 void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay,
 	struct wlr_surface *surface);
diff --git a/sway/input/seat.c b/sway/input/seat.c
@@ -51,6 +51,7 @@ void seat_destroy(struct sway_seat *seat) {
 	wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
 		seat_device_destroy(seat_device);
 	}
+	sway_input_method_relay_finish(&seat->im_relay);
 	sway_cursor_destroy(seat->cursor);
 	wl_list_remove(&seat->new_node.link);
 	wl_list_remove(&seat->request_start_drag.link);
diff --git a/sway/input/text_input.c b/sway/input/text_input.c
@@ -263,6 +263,11 @@ void sway_input_method_relay_init(struct sway_seat *seat,
 		&relay->input_method_new);
 }
 
+void sway_input_method_relay_finish(struct sway_input_method_relay *relay) {
+	wl_list_remove(&relay->input_method_new.link);
+	wl_list_remove(&relay->text_input_new.link);
+}
+
 void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay,
 		struct wlr_surface *surface) {
 	struct sway_text_input *text_input;