1 files changed, 13 insertions, 12 deletions

diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 4c67b3ce..268f2855 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <string.h>
@@ -47,7 +46,7 @@ static bool binding_switch_compare(struct sway_switch_binding *binding_a,
         if (binding_a->type != binding_b->type) {
                 return false;
         }
-        if (binding_a->state != binding_b->state) {
+        if (binding_a->trigger != binding_b->trigger) {
                 return false;
         }
         if ((binding_a->flags & BINDING_LOCKED) !=
@@ -127,7 +126,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                 if (!button) {
                         if (message) {
                                 struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                 free(message);
                                 return error;
                         } else {
@@ -143,7 +142,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                 if (!button) {
                         if (message) {
                                 struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                 free(message);
                                 return error;
                         } else {
@@ -182,7 +181,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                         uint32_t button = get_mouse_bindsym(name, &message);
                         if (message) {
                                 struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                 free(message);
                                 return error;
                         } else if (button) {
@@ -372,6 +371,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
                                         strlen("--input-device=")) == 0) {
                         free(binding->input);
                         binding->input = strdup(argv[0] + strlen("--input-device="));
+                        strip_quotes(binding->input);
                 } else if (strcmp("--no-warn", argv[0]) == 0) {
                         warn = false;
                 } else if (strcmp("--no-repeat", argv[0]) == 0) {
@@ -538,7 +538,7 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
                 free_switch_binding(binding);
                 return cmd_results_new(CMD_FAILURE,
                                 "Invalid %s command (expected binding with the form "
-                                "<switch>:<state>)", bindtype, argc);
+                                "<switch>:<state>)", bindtype);
         }
         if (strcmp(split->items[0], "tablet") == 0) {
                 binding->type = WLR_SWITCH_TYPE_TABLET_MODE;
@@ -548,20 +548,21 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
                 free_switch_binding(binding);
                 return cmd_results_new(CMD_FAILURE,
                                 "Invalid %s command (expected switch binding: "
-                                "unknown switch %s)", bindtype, split->items[0]);
+                                "unknown switch %s)", bindtype,
+                                (const char *)split->items[0]);
         }
         if (strcmp(split->items[1], "on") == 0) {
-                binding->state = WLR_SWITCH_STATE_ON;
+                binding->trigger = SWAY_SWITCH_TRIGGER_ON;
         } else if (strcmp(split->items[1], "off") == 0) {
-                binding->state = WLR_SWITCH_STATE_OFF;
+                binding->trigger = SWAY_SWITCH_TRIGGER_OFF;
         } else if (strcmp(split->items[1], "toggle") == 0) {
-                binding->state = WLR_SWITCH_STATE_TOGGLE;
+                binding->trigger = SWAY_SWITCH_TRIGGER_TOGGLE;
         } else {
                 free_switch_binding(binding);
                 return cmd_results_new(CMD_FAILURE,
                                 "Invalid %s command "
-                                "(expected switch state: unknown state %d)",
-                                bindtype, split->items[0]);
+                                "(expected switch state: unknown state %s)",
+                                bindtype, (const char *)split->items[1]);
         }
         list_free_items_and_destroy(split);