aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Andri Yngvason <andri@yngvason.is>2020-12-28 02:07:41 +0000
committerLibravatar Simon Ser <contact@emersion.fr>2021-01-01 19:02:56 +0100
commit98eece53ad87dd3b9a9c96df0714683e12dafe44 (patch)
tree7c4f9c3579c3fb68d55e1fe9ab8ce6b661100dc1
parentRemove create_renderer_func argument (diff)
downloadsway-98eece53ad87dd3b9a9c96df0714683e12dafe44.tar.gz
sway-98eece53ad87dd3b9a9c96df0714683e12dafe44.tar.zst
sway-98eece53ad87dd3b9a9c96df0714683e12dafe44.zip
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.
-rw-r--r--include/sway/input/text_input.h2
-rw-r--r--sway/input/seat.c1
-rw-r--r--sway/input/text_input.c5
3 files changed, 8 insertions, 0 deletions
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 81915795..6cf9bdb3 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -53,6 +53,8 @@ struct sway_text_input {
53void sway_input_method_relay_init(struct sway_seat *seat, 53void sway_input_method_relay_init(struct sway_seat *seat,
54 struct sway_input_method_relay *relay); 54 struct sway_input_method_relay *relay);
55 55
56void sway_input_method_relay_finish(struct sway_input_method_relay *relay);
57
56// Updates currently focused surface. Surface must belong to the same seat. 58// Updates currently focused surface. Surface must belong to the same seat.
57void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay, 59void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay,
58 struct wlr_surface *surface); 60 struct wlr_surface *surface);
diff --git a/sway/input/seat.c b/sway/input/seat.c
index f899483d..de1a1881 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -51,6 +51,7 @@ void seat_destroy(struct sway_seat *seat) {
51 wl_list_for_each_safe(seat_device, next, &seat->devices, link) { 51 wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
52 seat_device_destroy(seat_device); 52 seat_device_destroy(seat_device);
53 } 53 }
54 sway_input_method_relay_finish(&seat->im_relay);
54 sway_cursor_destroy(seat->cursor); 55 sway_cursor_destroy(seat->cursor);
55 wl_list_remove(&seat->new_node.link); 56 wl_list_remove(&seat->new_node.link);
56 wl_list_remove(&seat->request_start_drag.link); 57 wl_list_remove(&seat->request_start_drag.link);
diff --git a/sway/input/text_input.c b/sway/input/text_input.c
index 2fb25eef..f83726ee 100644
--- 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,
263 &relay->input_method_new); 263 &relay->input_method_new);
264} 264}
265 265
266void sway_input_method_relay_finish(struct sway_input_method_relay *relay) {
267 wl_list_remove(&relay->input_method_new.link);
268 wl_list_remove(&relay->text_input_new.link);
269}
270
266void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay, 271void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay,
267 struct wlr_surface *surface) { 272 struct wlr_surface *surface) {
268 struct sway_text_input *text_input; 273 struct sway_text_input *text_input;