From 9d3739a6f787edee185baa5e0746e72c07f9314f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Apr 2018 13:47:29 +1000 Subject: [PATCH] Split repeat commands into separate files. --- .../input/{repeat.c => repeat_delay.c} | 25 ---------------- sway/commands/input/repeat_rate.c | 30 +++++++++++++++++++ sway/meson.build | 3 +- 3 files changed, 32 insertions(+), 26 deletions(-) rename sway/commands/input/{repeat.c => repeat_delay.c} (54%) create mode 100644 sway/commands/input/repeat_rate.c diff --git a/sway/commands/input/repeat.c b/sway/commands/input/repeat_delay.c similarity index 54% rename from sway/commands/input/repeat.c rename to sway/commands/input/repeat_delay.c index b2f6fa46..ce265841 100644 --- a/sway/commands/input/repeat.c +++ b/sway/commands/input/repeat_delay.c @@ -28,28 +28,3 @@ struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) { 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_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',