diff options
author | frsfnrrg <frsfnrrg@users.noreply.github.com> | 2018-06-01 17:04:04 -0400 |
---|---|---|
committer | frsfnrrg <frsfnrrg@users.noreply.github.com> | 2018-06-01 18:52:36 -0400 |
commit | 83d559dd03e7e16062881932898b5bdaa5a5f689 (patch) | |
tree | b6bbbe90b7c09283de87100e5c314bf67c663daf /sway/input/keyboard.c | |
parent | Style fixed for keyboard.c (diff) | |
download | sway-83d559dd03e7e16062881932898b5bdaa5a5f689.tar.gz sway-83d559dd03e7e16062881932898b5bdaa5a5f689.tar.zst sway-83d559dd03e7e16062881932898b5bdaa5a5f689.zip |
Rename check_shortcut_model to get_active_binding
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r-- | sway/input/keyboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, | |||
49 | * Returns a binding which matches the shortcut model state (ignoring the | 49 | * Returns a binding which matches the shortcut model state (ignoring the |
50 | * `release` flag). | 50 | * `release` flag). |
51 | */ | 51 | */ |
52 | static struct sway_binding *check_shortcut_model( | 52 | static struct sway_binding *get_active_binding( |
53 | struct sway_shortcut_state *state, list_t *bindings, | 53 | struct sway_shortcut_state *state, list_t *bindings, |
54 | uint32_t modifiers, bool locked) { | 54 | uint32_t modifiers, bool locked) { |
55 | int npressed_keys = 0; | 55 | int npressed_keys = 0; |
@@ -228,11 +228,11 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) { | |||
228 | } | 228 | } |
229 | 229 | ||
230 | // identify which binding should be executed. | 230 | // identify which binding should be executed. |
231 | struct sway_binding *binding = check_shortcut_model( | 231 | struct sway_binding *binding = get_active_binding( |
232 | &keyboard->state_keycodes, | 232 | &keyboard->state_keycodes, |
233 | config->current_mode->keycode_bindings, | 233 | config->current_mode->keycode_bindings, |
234 | code_modifiers, input_inhibited); | 234 | code_modifiers, input_inhibited); |
235 | struct sway_binding *translated_binding = check_shortcut_model( | 235 | struct sway_binding *translated_binding = get_active_binding( |
236 | &keyboard->state_keysyms_translated, | 236 | &keyboard->state_keysyms_translated, |
237 | config->current_mode->keysym_bindings, | 237 | config->current_mode->keysym_bindings, |
238 | translated_modifiers, input_inhibited); | 238 | translated_modifiers, input_inhibited); |
@@ -242,7 +242,7 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) { | |||
242 | wlr_log(L_DEBUG, "encountered duplicate bindings %d and %d", | 242 | wlr_log(L_DEBUG, "encountered duplicate bindings %d and %d", |
243 | binding->order, translated_binding->order); | 243 | binding->order, translated_binding->order); |
244 | } | 244 | } |
245 | struct sway_binding *raw_binding = check_shortcut_model( | 245 | struct sway_binding *raw_binding = get_active_binding( |
246 | &keyboard->state_keysyms_raw, | 246 | &keyboard->state_keysyms_raw, |
247 | config->current_mode->keysym_bindings, | 247 | config->current_mode->keysym_bindings, |
248 | raw_modifiers, input_inhibited); | 248 | raw_modifiers, input_inhibited); |