From e35c147cd5b8fcd363b7ecc495292733b25d96f5 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 17 Sep 2022 11:26:45 +0200 Subject: river: refactor keyboard groups implementation This reduces the impact of keyboard groups on the Keyboard.zig implementation and otherwise improves consistency with patterns used elsewhere in rivers code. There are also two small changes to the riverctl interface: - keyboard-group-add-keyboard is renamed to keyboard-group-add - keyboard-group-remove is added to support removing keyboards from a group. --- completions/bash/riverctl | 3 ++- completions/fish/riverctl.fish | 7 ++++--- completions/zsh/_riverctl | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'completions') diff --git a/completions/bash/riverctl b/completions/bash/riverctl index c0b0bbd..9793b6f 100644 --- a/completions/bash/riverctl +++ b/completions/bash/riverctl @@ -5,7 +5,8 @@ function __riverctl_completion () OPTS=" \ keyboard-group-create \ keyboard-group-destroy \ - keyboard-group-add-keyboard \ + keyboard-group-add \ + keyboard-group-remove \ csd-filter-add \ exit \ float-filter-add \ diff --git a/completions/fish/riverctl.fish b/completions/fish/riverctl.fish index 4b81ef1..aabf99c 100644 --- a/completions/fish/riverctl.fish +++ b/completions/fish/riverctl.fish @@ -62,9 +62,10 @@ complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'set-repeat' complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'set-cursor-warp' -d 'Set the cursor warp mode.' complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'xcursor-theme' -d 'Set the xcursor theme' # Keyboardgroups -complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-create' -d 'Create a keyboard group.' -complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-destroy' -d 'Destroy a keyboard group.' -complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-add-keyboard' -d 'Add a keyboard to a keyboard group.' +complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-create' -d 'Create a keyboard group.' +complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-destroy' -d 'Destroy a keyboard group.' +complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-add' -d 'Add a keyboard to a keyboard group.' +complete -c riverctl -x -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-remove' -d 'Remove a keyboard from a keyboard group.' # Subcommands complete -c riverctl -x -n '__fish_seen_subcommand_from focus-output' -a 'next previous' diff --git a/completions/zsh/_riverctl b/completions/zsh/_riverctl index 3250b50..f5cd125 100644 --- a/completions/zsh/_riverctl +++ b/completions/zsh/_riverctl @@ -58,7 +58,8 @@ _riverctl_subcommands() # Keyboard groups 'keyboard-group-create:Create a keyboard group' 'keyboard-group-destroy:Destroy a keyboard group' - 'keyboard-group-add-keyboard:Add a keyboard to a keyboard group' + 'keyboard-group-add:Add a keyboard to a keyboard group' + 'keyboard-group-remove:Remove a keyboard from a keyboard group' # Input 'input:Configure input devices' 'list-inputs:List all input devices' -- cgit v1.2.3