Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-27 21:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restrict CapsLock and NumLock commands to the configuration file

Browse source
This commit is contained in:
ProgAndy 2018-07-25 17:08:47 +02:00
parent d07463d53b
commit 0ba52458ab
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/commands/input.c
View file

@ -24,15 +24,19 @@ static struct cmd_handler input_handlers[] = {
{ "scroll_method", input_cmd_scroll_method }, { "scroll_method", input_cmd_scroll_method },
{ "tap", input_cmd_tap }, { "tap", input_cmd_tap },
{ "tap_button_map", input_cmd_tap_button_map }, { "tap_button_map", input_cmd_tap_button_map },
{ "xkb_capslock", input_cmd_xkb_capslock },
{ "xkb_layout", input_cmd_xkb_layout }, { "xkb_layout", input_cmd_xkb_layout },
{ "xkb_model", input_cmd_xkb_model }, { "xkb_model", input_cmd_xkb_model },
{ "xkb_numlock", input_cmd_xkb_numlock },
{ "xkb_options", input_cmd_xkb_options }, { "xkb_options", input_cmd_xkb_options },
{ "xkb_rules", input_cmd_xkb_rules }, { "xkb_rules", input_cmd_xkb_rules },
{ "xkb_variant", input_cmd_xkb_variant }, { "xkb_variant", input_cmd_xkb_variant },
}; };
// must be in order for the bsearch
static struct cmd_handler input_config_handlers[] = {
{ "xkb_capslock", input_cmd_xkb_capslock },
{ "xkb_numlock", input_cmd_xkb_numlock },
};
struct cmd_results *cmd_input(int argc, char **argv) { struct cmd_results *cmd_input(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "input", EXPECTED_AT_LEAST, 2))) { if ((error = checkarg(argc, "input", EXPECTED_AT_LEAST, 2))) {
@ -46,8 +50,21 @@ struct cmd_results *cmd_input(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config"); return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
} }
struct cmd_results *res = config_subcommand(argv + 1, argc - 1, struct cmd_results *res;
if (find_handler(argv[1], input_config_handlers,
sizeof(input_config_handlers))) {
if (config->reading) {
res = config_subcommand(argv + 1, argc - 1,
input_config_handlers, sizeof(input_config_handlers));
} else {
res = cmd_results_new(CMD_FAILURE, "input",
"Can only be used in config file.");
}
} else {
res = config_subcommand(argv + 1, argc - 1,
input_handlers, sizeof(input_handlers)); input_handlers, sizeof(input_handlers));
}
free_input_config(config->handler_context.input_config); free_input_config(config->handler_context.input_config);
config->handler_context.input_config = NULL; config->handler_context.input_config = NULL;

8
sway/sway-input.5.scd
View file

@ -33,13 +33,13 @@ For more information on these xkb configuration options, see
*input* <identifier> xkb\_variant <variant> *input* <identifier> xkb\_variant <variant>
Sets the variant of the keyboard like _dvorak_ or _colemak_. Sets the variant of the keyboard like _dvorak_ or _colemak_.
The following commands may only be used in the configuration file.
*input* <identifier> xkb\_capslock enabled|disabled *input* <identifier> xkb\_capslock enabled|disabled
Enables or disables CapsLock on sway startup, the default is disabled. Initially enables or disables CapsLock, the default is disabled.
Only meaningful if sway controls the keyboard.
*input* <identifier> xkb\_numlock enabled|disabled *input* <identifier> xkb\_numlock enabled|disabled
Enables or disables NumLock on sway startup, the default is enabled. Initially enables or disables NumLock, the default is enabled.
Only meaningful if sway controls the keyboard.
## MAPPING CONFIGURATION ## MAPPING CONFIGURATION