1 files changed, 15 insertions, 7 deletions

diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 9d54287a..2217f5ce 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -1,30 +1,38 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input.h"
+#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_events(int argc, char **argv) {
-        sway_log(L_DEBUG, "events for device: %s", current_input_config->identifier);
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "events", 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, "events", "No input device defined.");
+                return cmd_results_new(CMD_FAILURE, "events",
+                        "No input device defined.");
         }
-        struct input_config *new_config = new_input_config(current_input_config->identifier);
+        wlr_log(L_DEBUG, "events for device: %s",
+                current_input_config->identifier);
+        struct input_config *new_config =
+                new_input_config(current_input_config->identifier);
 
         if (strcasecmp(argv[0], "enabled") == 0) {
                 new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
         } else if (strcasecmp(argv[0], "disabled") == 0) {
                 new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
         } else if (strcasecmp(argv[0], "disabled_on_external_mouse") == 0) {
-                new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
+                new_config->send_events =
+                        LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
         } else {
-                return cmd_results_new(CMD_INVALID, "events", "Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
+                return cmd_results_new(CMD_INVALID, "events",
+                        "Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
         }
 
-        input_cmd_apply(new_config);
+        apply_input_config(new_config);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }