From c17edd594e8088d2355102a8ca58f4b256c59397 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 29 May 2019 19:34:42 +0000
Subject: The line number needs to be updated only after the \n is processed by
 the parser, so store a flag and update it next time around. Also each new
 line needs its own shared data.

---
 cmd-parse.y |  7 ++++++-
 cmd-queue.c | 28 ++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/cmd-parse.y b/cmd-parse.y
index 739ca56c..a235fde1 100644
--- a/cmd-parse.y
+++ b/cmd-parse.y
@@ -58,6 +58,7 @@ struct cmd_parse_state {
 	size_t				 len;
 	size_t				 off;
 
+	int				 eol;
 	int				 eof;
 	struct cmd_parse_input		*input;
 	u_int				 escapes;
@@ -933,6 +934,10 @@ yylex(void)
 	char			*token, *cp;
 	int			 ch, next;
 
+	if (ps->eol)
+		ps->input->line++;
+	ps->eol = 0;
+
 	for (;;) {
 		ch = yylex_getc();
 
@@ -959,7 +964,7 @@ yylex(void)
 			/*
 			 * End of line. Update the line number.
 			 */
-			ps->input->line++;
+			ps->eol = 1;
 			return ('\n');
 		}
 
diff --git a/cmd-queue.c b/cmd-queue.c
index f08d7c02..93dcaa53 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -203,16 +203,20 @@ cmdq_get_command(struct cmd_list *cmdlist, struct cmd_find_state *current,
 	struct cmdq_item	*item, *first = NULL, *last = NULL;
 	struct cmd		*cmd;
 	struct cmdq_shared	*shared;
-
-	shared = xcalloc(1, sizeof *shared);
-	if (current != NULL)
-		cmd_find_copy_state(&shared->current, current);
-	else
-		cmd_find_clear_state(&shared->current, 0);
-	if (m != NULL)
-		memcpy(&shared->mouse, m, sizeof shared->mouse);
+	u_int			 group = 0;
 
 	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
+		if (cmd->group != group) {
+			shared = xcalloc(1, sizeof *shared);
+			if (current != NULL)
+				cmd_find_copy_state(&shared->current, current);
+			else
+				cmd_find_clear_state(&shared->current, 0);
+			if (m != NULL)
+				memcpy(&shared->mouse, m, sizeof shared->mouse);
+			group = cmd->group;
+		}
+
 		item = xcalloc(1, sizeof *item);
 		xasprintf(&item->name, "[%s/%p]", cmd->entry->name, item);
 		item->type = CMDQ_COMMAND;
@@ -263,12 +267,20 @@ static enum cmd_retval
 cmdq_fire_command(struct cmdq_item *item)
 {
 	struct client		*c = item->client;
+	const char		*name = cmdq_name(c);
 	struct cmdq_shared	*shared = item->shared;
 	struct cmd		*cmd = item->cmd;
 	const struct cmd_entry	*entry = cmd->entry;
 	enum cmd_retval		 retval;
 	struct cmd_find_state	*fsp, fs;
 	int			 flags;
+	char			*tmp;
+
+	if (log_get_level() > 1) {
+		tmp = cmd_print(cmd);
+		log_debug("%s %s: (%u) %s", __func__, name, item->group, tmp);
+		free(tmp);
+	}
 
 	flags = !!(shared->flags & CMDQ_SHARED_CONTROL);
 	cmdq_guard(item, "begin", flags);
-- 
cgit v1.2.3


From 7dced376737ef685e09fd5a49161ca2bf423e91b Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 29 May 2019 20:05:14 +0000
Subject: Use VIS_CSTYLE for the arguments and add the missing escapes it can
 generate to the parser.

---
 arguments.c     |  2 +-
 cmd-parse.y     | 15 +++++++++++++++
 tty-term.c      |  2 +-
 window-buffer.c |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/arguments.c b/arguments.c
index 54bc3593..8e049aab 100644
--- a/arguments.c
+++ b/arguments.c
@@ -218,7 +218,7 @@ args_escape(const char *s)
 		return (escaped);
 	}
 
-	flags = VIS_OCTAL|VIS_TAB|VIS_NL;
+	flags = VIS_OCTAL|VIS_CSTYLE|VIS_TAB|VIS_NL;
 	if (s[strcspn(s, quoted)] != '\0')
 		flags |= VIS_DQ;
 	utf8_stravis(&escaped, s, flags);
diff --git a/cmd-parse.y b/cmd-parse.y
index a235fde1..a623caa5 100644
--- a/cmd-parse.y
+++ b/cmd-parse.y
@@ -1118,9 +1118,24 @@ yylex_token_escape(char **buf, size_t *len)
 	switch (ch) {
 	case EOF:
 		return (0);
+	case 'a':
+		ch = '\a';
+		break;
+	case 'b':
+		ch = '\b';
+		break;
 	case 'e':
 		ch = '\033';
 		break;
+	case 'f':
+		ch = '\f';
+		break;
+	case 's':
+		ch = ' ';
+		break;
+	case 'v':
+		ch = '\v';
+		break;
 	case 'r':
 		ch = '\r';
 		break;
diff --git a/tty-term.c b/tty-term.c
index 45934afa..83bfcdc1 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -685,7 +685,7 @@ tty_term_describe(struct tty_term *term, enum tty_code_code code)
 		break;
 	case TTYCODE_STRING:
 		strnvis(out, term->codes[code].value.string, sizeof out,
-		    VIS_OCTAL|VIS_TAB|VIS_NL);
+		    VIS_OCTAL|VIS_CSTYLE|VIS_TAB|VIS_NL);
 		xsnprintf(s, sizeof s, "%4u: %s: (string) %s",
 		    code, tty_term_codes[code].name,
 		    out);
diff --git a/window-buffer.c b/window-buffer.c
index 79dacf97..983b1680 100644
--- a/window-buffer.c
+++ b/window-buffer.c
@@ -246,7 +246,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata,
 		at = 0;
 		while (end != pdata + psize && *end != '\n') {
 			if ((sizeof line) - at > 5) {
-				cp = vis(line + at, *end, VIS_TAB|VIS_OCTAL, 0);
+				cp = vis(line + at, *end, VIS_OCTAL|VIS_TAB, 0);
 				at = cp - line;
 			}
 			end++;
-- 
cgit v1.2.3