5 files changed, 72 insertions, 0 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index f53d335a..41858ccc 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -213,8 +213,10 @@ sway_cmd input_cmd_scroll_button;
 sway_cmd input_cmd_scroll_method;
 sway_cmd input_cmd_tap;
 sway_cmd input_cmd_tap_button_map;
+sway_cmd input_cmd_xkb_capslock;
 sway_cmd input_cmd_xkb_layout;
 sway_cmd input_cmd_xkb_model;
+sway_cmd input_cmd_xkb_numlock;
 sway_cmd input_cmd_xkb_options;
 sway_cmd input_cmd_xkb_rules;
 sway_cmd input_cmd_xkb_variant;
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 5b203ea0..7f927073 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -24,8 +24,10 @@ static struct cmd_handler input_handlers[] = {
         { "scroll_method", input_cmd_scroll_method },
         { "tap", input_cmd_tap },
         { "tap_button_map", input_cmd_tap_button_map },
+        { "xkb_capslock", input_cmd_xkb_capslock },
         { "xkb_layout", input_cmd_xkb_layout },
         { "xkb_model", input_cmd_xkb_model },
+        { "xkb_numlock", input_cmd_xkb_numlock },
         { "xkb_options", input_cmd_xkb_options },
         { "xkb_rules", input_cmd_xkb_rules },
         { "xkb_variant", input_cmd_xkb_variant },
diff --git a/sway/commands/input/xkb_capslock.c b/sway/commands/input/xkb_capslock.c
new file mode 100644
index 00000000..5442c463
--- /dev/null
+++ b/sway/commands/input/xkb_capslock.c
@@ -0,0 +1,33 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_xkb_capslock(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "xkb_capslock", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *current_input_config =
+                config->handler_context.input_config;
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "xkb_capslock", 
+                        "No input device defined.");
+        }
+        struct input_config *new_config =
+                new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "enabled") == 0) {
+                new_config->xkb_capslock = 1;
+        } else if (strcasecmp(argv[0], "disabled") == 0) {
+                new_config->xkb_capslock = 0; 
+        } else {
+                free_input_config(new_config);
+                return cmd_results_new(CMD_INVALID, "xkb_capslock",
+                        "Expected 'xkb_capslock <enabled|disabled>'");
+        }
+
+        apply_input_config(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/xkb_numlock.c b/sway/commands/input/xkb_numlock.c
new file mode 100644
index 00000000..39675366
--- /dev/null
+++ b/sway/commands/input/xkb_numlock.c
@@ -0,0 +1,33 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_xkb_numlock(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "xkb_numlock", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *current_input_config =
+                config->handler_context.input_config;
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "xkb_numlock", 
+                        "No input device defined.");
+        }
+        struct input_config *new_config =
+                new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "enabled") == 0) {
+                new_config->xkb_numlock = 1;
+        } else if (strcasecmp(argv[0], "disabled") == 0) {
+                new_config->xkb_numlock = 0; 
+        } else {
+                free_input_config(new_config);
+                return cmd_results_new(CMD_INVALID, "xkb_numlock",
+                        "Expected 'xkb_numlock <enabled|disabled>'");
+        }
+
+        apply_input_config(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/meson.build b/sway/meson.build
index 649a3ac2..d92bb905 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -128,8 +128,10 @@ sway_sources = files(
         'commands/input/scroll_method.c',
         'commands/input/tap.c',
         'commands/input/tap_button_map.c',
+        'commands/input/xkb_capslock.c',
         'commands/input/xkb_layout.c',
         'commands/input/xkb_model.c',
+        'commands/input/xkb_numlock.c',
         'commands/input/xkb_options.c',
         'commands/input/xkb_rules.c',
         'commands/input/xkb_variant.c',