diff options
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index fe61e0fe..b21e1b86 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -142,7 +142,7 @@ static struct sway_keyboard *sway_keyboard_for_wlr_keyboard( | |||
142 | if (input_device->wlr_device->type != WLR_INPUT_DEVICE_KEYBOARD) { | 142 | if (input_device->wlr_device->type != WLR_INPUT_DEVICE_KEYBOARD) { |
143 | continue; | 143 | continue; |
144 | } | 144 | } |
145 | if (input_device->wlr_device->keyboard == wlr_keyboard) { | 145 | if (input_device->wlr_device == &wlr_keyboard->base) { |
146 | return seat_device->keyboard; | 146 | return seat_device->keyboard; |
147 | } | 147 | } |
148 | } | 148 | } |
@@ -150,7 +150,7 @@ static struct sway_keyboard *sway_keyboard_for_wlr_keyboard( | |||
150 | wl_list_for_each(group, &seat->keyboard_groups, link) { | 150 | wl_list_for_each(group, &seat->keyboard_groups, link) { |
151 | struct sway_input_device *input_device = | 151 | struct sway_input_device *input_device = |
152 | group->seat_device->input_device; | 152 | group->seat_device->input_device; |
153 | if (input_device->wlr_device->keyboard == wlr_keyboard) { | 153 | if (input_device->wlr_device == &wlr_keyboard->base) { |
154 | return group->seat_device->keyboard; | 154 | return group->seat_device->keyboard; |
155 | } | 155 | } |
156 | } | 156 | } |
@@ -745,10 +745,10 @@ static void seat_apply_input_config(struct sway_seat *seat, | |||
745 | struct wlr_input_device *dev = sway_device->input_device->wlr_device; | 745 | struct wlr_input_device *dev = sway_device->input_device->wlr_device; |
746 | switch (dev->type) { | 746 | switch (dev->type) { |
747 | case WLR_INPUT_DEVICE_POINTER: | 747 | case WLR_INPUT_DEVICE_POINTER: |
748 | mapped_to_output = dev->pointer->output_name; | 748 | mapped_to_output = wlr_pointer_from_input_device(dev)->output_name; |
749 | break; | 749 | break; |
750 | case WLR_INPUT_DEVICE_TOUCH: | 750 | case WLR_INPUT_DEVICE_TOUCH: |
751 | mapped_to_output = dev->touch->output_name; | 751 | mapped_to_output = wlr_touch_from_input_device(dev)->output_name; |
752 | break; | 752 | break; |
753 | default: | 753 | default: |
754 | mapped_to_output = NULL; | 754 | mapped_to_output = NULL; |
@@ -822,7 +822,7 @@ static void seat_configure_keyboard(struct sway_seat *seat, | |||
822 | } | 822 | } |
823 | sway_keyboard_configure(seat_device->keyboard); | 823 | sway_keyboard_configure(seat_device->keyboard); |
824 | wlr_seat_set_keyboard(seat->wlr_seat, | 824 | wlr_seat_set_keyboard(seat->wlr_seat, |
825 | seat_device->input_device->wlr_device->keyboard); | 825 | wlr_keyboard_from_input_device(seat_device->input_device->wlr_device)); |
826 | 826 | ||
827 | // force notify reenter to pick up the new configuration. This reuses | 827 | // force notify reenter to pick up the new configuration. This reuses |
828 | // the current focused surface to avoid breaking input grabs. | 828 | // the current focused surface to avoid breaking input grabs. |