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

Merge pull request #2569 from RyanDwyer/deny-reload-repeat

Browse Source 
Deny repeating reload by holding key
This commit is contained in:
Drew DeVault 2018-09-04 11:00:12 -04:00 committed by GitHub
commit 309fcf2300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sway/config.h
View File

@ -34,7 +34,8 @@ enum binding_flags {
BINDING_LOCKED=2, // keyboard only BINDING_LOCKED=2, // keyboard only
BINDING_BORDER=4, // mouse only; trigger on container border BINDING_BORDER=4, // mouse only; trigger on container border
BINDING_CONTENTS=8, // mouse only; trigger on container contents BINDING_CONTENTS=8, // mouse only; trigger on container contents
BINDING_TITLEBAR=16 // mouse only; trigger on container titlebar BINDING_TITLEBAR=16, // mouse only; trigger on container titlebar
BINDING_RELOAD=32, // the binding runs the reload command
}; };
/** /**

9
sway/commands/bind.c
View File

@ -214,6 +214,9 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
} }
binding->command = join_args(argv + 1, argc - 1); binding->command = join_args(argv + 1, argc - 1);
if (strcasestr(binding->command, "reload")) {
binding->flags |= BINDING_RELOAD;
}
list_t *split = split_string(argv[0], "+"); list_t *split = split_string(argv[0], "+");
for (int i = 0; i < split->length; ++i) { for (int i = 0; i < split->length; ++i) {
@ -307,11 +310,9 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
binding->command); binding->command);
struct sway_binding *binding_copy = binding; struct sway_binding *binding_copy = binding;
bool reload = false;
// if this is a reload command we need to make a duplicate of the // if this is a reload command we need to make a duplicate of the
// binding since it will be gone after the reload has completed. // binding since it will be gone after the reload has completed.
if (strcasestr(binding->command, "reload")) { if (binding->flags & BINDING_RELOAD) {
reload = true;
binding_copy = sway_binding_dup(binding); binding_copy = sway_binding_dup(binding);
if (!binding_copy) { if (!binding_copy) {
wlr_log(WLR_ERROR, "Failed to duplicate binding during reload"); wlr_log(WLR_ERROR, "Failed to duplicate binding during reload");
@ -328,7 +329,7 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
binding->command, results->error); binding->command, results->error);
} }
if (reload) { // free the binding if we made a copy if (binding->flags & BINDING_RELOAD) { // free the binding if we made a copy
free_sway_binding(binding_copy); free_sway_binding(binding_copy);
} }
free_cmd_results(results); free_cmd_results(results);

3
sway/input/keyboard.c
View File

@ -280,9 +280,12 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
if (binding_pressed) { if (binding_pressed) {
seat_execute_command(seat, binding_pressed); seat_execute_command(seat, binding_pressed);
handled = true; handled = true;
if ((binding_pressed->flags & BINDING_RELOAD) == 0) {
next_repeat_binding = binding_pressed; next_repeat_binding = binding_pressed;
} }
} }
}
// 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 (next_repeat_binding && wlr_device->keyboard->repeat_info.delay > 0) {