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 | |
parent | Merge remote-tracking branch 'upstream/master' into atomic (diff) | |
parent | Merge pull request #2143 from vilhalmer/mark-pool-buffers-busy (diff) | |
download | sway-645bf446fab8db581b04babb1a34aa3c40428058.tar.gz sway-645bf446fab8db581b04babb1a34aa3c40428058.tar.zst sway-645bf446fab8db581b04babb1a34aa3c40428058.zip |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 2 | ||||
-rw-r--r-- | include/sway/input/keyboard.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 81e9c382..e75b0664 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -30,7 +30,7 @@ struct sway_binding { | |||
30 | bool release; | 30 | bool release; |
31 | bool locked; | 31 | bool locked; |
32 | bool bindcode; | 32 | bool bindcode; |
33 | list_t *keys; | 33 | list_t *keys; // sorted in ascending order |
34 | uint32_t modifiers; | 34 | uint32_t modifiers; |
35 | char *command; | 35 | char *command; |
36 | }; | 36 | }; |
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 { | |||
21 | * including duplicates when a keycode generates multiple key ids. | 21 | * including duplicates when a keycode generates multiple key ids. |
22 | */ | 22 | */ |
23 | uint32_t pressed_keycodes[SWAY_KEYBOARD_PRESSED_KEYS_CAP]; | 23 | uint32_t pressed_keycodes[SWAY_KEYBOARD_PRESSED_KEYS_CAP]; |
24 | int last_key_index; | 24 | uint32_t last_keycode; |
25 | uint32_t last_raw_modifiers; | ||
26 | size_t npressed; | ||
25 | }; | 27 | }; |
26 | 28 | ||
27 | struct sway_keyboard { | 29 | struct sway_keyboard { |
@@ -36,7 +38,6 @@ struct sway_keyboard { | |||
36 | struct sway_shortcut_state state_keysyms_raw; | 38 | struct sway_shortcut_state state_keysyms_raw; |
37 | struct sway_shortcut_state state_keycodes; | 39 | struct sway_shortcut_state state_keycodes; |
38 | struct sway_binding *held_binding; | 40 | struct sway_binding *held_binding; |
39 | uint32_t last_modifiers; | ||
40 | }; | 41 | }; |
41 | 42 | ||
42 | struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, | 43 | struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, |