diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-12-10 15:37:17 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-10 15:37:17 -0500 |
| commit | 4d449743c5c476f1891a64b31f00cb7d5dd1555b (patch) | |
| tree | 5dc510182eaaa41721a2b78859078d1010e9c60d /sway/input | |
| parent | 5e9ee32d63d7a02e65f05ee00295ef41e115b2eb (diff) | |
keyboard remove
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/keyboard.c | 9 | ||||
| -rw-r--r-- | sway/input/seat.c | 31 |
2 files changed, 38 insertions, 2 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index 59f81e62..31d254df 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -53,5 +53,14 @@ struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, wl_signal_add(&device->keyboard->events.modifiers, &keyboard->keyboard_modifiers); keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers; + wl_list_insert(&seat->keyboards, &keyboard->link); + return keyboard; } + +void sway_keyboard_destroy(struct sway_keyboard *keyboard) { + wl_list_remove(&keyboard->keyboard_key.link); + wl_list_remove(&keyboard->keyboard_modifiers.link); + wl_list_remove(&keyboard->link); + free(keyboard); +} diff --git a/sway/input/seat.c b/sway/input/seat.c index 0a5329c8..7c827374 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -42,6 +42,18 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input, return seat; } +static struct sway_keyboard *seat_keyboard_from_device(struct sway_seat *seat, + struct wlr_input_device *device) { + struct sway_keyboard *keyboard = NULL; + wl_list_for_each(keyboard, &seat->keyboards, link) { + if (keyboard->device == device) { + return keyboard; + } + } + + return keyboard; +} + static void seat_add_pointer(struct sway_seat *seat, struct wlr_input_device *device) { // TODO pointer configuration @@ -50,8 +62,13 @@ static void seat_add_pointer(struct sway_seat *seat, static void seat_add_keyboard(struct sway_seat *seat, struct wlr_input_device *device) { - struct sway_keyboard *keyboard = sway_keyboard_create(seat, device); - wl_list_insert(&seat->keyboards, &keyboard->link); + // TODO keyboard configuration + if (seat_keyboard_from_device(seat, device)) { + // already added + return; + } + + sway_keyboard_create(seat, device); wlr_seat_set_keyboard(seat->seat, device); } @@ -73,6 +90,14 @@ void sway_seat_add_device(struct sway_seat *seat, } } +static void seat_remove_keyboard(struct sway_seat *seat, + struct wlr_input_device *device) { + struct sway_keyboard *keyboard = seat_keyboard_from_device(seat, device); + if (keyboard) { + sway_keyboard_destroy(keyboard); + } +} + static void seat_remove_pointer(struct sway_seat *seat, struct wlr_input_device *device) { wlr_cursor_detach_input_device(seat->cursor->cursor, device); @@ -86,6 +111,8 @@ void sway_seat_remove_device(struct sway_seat *seat, seat_remove_pointer(seat, device); break; case WLR_INPUT_DEVICE_KEYBOARD: + seat_remove_keyboard(seat, device); + break; case WLR_INPUT_DEVICE_TOUCH: case WLR_INPUT_DEVICE_TABLET_PAD: case WLR_INPUT_DEVICE_TABLET_TOOL: |