From 5b30391383be7e31ae1b213f2a6095bd7a95defc Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 18 Apr 2018 23:19:23 +1000 Subject: Make key repeat configurable This creates two input commands for configuring the repeat delay and rate. Example config: input "myidentifier" { repeat_delay 250 repeat_rate 25 } --- sway/commands/input.c | 4 ++++ sway/commands/input/repeat.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 sway/commands/input/repeat.c (limited to 'sway/commands') diff --git a/sway/commands/input.c b/sway/commands/input.c index fa9cf05a..eeb4ee75 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c @@ -55,6 +55,10 @@ struct cmd_results *cmd_input(int argc, char **argv) { res = input_cmd_natural_scroll(argc_new, argv_new); } else if (strcasecmp("pointer_accel", argv[1]) == 0) { res = input_cmd_pointer_accel(argc_new, argv_new); + } else if (strcasecmp("repeat_delay", argv[1]) == 0) { + res = input_cmd_repeat_delay(argc_new, argv_new); + } else if (strcasecmp("repeat_rate", argv[1]) == 0) { + res = input_cmd_repeat_rate(argc_new, argv_new); } else if (strcasecmp("scroll_method", argv[1]) == 0) { res = input_cmd_scroll_method(argc_new, argv_new); } else if (strcasecmp("tap", argv[1]) == 0) { diff --git a/sway/commands/input/repeat.c b/sway/commands/input/repeat.c new file mode 100644 index 00000000..b2f6fa46 --- /dev/null +++ b/sway/commands/input/repeat.c @@ -0,0 +1,55 @@ +#include +#include +#include "sway/config.h" +#include "sway/commands.h" +#include "sway/input/input-manager.h" + +struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "repeat_delay", EXPECTED_EQUAL_TO, 1))) { + return error; + } + struct input_config *current_input_config = + config->handler_context.input_config; + if (!current_input_config) { + return cmd_results_new(CMD_FAILURE, + "repeat_delay", "No input device defined."); + } + struct input_config *new_config = + new_input_config(current_input_config->identifier); + + int repeat_delay = atoi(argv[0]); + if (repeat_delay < 0) { + return cmd_results_new(CMD_INVALID, "repeat_delay", + "Repeat delay cannot be negative"); + } + new_config->repeat_delay = repeat_delay; + + apply_input_config(new_config); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} + +struct cmd_results *input_cmd_repeat_rate(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "repeat_rate", EXPECTED_EQUAL_TO, 1))) { + return error; + } + struct input_config *current_input_config = + config->handler_context.input_config; + if (!current_input_config) { + return cmd_results_new(CMD_FAILURE, + "repeat_rate", "No input device defined."); + } + struct input_config *new_config = + new_input_config(current_input_config->identifier); + + int repeat_rate = atoi(argv[0]); + if (repeat_rate < 0) { + return cmd_results_new(CMD_INVALID, "repeat_rate", + "Repeat rate cannot be negative"); + } + new_config->repeat_rate = repeat_rate; + + apply_input_config(new_config); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} -- cgit v1.2.3-54-g00ecf From 9d3739a6f787edee185baa5e0746e72c07f9314f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Apr 2018 13:47:29 +1000 Subject: Split repeat commands into separate files. --- sway/commands/input/repeat.c | 55 -------------------------------------- sway/commands/input/repeat_delay.c | 30 +++++++++++++++++++++ sway/commands/input/repeat_rate.c | 30 +++++++++++++++++++++ sway/meson.build | 3 ++- 4 files changed, 62 insertions(+), 56 deletions(-) delete mode 100644 sway/commands/input/repeat.c create mode 100644 sway/commands/input/repeat_delay.c create mode 100644 sway/commands/input/repeat_rate.c (limited to 'sway/commands') diff --git a/sway/commands/input/repeat.c b/sway/commands/input/repeat.c deleted file mode 100644 index b2f6fa46..00000000 --- a/sway/commands/input/repeat.c +++ /dev/null @@ -1,55 +0,0 @@ -#include -#include -#include "sway/config.h" -#include "sway/commands.h" -#include "sway/input/input-manager.h" - -struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) { - struct cmd_results *error = NULL; - if ((error = checkarg(argc, "repeat_delay", EXPECTED_EQUAL_TO, 1))) { - return error; - } - struct input_config *current_input_config = - config->handler_context.input_config; - if (!current_input_config) { - return cmd_results_new(CMD_FAILURE, - "repeat_delay", "No input device defined."); - } - struct input_config *new_config = - new_input_config(current_input_config->identifier); - - int repeat_delay = atoi(argv[0]); - if (repeat_delay < 0) { - return cmd_results_new(CMD_INVALID, "repeat_delay", - "Repeat delay cannot be negative"); - } - new_config->repeat_delay = repeat_delay; - - apply_input_config(new_config); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); -} - -struct cmd_results *input_cmd_repeat_rate(int argc, char **argv) { - struct cmd_results *error = NULL; - if ((error = checkarg(argc, "repeat_rate", EXPECTED_EQUAL_TO, 1))) { - return error; - } - struct input_config *current_input_config = - config->handler_context.input_config; - if (!current_input_config) { - return cmd_results_new(CMD_FAILURE, - "repeat_rate", "No input device defined."); - } - struct input_config *new_config = - new_input_config(current_input_config->identifier); - - int repeat_rate = atoi(argv[0]); - if (repeat_rate < 0) { - return cmd_results_new(CMD_INVALID, "repeat_rate", - "Repeat rate cannot be negative"); - } - new_config->repeat_rate = repeat_rate; - - apply_input_config(new_config); - return cmd_results_new(CMD_SUCCESS, NULL, NULL); -} diff --git a/sway/commands/input/repeat_delay.c b/sway/commands/input/repeat_delay.c new file mode 100644 index 00000000..ce265841 --- /dev/null +++ b/sway/commands/input/repeat_delay.c @@ -0,0 +1,30 @@ +#include +#include +#include "sway/config.h" +#include "sway/commands.h" +#include "sway/input/input-manager.h" + +struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "repeat_delay", EXPECTED_EQUAL_TO, 1))) { + return error; + } + struct input_config *current_input_config = + config->handler_context.input_config; + if (!current_input_config) { + return cmd_results_new(CMD_FAILURE, + "repeat_delay", "No input device defined."); + } + struct input_config *new_config = + new_input_config(current_input_config->identifier); + + int repeat_delay = atoi(argv[0]); + if (repeat_delay < 0) { + return cmd_results_new(CMD_INVALID, "repeat_delay", + "Repeat delay cannot be negative"); + } + new_config->repeat_delay = repeat_delay; + + apply_input_config(new_config); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} diff --git a/sway/commands/input/repeat_rate.c b/sway/commands/input/repeat_rate.c new file mode 100644 index 00000000..f2ea2e69 --- /dev/null +++ b/sway/commands/input/repeat_rate.c @@ -0,0 +1,30 @@ +#include +#include +#include "sway/config.h" +#include "sway/commands.h" +#include "sway/input/input-manager.h" + +struct cmd_results *input_cmd_repeat_rate(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "repeat_rate", EXPECTED_EQUAL_TO, 1))) { + return error; + } + struct input_config *current_input_config = + config->handler_context.input_config; + if (!current_input_config) { + return cmd_results_new(CMD_FAILURE, + "repeat_rate", "No input device defined."); + } + struct input_config *new_config = + new_input_config(current_input_config->identifier); + + int repeat_rate = atoi(argv[0]); + if (repeat_rate < 0) { + return cmd_results_new(CMD_INVALID, "repeat_rate", + "Repeat rate cannot be negative"); + } + new_config->repeat_rate = repeat_rate; + + apply_input_config(new_config); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} diff --git a/sway/meson.build b/sway/meson.build index 7dfda254..4ceb07b4 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -90,7 +90,8 @@ sway_sources = files( 'commands/input/middle_emulation.c', 'commands/input/natural_scroll.c', 'commands/input/pointer_accel.c', - 'commands/input/repeat.c', + 'commands/input/repeat_delay.c', + 'commands/input/repeat_rate.c', 'commands/input/scroll_method.c', 'commands/input/tap.c', 'commands/input/xkb_layout.c', -- cgit v1.2.3-54-g00ecf