summaryrefslogtreecommitdiff
path: root/sway/input/input-manager.c
diff options
context:
space:
mode:
authorWilliam McKinnon <[email protected]>2022-04-27 17:33:23 -0400
committerWilliam McKinnon <[email protected]>2022-04-27 17:33:23 -0400
commit7460d9f565092836f81b917a040caff57142d91a (patch)
treeb76e7facef2aaa5925a62ad6b9995c16663313f0 /sway/input/input-manager.c
parentc37aba2736e31264bdcd52147a96fa85e17c8c5f (diff)
merge sway master
Diffstat (limited to 'sway/input/input-manager.c')
-rw-r--r--sway/input/input-manager.c4
1 files changed, 2 insertions, 2 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) :