diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-18 15:58:48 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-18 15:58:48 +1000 |
commit | 645bf446fab8db581b04babb1a34aa3c40428058 (patch) | |
tree | 4b7374d58e0b6a5b183049bc7551db8016f8a296 /include/sway/input/keyboard.h | |
parent | 9e96cfd310c4e5dc60f07d772e60b139ff7dc448 (diff) | |
parent | 202ee511503bc7c6a18dec440ac3cdb8d5e8f859 (diff) |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'include/sway/input/keyboard.h')
-rw-r--r-- | include/sway/input/keyboard.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h index e99a54b1..6713398e 100644 --- a/include/sway/input/keyboard.h +++ b/include/sway/input/keyboard.h @@ -21,7 +21,9 @@ struct sway_shortcut_state { * including duplicates when a keycode generates multiple key ids. */ uint32_t pressed_keycodes[SWAY_KEYBOARD_PRESSED_KEYS_CAP]; - int last_key_index; + uint32_t last_keycode; + uint32_t last_raw_modifiers; + size_t npressed; }; struct sway_keyboard { @@ -36,7 +38,6 @@ struct sway_keyboard { struct sway_shortcut_state state_keysyms_raw; struct sway_shortcut_state state_keycodes; struct sway_binding *held_binding; - uint32_t last_modifiers; }; struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, |