From adb76fd1ce8753a958d4ffe14db724f9f4d674ea Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 14:46:04 +0000
Subject: Move cmdq_state into cmd-queue.c.

---
 key-bindings.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'key-bindings.c')

diff --git a/key-bindings.c b/key-bindings.c
index 04a5cef7..13caa889 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -535,10 +535,10 @@ key_bindings_read_only(struct cmdq_item *item, __unused void *data)
 
 struct cmdq_item *
 key_bindings_dispatch(struct key_binding *bd, struct cmdq_item *item,
-    struct client *c, struct mouse_event *m, struct cmd_find_state *fs)
+    struct client *c, struct key_event *event, struct cmd_find_state *fs)
 {
 	struct cmdq_item	*new_item;
-	int			 readonly;
+	int			 readonly, flags = 0;
 
 	if (c == NULL || (~c->flags & CLIENT_READONLY))
 		readonly = 1;
@@ -547,9 +547,9 @@ key_bindings_dispatch(struct key_binding *bd, struct cmdq_item *item,
 	if (!readonly)
 		new_item = cmdq_get_callback(key_bindings_read_only, NULL);
 	else {
-		new_item = cmdq_get_command(bd->cmdlist, fs, m, 0);
 		if (bd->flags & KEY_BINDING_REPEAT)
-			cmdq_get_state(new_item)->flags |= CMDQ_STATE_REPEAT;
+			flags |= CMDQ_STATE_REPEAT;
+		new_item = cmdq_get_command(bd->cmdlist, fs, event, flags);
 	}
 	if (item != NULL)
 		new_item = cmdq_insert_after(item, new_item);
-- 
cgit 


From 3f86d6d46014ca55e42cecd570d7f269b1d386b3 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 15:55:51 +0000
Subject: When adding a list of commands to the queue, instead of automatically
 creating a new state for each group of commands, require the caller to create
 one and use it for all the commands in the list. This means the current
 target works even with list with multiple groups (which can happen if they
 are defined with newlines).

---
 key-bindings.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'key-bindings.c')

diff --git a/key-bindings.c b/key-bindings.c
index 13caa889..09f0e0b1 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -521,7 +521,7 @@ key_bindings_init(void)
 		pr = cmd_parse_from_string(defaults[i], NULL);
 		if (pr->status != CMD_PARSE_SUCCESS)
 			fatalx("bad default key: %s", defaults[i]);
-		cmdq_append(NULL, cmdq_get_command(pr->cmdlist, NULL, NULL, 0));
+		cmdq_append(NULL, cmdq_get_command(pr->cmdlist, NULL));
 		cmd_list_free(pr->cmdlist);
 	}
 }
@@ -538,6 +538,7 @@ key_bindings_dispatch(struct key_binding *bd, struct cmdq_item *item,
     struct client *c, struct key_event *event, struct cmd_find_state *fs)
 {
 	struct cmdq_item	*new_item;
+	struct cmdq_state	*new_state;
 	int			 readonly, flags = 0;
 
 	if (c == NULL || (~c->flags & CLIENT_READONLY))
@@ -549,7 +550,9 @@ key_bindings_dispatch(struct key_binding *bd, struct cmdq_item *item,
 	else {
 		if (bd->flags & KEY_BINDING_REPEAT)
 			flags |= CMDQ_STATE_REPEAT;
-		new_item = cmdq_get_command(bd->cmdlist, fs, event, flags);
+		new_state = cmdq_new_state(fs, event, flags);
+		new_item = cmdq_get_command(bd->cmdlist, new_state);
+		cmdq_free_state(new_state);
 	}
 	if (item != NULL)
 		new_item = cmdq_insert_after(item, new_item);
-- 
cgit