diff options
author | Simon Ser <contact@emersion.fr> | 2022-06-21 23:10:38 +0200 |
---|---|---|
committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-06-22 12:44:15 -0400 |
commit | 122d8ce95484bd097bf3a15b8191213bd6969b41 (patch) | |
tree | b97bb88c4bf7b566747bed4cce84f51842cd21a5 /sway/commands/input | |
parent | Allocate enough space for `cmd_results->error` (diff) | |
download | sway-122d8ce95484bd097bf3a15b8191213bd6969b41.tar.gz sway-122d8ce95484bd097bf3a15b8191213bd6969b41.tar.zst sway-122d8ce95484bd097bf3a15b8191213bd6969b41.zip |
Remove access to wlr_input_device union
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3626
Closes: https://github.com/swaywm/sway/issues/7077
Diffstat (limited to 'sway/commands/input')
-rw-r--r-- | sway/commands/input/xkb_switch_layout.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c index dabc6697..3cce4ec8 100644 --- a/sway/commands/input/xkb_switch_layout.c +++ b/sway/commands/input/xkb_switch_layout.c | |||
@@ -98,10 +98,9 @@ struct cmd_results *input_cmd_xkb_switch_layout(int argc, char **argv) { | |||
98 | struct xkb_switch_layout_action *action = | 98 | struct xkb_switch_layout_action *action = |
99 | &actions[actions_len++]; | 99 | &actions[actions_len++]; |
100 | 100 | ||
101 | action->keyboard = dev->wlr_device->keyboard; | 101 | action->keyboard = wlr_keyboard_from_input_device(dev->wlr_device); |
102 | if (relative) { | 102 | if (relative) { |
103 | action->layout = get_layout_relative( | 103 | action->layout = get_layout_relative(action->keyboard, relative); |
104 | dev->wlr_device->keyboard, relative); | ||
105 | } else { | 104 | } else { |
106 | action->layout = layout; | 105 | action->layout = layout; |
107 | } | 106 | } |