nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reduce repetition in get_binding()

This commit is contained in:
Orestis Floros 2018-03-16 03:08:47 +02:00
parent 965ef8d33f
commit 9d22d2efce
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bindings.c
View File

@ -227,9 +227,9 @@ static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_releas
/* For keyboard bindings where a symbol was specified by the user, we /* For keyboard bindings where a symbol was specified by the user, we
* need to look in the array of translated keycodes for the event’s * need to look in the array of translated keycodes for the event’s
* keycode */ * keycode */
bool found_keycode = false;
if (input_type == B_KEYBOARD && bind->symbol != NULL) { if (input_type == B_KEYBOARD && bind->symbol != NULL) {
xcb_keycode_t input_keycode = (xcb_keycode_t)input_code; xcb_keycode_t input_keycode = (xcb_keycode_t)input_code;
bool found_keycode = false;
struct Binding_Keycode *binding_keycode; struct Binding_Keycode *binding_keycode;
TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) { TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) {
const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF); const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF);
@ -241,16 +241,12 @@ static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_releas
break; break;
} }
} }
if (!found_keycode) {
continue;
}
} else { } else {
/* This case is easier: The user specified a keycode */ /* This case is easier: The user specified a keycode */
if (bind->keycode != input_code) { if (bind->keycode != input_code) {
continue; continue;
} }
bool found_keycode = false;
struct Binding_Keycode *binding_keycode; struct Binding_Keycode *binding_keycode;
TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) { TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) {
const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF); const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF);
@ -262,9 +258,9 @@ static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_releas
break; break;
} }
} }
if (!found_keycode) { }
continue; if (!found_keycode) {
} continue;
} }
/* If this binding is a release binding, it matches the key which the /* If this binding is a release binding, it matches the key which the