refactor commands.c

10 files changed, 265 insertions, 0 deletions

diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
new file mode 100644
index 00000000..bfc3c76d
--- /dev/null
+++ b/sway/commands/input/accel_profile.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include "commands.h"
+#include "input.h"
+
+struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "accel_profile", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "accel_profile", "No input device defined.");
+        }
+        struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "adaptive") == 0) {
+                new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
+        } else if (strcasecmp(argv[0], "flat") == 0) {
+                new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT;
+        } else {
+                return cmd_results_new(CMD_INVALID, "accel_profile",
+                                "Expected 'accel_profile <adaptive|flat>'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
new file mode 100644
index 00000000..2001acf2
--- /dev/null
+++ b/sway/commands/input/click_method.c
@@ -0,0 +1,29 @@
+#include <string.h>
+#include "commands.h"
+#include "input.h"
+#include "log.h"
+
+struct cmd_results *input_cmd_click_method(int argc, char **argv) {
+        sway_log(L_DEBUG, "click_method for device:  %d %s", current_input_config==NULL, current_input_config->identifier);
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "click_method", "No input device defined.");
+        }
+        struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "none") == 0) {
+                new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE;
+        } else if (strcasecmp(argv[0], "button_areas") == 0) {
+                new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
+        } else if (strcasecmp(argv[0], "clickfinger") == 0) {
+                new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
+        } else {
+                return cmd_results_new(CMD_INVALID, "click_method", "Expected 'click_method <none|button_areas|clickfinger'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
new file mode 100644
index 00000000..7bb2e334
--- /dev/null
+++ b/sway/commands/input/drag_lock.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include "commands.h"
+#include "input.h"
+
+struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "drag_lock", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "drag_lock", "No input device defined.");
+        }
+        struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "enabled") == 0) {
+                new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_ENABLED;
+        } else if (strcasecmp(argv[0], "disabled") == 0) {
+                new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED;
+        } else {
+                return cmd_results_new(CMD_INVALID, "drag_lock", "Expected 'drag_lock <enabled|disabled>'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
new file mode 100644
index 00000000..4010126d
--- /dev/null
+++ b/sway/commands/input/dwt.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include "commands.h"
+#include "input.h"
+
+struct cmd_results *input_cmd_dwt(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "dwt", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "dwt", "No input device defined.");
+        }
+        struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "enabled") == 0) {
+                new_config->dwt = LIBINPUT_CONFIG_DWT_ENABLED;
+        } else if (strcasecmp(argv[0], "disabled") == 0) {
+                new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED;
+        } else {
+                return cmd_results_new(CMD_INVALID, "dwt", "Expected 'dwt <enabled|disabled>'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
new file mode 100644
index 00000000..9bf9aa95
--- /dev/null
+++ b/sway/commands/input/events.c
@@ -0,0 +1,29 @@
+#include <string.h>
+#include "commands.h"
+#include "input.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;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "events", "No input device defined.");
+        }
+        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;
+        } else {
+                return cmd_results_new(CMD_INVALID, "events", "Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
new file mode 100644
index 00000000..e3087f3a
--- /dev/null
+++ b/sway/commands/input/middle_emulation.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include "commands.h"
+#include "input.h"
+
+struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "middle_emulation", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "middle_emulation", "No input device defined.");
+        }
+        struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "enabled") == 0) {
+                new_config->middle_emulation = LIBINPUT_CONFIG_MIDDLE_EMULATION_ENABLED;
+        } else if (strcasecmp(argv[0], "disabled") == 0) {
+                new_config->middle_emulation = LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED;
+        } else {
+                return cmd_results_new(CMD_INVALID, "middle_emulation", "Expected 'middle_emulation <enabled|disabled>'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
new file mode 100644
index 00000000..393f26a0
--- /dev/null
+++ b/sway/commands/input/natural_scroll.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include "commands.h"
+#include "input.h"
+
+struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "natural_scroll", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "natural_scoll", "No input device defined.");
+        }
+        struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+        if (strcasecmp(argv[0], "enabled") == 0) {
+                new_config->natural_scroll = 1;
+        } else if (strcasecmp(argv[0], "disabled") == 0) {
+                new_config->natural_scroll = 0;
+        } else {
+                return cmd_results_new(CMD_INVALID, "natural_scroll", "Expected 'natural_scroll <enabled|disabled>'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
new file mode 100644
index 00000000..e22c51c1
--- /dev/null
+++ b/sway/commands/input/pointer_accel.c
@@ -0,0 +1,24 @@
+#include <stdlib.h>
+#include <string.h>
+#include "commands.h"
+#include "input.h"
+
+struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "pointer_accel", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "pointer_accel", "No input device defined.");
+        }
+        struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+        float pointer_accel = atof(argv[0]);
+        if (pointer_accel < -1 || pointer_accel > 1) {
+                return cmd_results_new(CMD_INVALID, "pointer_accel", "Input out of range [-1, 1]");
+        }
+        new_config->pointer_accel = pointer_accel;
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
new file mode 100644
index 00000000..8e900a26
--- /dev/null
+++ b/sway/commands/input/scroll_method.c
@@ -0,0 +1,29 @@
+#include <string.h>
+#include "commands.h"
+#include "input.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;
+        }
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "scroll_method", "No input device defined.");
+        }
+        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;
+        } else if (strcasecmp(argv[0], "two_finger") == 0) {
+                new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
+        } else if (strcasecmp(argv[0], "edge") == 0) {
+                new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
+        } 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>'");
+        }
+
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
new file mode 100644
index 00000000..8180dcea
--- /dev/null
+++ b/sway/commands/input/tap.c
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "commands.h"
+#include "input.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;
+        }
+        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);
+
+        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>'");
+        }
+
+        sway_log(L_DEBUG, "apply-tap for device: %s", current_input_config->identifier);
+        input_cmd_apply(new_config);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}