Merge pull request #2130 from frsfnrrg/keyboard-tuning

Clean up keyboard handling code

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 {
         bool release;
         bool locked;
         bool bindcode;
-        list_t *keys;
+        list_t *keys; // sorted in ascending order
         uint32_t modifiers;
         char *command;
 };
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,