diff options
author | Mattias Eriksson <snaggen@mayam.com> | 2018-04-20 14:46:30 +0200 |
---|---|---|
committer | Mattias Eriksson <snaggen@mayam.com> | 2018-04-24 15:40:30 +0200 |
commit | 2d884d4e4f8b8e7cac87f8096c0cc31535bd0642 (patch) | |
tree | 35941cb448213c81a4956360af05c53537809ff5 /include | |
parent | Merge pull request #1851 from RyanDwyer/container-descendants-crash (diff) | |
download | sway-2d884d4e4f8b8e7cac87f8096c0cc31535bd0642.tar.gz sway-2d884d4e4f8b8e7cac87f8096c0cc31535bd0642.tar.zst sway-2d884d4e4f8b8e7cac87f8096c0cc31535bd0642.zip |
Improved key handling in swaylock
Make escape clear buffer
Add indicator states for ctrl,shift,super et al
Add CapsLock indicator
Diffstat (limited to 'include')
-rw-r--r-- | include/swaylock/seat.h | 1 | ||||
-rw-r--r-- | include/swaylock/swaylock.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/swaylock/seat.h b/include/swaylock/seat.h index 44bc37d5..180ea7a0 100644 --- a/include/swaylock/seat.h +++ b/include/swaylock/seat.h | |||
@@ -27,6 +27,7 @@ enum mask { | |||
27 | 27 | ||
28 | struct swaylock_xkb { | 28 | struct swaylock_xkb { |
29 | uint32_t modifiers; | 29 | uint32_t modifiers; |
30 | bool caps_lock; | ||
30 | struct xkb_state *state; | 31 | struct xkb_state *state; |
31 | struct xkb_context *context; | 32 | struct xkb_context *context; |
32 | struct xkb_keymap *keymap; | 33 | struct xkb_keymap *keymap; |
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index ed9fea19..07b908d7 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -11,7 +11,9 @@ | |||
11 | 11 | ||
12 | enum auth_state { | 12 | enum auth_state { |
13 | AUTH_STATE_IDLE, | 13 | AUTH_STATE_IDLE, |
14 | AUTH_STATE_CLEAR, | ||
14 | AUTH_STATE_INPUT, | 15 | AUTH_STATE_INPUT, |
16 | AUTH_STATE_INPUT_NOP, | ||
15 | AUTH_STATE_BACKSPACE, | 17 | AUTH_STATE_BACKSPACE, |
16 | AUTH_STATE_VALIDATING, | 18 | AUTH_STATE_VALIDATING, |
17 | AUTH_STATE_INVALID, | 19 | AUTH_STATE_INVALID, |