Add a way for lines added to copy mode to be passed through the parser

to handle escape sequences and use it for run-shell, GitHub issue 3156.

diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c
index b0dd370..34bae6b 100644 (file)
--- a/usr.bin/tmux/cfg.c
+++ b/usr.bin/tmux/cfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfg.c,v 1.84 2021/08/21 17:25:32 nicm Exp $ */
+/* $OpenBSD: cfg.c,v 1.85 2022/05/30 13:00:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -251,7 +251,7 @@ cfg_show_causes(struct session *s)
        if (wme == NULL || wme->mode != &window_view_mode)
                window_pane_set_mode(wp, NULL, &window_view_mode, NULL, NULL);
        for (i = 0; i < cfg_ncauses; i++) {
-               window_copy_add(wp, "%s", cfg_causes[i]);
+               window_copy_add(wp, 0, "%s", cfg_causes[i]);
                free(cfg_causes[i]);
        }
 

diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c
index 15c4f7f..b63d2a8 100644 (file)
--- a/usr.bin/tmux/cmd-queue.c
+++ b/usr.bin/tmux/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.109 2022/05/30 12:55:25 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.110 2022/05/30 13:00:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -856,7 +856,7 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...)
                        window_pane_set_mode(wp, NULL, &window_view_mode, NULL,
                            NULL);
                }
-               window_copy_add(wp, "%s", msg);
+               window_copy_add(wp, 0, "%s", msg);
        }
 
        free(msg);

diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c
index 0dfa8c4..2d4d4b8 100644 (file)
--- a/usr.bin/tmux/cmd-run-shell.c
+++ b/usr.bin/tmux/cmd-run-shell.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-run-shell.c,v 1.82 2021/10/11 10:55:30 nicm Exp $ */
+/* $OpenBSD: cmd-run-shell.c,v 1.83 2022/05/30 13:00:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -84,22 +84,17 @@ cmd_run_shell_print(struct job *job, const char *msg)
 
        if (cdata->wp_id != -1)
                wp = window_pane_find_by_id(cdata->wp_id);
-       if (wp == NULL) {
-               if (cdata->item != NULL) {
-                       cmdq_print(cdata->item, "%s", msg);
-                       return;
-               }
-               if (cmd_find_from_nothing(&fs, 0) != 0)
-                       return;
+       if (wp == NULL && cdata->item != NULL)
+               wp = server_client_get_pane(cdata->client);
+       if (wp == NULL && cmd_find_from_nothing(&fs, 0) == 0)
                wp = fs.wp;
-               if (wp == NULL)
-                       return;
-       }
+       if (wp == NULL)
+               return;
 
        wme = TAILQ_FIRST(&wp->modes);
        if (wme == NULL || wme->mode != &window_view_mode)
                window_pane_set_mode(wp, NULL, &window_view_mode, NULL, NULL);
-       window_copy_add(wp, "%s", msg);
+       window_copy_add(wp, 1, "%s", msg);
 }
 
 static enum cmd_retval
@@ -227,7 +222,8 @@ cmd_run_shell_callback(struct job *job)
        int                              retcode, status;
 
        do {
-               if ((line = evbuffer_readline(event->input)) != NULL) {
+               line = evbuffer_readln(event->input, NULL, EVBUFFER_EOL_LF);
+               if (line != NULL) {
                        cmd_run_shell_print(job, line);
                        free(line);
                }

diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c
index 8f3d04e..0724c8f 100644 (file)
--- a/usr.bin/tmux/input.c
+++ b/usr.bin/tmux/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.201 2022/05/30 12:51:27 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.202 2022/05/30 13:00:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1078,6 +1078,9 @@ input_reply(struct input_ctx *ictx, const char *fmt, ...)
        va_list                  ap;
        char                    *reply;
 
+       if (bev == NULL)
+               return;
+
        va_start(ap, fmt);
        xvasprintf(&reply, fmt, ap);
        va_end(ap);

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index a54dc95..1bbc4a4 100644 (file)
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1168 2022/05/30 12:52:02 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1169 2022/05/30 13:00:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -3083,8 +3083,9 @@ extern const struct window_mode window_client_mode;
 /* window-copy.c */
 extern const struct window_mode window_copy_mode;
 extern const struct window_mode window_view_mode;
-void printflike(2, 3) window_copy_add(struct window_pane *, const char *, ...);
-void printflike(2, 0) window_copy_vadd(struct window_pane *, const char *,
+void printflike(3, 4) window_copy_add(struct window_pane *, int, const char *,
+                    ...);
+void printflike(3, 0) window_copy_vadd(struct window_pane *, int, const char *,
                     va_list);
 void            window_copy_pageup(struct window_pane *, int);
 void            window_copy_start_drag(struct client *, struct mouse_event *);

diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c
index 416d62c..63511f8 100644 (file)
--- a/usr.bin/tmux/window-copy.c
+++ b/usr.bin/tmux/window-copy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.333 2022/02/03 07:26:43 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.334 2022/05/30 13:00:19 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -222,6 +222,8 @@ struct window_copy_mode_data {
 
        struct screen   *backing;
        int              backing_written; /* backing display started */
+       struct screen   *writing;
+       struct input_ctx *ictx;
 
        int              viewmode;      /* view mode entered */
 
@@ -467,13 +469,16 @@ window_copy_view_init(struct window_mode_entry *wme,
        struct window_pane              *wp = wme->wp;
        struct window_copy_mode_data    *data;
        struct screen                   *base = &wp->base;
-       struct screen                   *s;
+       u_int                            sx = screen_size_x(base);
 
        data = window_copy_common_init(wme);
        data->viewmode = 1;
 
-       data->backing = s = xmalloc(sizeof *data->backing);
-       screen_init(s, screen_size_x(base), screen_size_y(base), UINT_MAX);
+       data->backing = xmalloc(sizeof *data->backing);
+       screen_init(data->backing, sx, screen_size_y(base), UINT_MAX);
+       data->writing = xmalloc(sizeof *data->writing);
+       screen_init(data->writing, sx, screen_size_y(base), 0);
+       data->ictx = input_init(NULL, NULL, NULL);
        data->mx = data->cx;
        data->my = screen_hsize(data->backing) + data->cy - data->oy;
        data->showmark = 0;
@@ -492,6 +497,12 @@ window_copy_free(struct window_mode_entry *wme)
        free(data->searchstr);
        free(data->jumpchar);
 
+       if (data->writing != NULL) {
+               screen_free(data->writing);
+               free(data->writing);
+       }
+       if (data->ictx != NULL)
+               input_free(data->ictx);
        screen_free(data->backing);
        free(data->backing);
 
@@ -500,41 +511,67 @@ window_copy_free(struct window_mode_entry *wme)
 }
 
 void
-window_copy_add(struct window_pane *wp, const char *fmt, ...)
+window_copy_add(struct window_pane *wp, int parse, const char *fmt, ...)
 {
        va_list ap;
 
        va_start(ap, fmt);
-       window_copy_vadd(wp, fmt, ap);
+       window_copy_vadd(wp, parse, fmt, ap);
        va_end(ap);
 }
 
+static void
+window_copy_init_ctx_cb(__unused struct screen_write_ctx *ctx,
+    struct tty_ctx *ttyctx)
+{
+       memcpy(&ttyctx->defaults, &grid_default_cell, sizeof ttyctx->defaults);
+       ttyctx->palette = NULL;
+       ttyctx->redraw_cb = NULL;
+       ttyctx->set_client_cb = NULL;
+       ttyctx->arg = NULL;
+}
+
 void
-window_copy_vadd(struct window_pane *wp, const char *fmt, va_list ap)
+window_copy_vadd(struct window_pane *wp, int parse, const char *fmt, va_list ap)
 {
        struct window_mode_entry        *wme = TAILQ_FIRST(&wp->modes);
        struct window_copy_mode_data    *data = wme->data;
        struct screen                   *backing = data->backing;
-       struct screen_write_ctx          back_ctx, ctx;
+       struct screen                   *writing = data->writing;
+       struct screen_write_ctx          writing_ctx, backing_ctx, ctx;
        struct grid_cell                 gc;
        u_int                            old_hsize, old_cy;
+       u_int                            sx = screen_size_x(backing);
+       char                            *text;
 
-       memcpy(&gc, &grid_default_cell, sizeof gc);
+       if (parse) {
+               vasprintf(&text, fmt, ap);
+               screen_write_start(&writing_ctx, writing);
+               screen_write_reset(&writing_ctx);
+               input_parse_screen(data->ictx, writing, window_copy_init_ctx_cb,
+                   data, text, strlen(text));
+               free(text);
+       }
 
        old_hsize = screen_hsize(data->backing);
-       screen_write_start(&back_ctx, backing);
+       screen_write_start(&backing_ctx, backing);
        if (data->backing_written) {
                /*
                 * On the second or later line, do a CRLF before writing
                 * (so it's on a new line).
                 */
-               screen_write_carriagereturn(&back_ctx);
-               screen_write_linefeed(&back_ctx, 0, 8);
+               screen_write_carriagereturn(&backing_ctx);
+               screen_write_linefeed(&backing_ctx, 0, 8);
        } else
                data->backing_written = 1;
        old_cy = backing->cy;
-       screen_write_vnputs(&back_ctx, 0, &gc, fmt, ap);
-       screen_write_stop(&back_ctx);
+       if (parse)
+               screen_write_fast_copy(&backing_ctx, writing, 0, 0, sx, 1);
+       else {
+               memcpy(&gc, &grid_default_cell, sizeof gc);
+               screen_write_vnputs(&backing_ctx, 0, &gc, fmt, ap);
+       }
+       screen_write_stop(&backing_ctx);
 
        data->oy += screen_hsize(data->backing) - old_hsize;