pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up fallthrough issues

Browse Source
This commit is contained in:
Drew DeVault 2017-08-09 18:34:51 -04:00
parent 3c03e851b6
commit a2ca567149
1 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
main.c
View File

@ -152,10 +152,11 @@ bool verify_password() {
void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t code, uint32_t codepoint) { void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t code, uint32_t codepoint) {
int redraw_screen = 0; int redraw_screen = 0;
char *password_realloc; char *password_realloc;
int i;
if (state == WL_KEYBOARD_KEY_STATE_PRESSED) { if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
switch (sym) { switch (sym) {
case XKB_KEY_KP_Enter: // fallthrough case XKB_KEY_KP_Enter:
case XKB_KEY_Return: case XKB_KEY_Return:
render_data.auth_state = AUTH_STATE_VALIDATING; render_data.auth_state = AUTH_STATE_VALIDATING;
@ -166,6 +167,7 @@ void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t cod
if (verify_password()) { if (verify_password()) {
exit(0); exit(0);
} }
render_data.auth_state = AUTH_STATE_INVALID; render_data.auth_state = AUTH_STATE_INVALID;
redraw_screen = 1; redraw_screen = 1;
@ -174,73 +176,65 @@ void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t cod
password[0] = '\0'; password[0] = '\0';
break; break;
case XKB_KEY_BackSpace: case XKB_KEY_BackSpace:
{ i = strlen(password);
int i = strlen(password); if (i > 0) {
if (i > 0) { password[i - 1] = '\0';
password[i - 1] = '\0'; render_data.auth_state = AUTH_STATE_BACKSPACE;
render_data.auth_state = AUTH_STATE_BACKSPACE; redraw_screen = 1;
redraw_screen = 1;
}
break;
} }
case XKB_KEY_Control_L: // fallthrough break;
case XKB_KEY_Control_R: // fallthrough case XKB_KEY_Control_L:
case XKB_KEY_Shift_L: // fallthrough case XKB_KEY_Control_R:
case XKB_KEY_Shift_R: // fallthrough case XKB_KEY_Shift_L:
case XKB_KEY_Caps_Lock: // fallthrough case XKB_KEY_Shift_R:
case XKB_KEY_Shift_Lock: // fallthrough case XKB_KEY_Caps_Lock:
case XKB_KEY_Meta_L: // fallthrough case XKB_KEY_Shift_Lock:
case XKB_KEY_Meta_R: // fallthrough case XKB_KEY_Meta_L:
case XKB_KEY_Alt_L: // fallthrough case XKB_KEY_Meta_R:
case XKB_KEY_Alt_R: // fallthrough case XKB_KEY_Alt_L:
case XKB_KEY_Super_L: // fallthrough case XKB_KEY_Alt_R:
case XKB_KEY_Super_R: // fallthrough case XKB_KEY_Super_L:
case XKB_KEY_Hyper_L: // fallthrough case XKB_KEY_Super_R:
case XKB_KEY_Hyper_L:
case XKB_KEY_Hyper_R: case XKB_KEY_Hyper_R:
{ break; // don't draw screen on modifier keys
// don't draw screen on modifier keys case XKB_KEY_Escape:
case XKB_KEY_u:
case XKB_KEY_U:
// clear password buffer on ctrl-u (or escape for i3lock compatibility)
if (sym == XKB_KEY_Escape || xkb_state_mod_name_is_active(registry->input->xkb.state,
XKB_MOD_NAME_CTRL, XKB_STATE_MODS_EFFECTIVE) > 0) {
render_data.auth_state = AUTH_STATE_BACKSPACE;
redraw_screen = 1;
password_size = 1024;
free(password);
password = malloc(password_size);
password[0] = '\0';
break; break;
} }
case XKB_KEY_Escape: // fallthrough /* fallthrough */
case XKB_KEY_u: // fallthrough default:
case XKB_KEY_U: render_data.auth_state = AUTH_STATE_INPUT;
{ redraw_screen = 1;
// clear password buffer on ctrl-u (or escape for i3lock compatibility) i = strlen(password);
if (sym == XKB_KEY_Escape || xkb_state_mod_name_is_active(registry->input->xkb.state, if (i + 1 == password_size) {
XKB_MOD_NAME_CTRL, XKB_STATE_MODS_EFFECTIVE) > 0) { password_size += 1024;
render_data.auth_state = AUTH_STATE_BACKSPACE; password_realloc = realloc(password, password_size);
redraw_screen = 1; // reset password if realloc fails.
if (password_realloc == NULL) {
password_size = 1024; password_size = 1024;
free(password); free(password);
password = malloc(password_size); password = malloc(password_size);
password[0] = '\0'; password[0] = '\0';
break; break;
} else {
password = password_realloc;
} }
} }
default: password[i] = (char)codepoint;
{ password[i + 1] = '\0';
render_data.auth_state = AUTH_STATE_INPUT; break;
redraw_screen = 1;
int i = strlen(password);
if (i + 1 == password_size) {
password_size += 1024;
password_realloc = realloc(password, password_size);
// reset password if realloc fails.
if (password_realloc == NULL) {
password_size = 1024;
free(password);
password = malloc(password_size);
password[0] = '\0';
break;
} else {
password = password_realloc;
}
}
password[i] = (char)codepoint;
password[i + 1] = '\0';
break;
}
} }
if (redraw_screen) { if (redraw_screen) {
render(&render_data, config); render(&render_data, config);