alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2578 from RyanDwyer/fix-binding-reload

Browse source 
Fix management of bindings during reload
This commit is contained in:
emersion 2018-09-06 10:41:49 +02:00 committed by GitHub
parent 63567f5ac6 32c7386b0f
commit bea9f9c63f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/bind.c
View file

@ -329,7 +329,7 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
binding->command, results->error); binding->command, results->error);
} }
if (binding->flags & BINDING_RELOAD) { // free the binding if we made a copy if (binding_copy->flags & BINDING_RELOAD) {
free_sway_binding(binding_copy); free_sway_binding(binding_copy);
} }
free_cmd_results(results); free_cmd_results(results);

5
sway/input/keyboard.c
View file

@ -278,12 +278,11 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
raw_modifiers, false, input_inhibited); raw_modifiers, false, input_inhibited);
if (binding_pressed) { if (binding_pressed) {
seat_execute_command(seat, binding_pressed);
handled = true;
if ((binding_pressed->flags & BINDING_RELOAD) == 0) { if ((binding_pressed->flags & BINDING_RELOAD) == 0) {
next_repeat_binding = binding_pressed; next_repeat_binding = binding_pressed;
} }
seat_execute_command(seat, binding_pressed);
handled = true;
} }
} }