diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-04-25 11:00:56 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-25 11:00:56 +0200 |
| commit | c54097428a8f36e456d203d986d76702bd339066 (patch) | |
| tree | ec248905f4c73d8f52c3e2c08ce26decbda2d704 /include/swaylock | |
| parent | Update wording about unmanaged/unmapped views (diff) | |
| parent | Merge pull request #1861 from emersion/swaybar-memory-leaks (diff) | |
| download | sway-c54097428a8f36e456d203d986d76702bd339066.tar.gz sway-c54097428a8f36e456d203d986d76702bd339066.tar.zst sway-c54097428a8f36e456d203d986d76702bd339066.zip | |
Merge branch 'master' into criteria-commands
Diffstat (limited to 'include/swaylock')
| -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, |