From 48c684cbc2b08d55c9790f05ac340e1a38e8bec4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Sep 2019 14:50:08 +0000
Subject: [PATCH 1/2] Mouse formats don't work in copy mode so don't try to use
 them.

---
 format.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/format.c b/format.c
index b9f89bb5..581fa582 100644
--- a/format.c
+++ b/format.c
@@ -722,6 +722,8 @@ format_cb_mouse_word(struct format_tree *ft, struct format_entry *fe)
 	wp = cmd_mouse_pane(&ft->m, NULL, NULL);
 	if (wp == NULL)
 		return;
+	if (!TAILQ_EMPTY (&wp->modes))
+		return;
 	if (cmd_mouse_at(wp, &ft->m, &x, &y, 0) != 0)
 		return;
 	gd = wp->base.grid;
@@ -798,6 +800,8 @@ format_cb_mouse_line(struct format_tree *ft, struct format_entry *fe)
 	wp = cmd_mouse_pane(&ft->m, NULL, NULL);
 	if (wp == NULL)
 		return;
+	if (!TAILQ_EMPTY (&wp->modes))
+		return;
 	if (cmd_mouse_at(wp, &ft->m, &x, &y, 0) != 0)
 		return;
 	gd = wp->base.grid;

From e8adcae0f24c6089cae9c60e7b087a00a582f9f9 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Sep 2019 15:52:14 +0000
Subject: [PATCH 2/2] Couple of bits of minor cleanup.

---
 screen-write.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/screen-write.c b/screen-write.c
index 66053eaf..6c509e2c 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -100,7 +100,6 @@ void
 screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
     struct screen *s)
 {
-	char	tmp[32];
 	u_int	y;
 
 	memset(ctx, 0, sizeof *ctx);
@@ -119,12 +118,17 @@ screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
 	ctx->scrolled = 0;
 	ctx->bg = 8;
 
-	if (wp != NULL) {
-		snprintf(tmp, sizeof tmp, "pane %%%u (at %u,%u)", wp->id,
-		    wp->xoff, wp->yoff);
+	if (log_get_level() != 0) {
+		if (wp != NULL) {
+			log_debug("%s: size %ux%u, pane %%%u (at %u,%u)",
+			    __func__, screen_size_x(ctx->s),
+			    screen_size_y(ctx->s), wp->id, wp->xoff, wp->yoff);
+		} else {
+			log_debug("%s: size %ux%u, no pane",
+			    __func__, screen_size_x(ctx->s),
+			    screen_size_y(ctx->s));
+		}
 	}
-	log_debug("%s: size %ux%u, %s", __func__, screen_size_x(ctx->s),
-	    screen_size_y(ctx->s), wp == NULL ? "no pane" : tmp);
 }
 
 /* Finish writing. */
@@ -1234,7 +1238,6 @@ screen_write_collect_scroll(struct screen_write_ctx *ctx)
 	for (y = s->rupper; y < s->rlower; y++) {
 		cl = &ctx->list[y + 1];
 		TAILQ_CONCAT(&ctx->list[y].items, &cl->items, entry);
-		TAILQ_INIT(&cl->items);
 	}
 }