From 83d559dd03e7e16062881932898b5bdaa5a5f689 Mon Sep 17 00:00:00 2001 From: frsfnrrg Date: Fri, 1 Jun 2018 17:04:04 -0400 Subject: Rename check_shortcut_model to get_active_binding --- sway/input/keyboard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sway') diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index 27263046..b7c622aa 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -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 * `release` flag). */ -static struct sway_binding *check_shortcut_model( +static struct sway_binding *get_active_binding( struct sway_shortcut_state *state, list_t *bindings, uint32_t modifiers, bool locked) { 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. - struct sway_binding *binding = check_shortcut_model( + struct sway_binding *binding = get_active_binding( &keyboard->state_keycodes, config->current_mode->keycode_bindings, code_modifiers, input_inhibited); - struct sway_binding *translated_binding = check_shortcut_model( + struct sway_binding *translated_binding = get_active_binding( &keyboard->state_keysyms_translated, config->current_mode->keysym_bindings, 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", 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, config->current_mode->keysym_bindings, raw_modifiers, input_inhibited); -- cgit v1.2.3-54-g00ecf