From 58a9f09617937f7e6b11f7c629a66d9333a71e25 Mon Sep 17 00:00:00 2001 From: Jente Hidskes Date: Sat, 24 Nov 2018 15:00:35 +0100 Subject: [PATCH] Handle keyboard removal --- cage.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cage.c b/cage.c index e1b32a2..7e7b52a 100644 --- a/cage.c +++ b/cage.c @@ -70,6 +70,7 @@ struct cg_keyboard { struct wl_listener modifiers; struct wl_listener key; + struct wl_listener destroy; }; struct cg_server server = {0}; @@ -181,6 +182,17 @@ handle_keyboard_key(struct wl_listener *listener, void *data) } } +static void +handle_keyboard_destroy(struct wl_listener *listener, void *data) +{ + struct cg_keyboard *keyboard = wl_container_of(listener, keyboard, destroy); + + wl_list_remove(&keyboard->destroy.link); + wl_list_remove(&keyboard->modifiers.link); + wl_list_remove(&keyboard->key.link); + free(keyboard); +} + static void server_new_keyboard(struct cg_server *server, struct wlr_input_device *device) { @@ -212,6 +224,8 @@ server_new_keyboard(struct cg_server *server, struct wlr_input_device *device) wl_signal_add(&device->keyboard->events.modifiers, &keyboard->modifiers); keyboard->key.notify = handle_keyboard_key; wl_signal_add(&device->keyboard->events.key, &keyboard->key); + keyboard->destroy.notify = handle_keyboard_destroy; + wl_signal_add(&device->events.destroy, &keyboard->destroy); wlr_seat_set_keyboard(server->seat, device);