mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 14:34:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded variable

Browse Source
This commit is contained in:
Ryan Dwyer 2018-10-08 20:40:47 +10:00
parent 82423991a8
commit 88a5e26c6e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sway/input/keyboard.c
View File

@ -264,29 +264,27 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
} }
// Identify and execute active pressed binding // Identify and execute active pressed binding
struct sway_binding *next_repeat_binding = NULL; struct sway_binding *binding = NULL;
if (event->state == WLR_KEY_PRESSED) { if (event->state == WLR_KEY_PRESSED) {
struct sway_binding *binding_pressed = NULL;
get_active_binding(&keyboard->state_keycodes, get_active_binding(&keyboard->state_keycodes,
config->current_mode->keycode_bindings, &binding_pressed, config->current_mode->keycode_bindings, &binding,
code_modifiers, false, input_inhibited); code_modifiers, false, input_inhibited);
get_active_binding(&keyboard->state_keysyms_translated, get_active_binding(&keyboard->state_keysyms_translated,
config->current_mode->keysym_bindings, &binding_pressed, config->current_mode->keysym_bindings, &binding,
translated_modifiers, false, input_inhibited); translated_modifiers, false, input_inhibited);
get_active_binding(&keyboard->state_keysyms_raw, get_active_binding(&keyboard->state_keysyms_raw,
config->current_mode->keysym_bindings, &binding_pressed, config->current_mode->keysym_bindings, &binding,
raw_modifiers, false, input_inhibited); raw_modifiers, false, input_inhibited);
if (binding_pressed) { if (binding) {
next_repeat_binding = binding_pressed; seat_execute_command(seat, binding);
seat_execute_command(seat, binding_pressed);
handled = true; handled = true;
} }
} }
// Set up (or clear) keyboard repeat for a pressed binding // Set up (or clear) keyboard repeat for a pressed binding
if (next_repeat_binding && wlr_device->keyboard->repeat_info.delay > 0) { if (binding && wlr_device->keyboard->repeat_info.delay > 0) {
keyboard->repeat_binding = next_repeat_binding; keyboard->repeat_binding = binding;
if (wl_event_source_timer_update(keyboard->key_repeat_source, if (wl_event_source_timer_update(keyboard->key_repeat_source,
wlr_device->keyboard->repeat_info.delay) < 0) { wlr_device->keyboard->repeat_info.delay) < 0) {
wlr_log(WLR_DEBUG, "failed to set key repeat timer"); wlr_log(WLR_DEBUG, "failed to set key repeat timer");