Merge branch 'master' into fullscreen

3 files changed, 64 insertions, 0 deletions

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_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 <stdlib.h>
+#include <string.h>
+#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 <stdlib.h>
+#include <string.h>
+#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);
+}