From aba44380137b5d78f9033e46b5dc4a4f3ef1012a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 6 Jun 2016 07:28:52 +0000
Subject: [PATCH] Cache selected state so that cells going from selected to
 unselected are not skipped, reported by Omar Sandoval.

---
 screen-write.c | 20 +++++++++++++-------
 tmux.h         |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/screen-write.c b/screen-write.c
index 0341f0ad..48af1383 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -989,8 +989,19 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 	if (skip)
 		skip = (memcmp(&now_gc, gc, sizeof now_gc) == 0);
 
-	/* Set the cell. */
-	if (!skip)
+	/* Update the selection the flag and set the cell. */
+	selected = screen_check_selection(s, s->cx, s->cy);
+	if (selected && ~gc->flags & GRID_FLAG_SELECTED) {
+		skip = 0;
+		memcpy(&tmp_gc, gc, sizeof tmp_gc);
+		tmp_gc.flags |= GRID_FLAG_SELECTED;
+		grid_view_set_cell(gd, s->cx, s->cy, &tmp_gc);
+	} else if (!selected && gc->flags & GRID_FLAG_SELECTED) {
+		skip = 0;
+		memcpy(&tmp_gc, gc, sizeof tmp_gc);
+		tmp_gc.flags &= ~GRID_FLAG_SELECTED;
+		grid_view_set_cell(gd, s->cx, s->cy, &tmp_gc);
+	} else if (!skip)
 		grid_view_set_cell(gd, s->cx, s->cy, gc);
 
 	/*
@@ -1009,11 +1020,6 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 		tty_write(tty_cmd_insertcharacter, &ttyctx);
 	}
 
-	/* Check if this is selected. */
-	selected = screen_check_selection(s, s->cx - width, s->cy);
-	if (selected)
-		skip = 0;
-
 	/* Save last cell if it will be needed. */
 	if (!skip && ctx->wp != NULL && ttyctx.ocx > ctx->wp->sx - width)
 		screen_write_save_last(ctx, &ttyctx);
diff --git a/tmux.h b/tmux.h
index 5422c8eb..b8d1a1f5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -642,6 +642,7 @@ enum utf8_state {
 #define GRID_FLAG_EXTENDED 0x8
 #define GRID_FLAG_FGRGB 0x10
 #define GRID_FLAG_BGRGB 0x20
+#define GRID_FLAG_SELECTED 0x40
 
 /* Grid line flags. */
 #define GRID_LINE_WRAPPED 0x1