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

add --no-repeat option for bindings

Browse source 
This allows e.g. triggering one command while a key is held, then
triggering another to undo the change performed by it afterwards. One
use case for this is triggering push-to-talk functionality for VoIP
tools without granting them full access to all input events.

Fixes #3151
This commit is contained in:
Linus Heckemann 2020-03-23 12:34:04 +01:00 committed by Simon Ser
parent 5e41e6600b
commit df48c48123
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/config.h
View file

@ -41,6 +41,7 @@ enum binding_flags {
BINDING_CODE=32, // keyboard only; convert keysyms into keycodes BINDING_CODE=32, // keyboard only; convert keysyms into keycodes
BINDING_RELOAD=64, // switch only; (re)trigger binding on reload BINDING_RELOAD=64, // switch only; (re)trigger binding on reload
BINDING_INHIBITED=128, // keyboard only: ignore shortcut inhibitor BINDING_INHIBITED=128, // keyboard only: ignore shortcut inhibitor
BINDING_NOREPEAT=256, // keyboard only; do not trigger when repeating a held key
}; };
/** /**

2
sway/commands/bind.c
View file

@ -373,6 +373,8 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
binding->input = strdup(argv[0] + strlen("--input-device=")); binding->input = strdup(argv[0] + strlen("--input-device="));
} else if (strcmp("--no-warn", argv[0]) == 0) { } else if (strcmp("--no-warn", argv[0]) == 0) {
warn = false; warn = false;
} else if (strcmp("--no-repeat", argv[0]) == 0) {
binding->flags |= BINDING_NOREPEAT;
} else { } else {
break; break;
} }

3
sway/input/keyboard.c
View file

@ -431,7 +431,8 @@ static void handle_key_event(struct sway_keyboard *keyboard,
// Set up (or clear) keyboard repeat for a pressed binding. Since the // Set up (or clear) keyboard repeat for a pressed binding. Since the
// binding may remove the keyboard, the timer needs to be updated first // binding may remove the keyboard, the timer needs to be updated first
if (binding && wlr_device->keyboard->repeat_info.delay > 0) { if (binding && !(binding->flags & BINDING_NOREPEAT) &&
wlr_device->keyboard->repeat_info.delay > 0) {
keyboard->repeat_binding = 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) {

6
sway/sway.5.scd
View file

@ -356,7 +356,7 @@ runtime.
for_window <criteria> move container to output <output> for_window <criteria> move container to output <output>
*bindsym* [--whole-window] [--border] [--exclude-titlebar] [--release] [--locked] \ *bindsym* [--whole-window] [--border] [--exclude-titlebar] [--release] [--locked] \
[--to-code] [--input-device=<device>] [--no-warn] [Group<1-4>+]<key combo> \ [--to-code] [--input-device=<device>] [--no-warn] [--no-repeat] [Group<1-4>+]<key combo> \
<command> <command>
Binds _key combo_ to execute the sway command _command_ when pressed. You Binds _key combo_ to execute the sway command _command_ when pressed. You
may use XKB key names here (*xev*(1) is a good tool for discovering these). may use XKB key names here (*xev*(1) is a good tool for discovering these).
@ -382,6 +382,10 @@ runtime.
define bindings which will be exempt from pass-through to such define bindings which will be exempt from pass-through to such
software. The same preference logic as for _--locked_ applies. software. The same preference logic as for _--locked_ applies.
Unless the flag _--no-repeat_ is set, the command will be run
repeatedly when the key is held, according to the repeat
settings specified in the input configuration.
Bindings to keysyms are layout-dependent. This can be changed with the Bindings to keysyms are layout-dependent. This can be changed with the
_--to-code_ flag. In this case, the keysyms will be translated into the _--to-code_ flag. In this case, the keysyms will be translated into the
corresponding keycodes in the first configured layout. corresponding keycodes in the first configured layout.