1 files changed, 11 insertions, 5 deletions

diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
index 5c6c3d7a..0a1c57ac 100644
--- a/sway/commands/input/scroll_method.c
+++ b/sway/commands/input/scroll_method.c
@@ -1,17 +1,22 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "scroll_method", 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, "scroll_method", "No input device defined.");
+                return cmd_results_new(CMD_FAILURE, "scroll_method",
+                        "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], "none") == 0) {
                 new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
@@ -22,9 +27,10 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
         } else if (strcasecmp(argv[0], "on_button_down") == 0) {
                 new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
         } else {
-                return cmd_results_new(CMD_INVALID, "scroll_method", "Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
+                return cmd_results_new(CMD_INVALID, "scroll_method",
+                        "Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
         }
 
-        input_cmd_apply(new_config);
+        apply_input_config(new_config);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }