diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-02-09 16:20:39 -0500 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-02-21 20:25:47 +0300 |
| commit | 85d1c98476b653368e9a9f41650eb6e2f6aac596 (patch) | |
| tree | fbeff8e7914ffe8ec4a4266a2e4578e8d16590a2 | |
| parent | f8990523b456ad4eba2bd9c22dff87772d7b0953 (diff) | |
sway/input: use wlr_input_device from input device base
| -rw-r--r-- | sway/input/input-manager.c | 4 | ||||
| -rw-r--r-- | sway/input/keyboard.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index f04a8ce0..8538d97c 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c @@ -377,7 +377,7 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) { struct sway_input_manager *input_manager = wl_container_of(listener, input_manager, virtual_keyboard_new); struct wlr_virtual_keyboard_v1 *keyboard = data; - struct wlr_input_device *device = &keyboard->input_device; + struct wlr_input_device *device = &keyboard->keyboard.base; // TODO: Amend protocol to allow NULL seat struct sway_seat *seat = keyboard->seat ? @@ -410,7 +410,7 @@ void handle_virtual_pointer(struct wl_listener *listener, void *data) { wl_container_of(listener, input_manager, virtual_pointer_new); struct wlr_virtual_pointer_v1_new_pointer_event *event = data; struct wlr_virtual_pointer_v1 *pointer = event->new_pointer; - struct wlr_input_device *device = &pointer->input_device; + struct wlr_input_device *device = &pointer->pointer.base; struct sway_seat *seat = event->suggested_seat ? input_manager_sway_seat_from_wlr_seat(event->suggested_seat) : diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index f258ac7d..b853e391 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -950,7 +950,7 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) { goto cleanup; } sway_group->seat_device->input_device->wlr_device = - sway_group->wlr_group->input_device; + &sway_group->wlr_group->keyboard.base; if (!sway_keyboard_create(seat, sway_group->seat_device)) { sway_log(SWAY_ERROR, "Failed to allocate sway_keyboard for group"); |