diff options
| author | Denis Doria <denisdoria@gmail.com> | 2016-06-05 07:49:33 +0200 |
|---|---|---|
| committer | Denis Doria <denisdoria@gmail.com> | 2016-06-05 07:49:33 +0200 |
| commit | 3c3e98b1a3beda5f17f689bfad64dde3bc0bf6ac (patch) | |
| tree | b262bccd3d262d7ff144c26b7c8bb3a2f951c396 /swaylock/main.c | |
| parent | 29eb3bf7467d721d89cf4a7925d2e41cda91c606 (diff) | |
| parent | d57714e8020870d25be6ce778a36741295f9ba3e (diff) | |
Merge branch 'master' into variables_corner_cases
Diffstat (limited to 'swaylock/main.c')
| -rw-r--r-- | swaylock/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index 2c69f7fd..b5ce63ef 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -119,6 +119,7 @@ void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t cod if (state == WL_KEYBOARD_KEY_STATE_PRESSED) { switch (sym) { + case XKB_KEY_KP_Enter: // fallthrough case XKB_KEY_Return: render_data.auth_state = AUTH_STATE_VALIDATING; @@ -159,7 +160,7 @@ void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t cod case XKB_KEY_Super_L: // fallthrough case XKB_KEY_Super_R: // fallthrough case XKB_KEY_Hyper_L: // fallthrough - case XKB_KEY_Hyper_R: // fallthrough + case XKB_KEY_Hyper_R: { // don't draw screen on modifier keys break; @@ -360,7 +361,7 @@ int main(int argc, char **argv) { { int colorlen = strlen(optarg); if (colorlen < 6 || colorlen == 7 || colorlen > 8) { - sway_log(L_ERROR, "color must be specified in 3 or 4 byte format, e.g. ff0000 or ff0000ff"); + sway_log(L_ERROR, "color must be specified in 3 or 4 byte format, i.e. rrggbb or rrggbbaa"); exit(EXIT_FAILURE); } render_data.color = strtol(optarg, NULL, 16); |