1 files changed, 11 insertions, 6 deletions

diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index 9e3ca2af..e7f03058 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -1,29 +1,34 @@
 #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_tap(int argc, char **argv) {
-        sway_log(L_DEBUG, "tap for device: %s", current_input_config->identifier);
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "tap", 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, "tap", "No input device defined.");
         }
-        struct input_config *new_config = new_input_config(current_input_config->identifier);
+        struct input_config *new_config =
+                new_input_config(current_input_config->identifier);
 
         if (strcasecmp(argv[0], "enabled") == 0) {
                 new_config->tap = LIBINPUT_CONFIG_TAP_ENABLED;
         } else if (strcasecmp(argv[0], "disabled") == 0) {
                 new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED;
         } else {
-                return cmd_results_new(CMD_INVALID, "tap", "Expected 'tap <enabled|disabled>'");
+                return cmd_results_new(CMD_INVALID, "tap",
+                        "Expected 'tap <enabled|disabled>'");
         }
 
-        sway_log(L_DEBUG, "apply-tap for device: %s", current_input_config->identifier);
-        input_cmd_apply(new_config);
+        wlr_log(L_DEBUG, "apply-tap for device: %s",
+                current_input_config->identifier);
+        apply_input_config(new_config);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }