Merge branch 'master' into idle_v2

This commit is contained in:
Mattias Eriksson 2018-04-24 19:27:11 +02:00
commit 61cc0c67fe
6 changed files with 52 additions and 2 deletions

View file

@ -27,6 +27,7 @@ enum mask {
struct swaylock_xkb {
uint32_t modifiers;
bool caps_lock;
struct xkb_state *state;
struct xkb_context *context;
struct xkb_keymap *keymap;

View file

@ -11,7 +11,9 @@
enum auth_state {
AUTH_STATE_IDLE,
AUTH_STATE_CLEAR,
AUTH_STATE_INPUT,
AUTH_STATE_INPUT_NOP,
AUTH_STATE_BACKSPACE,
AUTH_STATE_VALIDATING,
AUTH_STATE_INVALID,