itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename check_shortcut_model to get_active_binding

Browse Source
master
frsfnrrg 7 years ago
parent c53e4e6cde
commit 83d559dd03
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
sway/input/keyboard.c
Unescape View File

@ -49,7 +49,7 @@ static void update_shortcut_model(struct sway_shortcut_state *state,
* Returns a binding which matches the shortcut model state (ignoring the * Returns a binding which matches the shortcut model state (ignoring the
* `release` flag). * `release` flag).
*/ */
static struct sway_binding *check_shortcut_model( static struct sway_binding *get_active_binding(
struct sway_shortcut_state *state, list_t *bindings, struct sway_shortcut_state *state, list_t *bindings,
uint32_t modifiers, bool locked) { uint32_t modifiers, bool locked) {
int npressed_keys = 0; int npressed_keys = 0;
@ -228,11 +228,11 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
} }
// identify which binding should be executed. // identify which binding should be executed.
struct sway_binding *binding = check_shortcut_model( struct sway_binding *binding = get_active_binding(
&keyboard->state_keycodes, &keyboard->state_keycodes,
config->current_mode->keycode_bindings, config->current_mode->keycode_bindings,
code_modifiers, input_inhibited); code_modifiers, input_inhibited);
struct sway_binding *translated_binding = check_shortcut_model( struct sway_binding *translated_binding = get_active_binding(
&keyboard->state_keysyms_translated, &keyboard->state_keysyms_translated,
config->current_mode->keysym_bindings, config->current_mode->keysym_bindings,
translated_modifiers, input_inhibited); translated_modifiers, input_inhibited);
@ -242,7 +242,7 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
wlr_log(L_DEBUG, "encountered duplicate bindings %d and %d", wlr_log(L_DEBUG, "encountered duplicate bindings %d and %d",
binding->order, translated_binding->order); binding->order, translated_binding->order);
} }
struct sway_binding *raw_binding = check_shortcut_model( struct sway_binding *raw_binding = get_active_binding(
&keyboard->state_keysyms_raw, &keyboard->state_keysyms_raw,
config->current_mode->keysym_bindings, config->current_mode->keysym_bindings,
raw_modifiers, input_inhibited); raw_modifiers, input_inhibited);

Write Preview
Loading…
Cancel
Save