1 files changed, 16 insertions, 11 deletions

diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index f6e58d99..979e178f 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -8,6 +8,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/ipc-server.h"
@@ -46,7 +47,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) !=
@@ -126,7 +127,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 {
@@ -142,7 +143,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 {
@@ -181,7 +182,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) {
@@ -371,6 +372,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) {
@@ -537,7 +539,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;
@@ -547,20 +549,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);
 
@@ -642,6 +645,8 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
         if (success) {
                 ipc_event_binding(binding);
         }
+
+        transaction_commit_dirty();
 }
 
 /**