From fc65da1eed07708030c0ae491cb8f4a6614de390 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Mon, 27 Jul 2009 11:33:21 +0000
Subject: [PATCH] Draw UTF-8 characters under the selection correctly.

---
 screen-write.c | 22 ++++++++++++----------
 tty.c          |  7 +++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/screen-write.c b/screen-write.c
index e2fbfbf4..449c3a35 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -723,7 +723,7 @@ screen_write_cell(
 	struct tty_ctx		 ttyctx;
 	struct grid_utf8	 gu, *tmp_gu;
 	u_int		 	 width, xx, i;
-	struct grid_cell 	 tmp_gc, *tmp_gc2;
+	struct grid_cell 	 tmp_gc, tmp_gc2, *tmp_gcp;
 	int			 insert = 0;
 
 	/* Ignore padding. */
@@ -743,11 +743,11 @@ screen_write_cell(
 	if (width == 0) {
 		if (s->cx == 0)
 			return;
-		tmp_gc2 = grid_view_get_cell(gd, s->cx - 1, s->cy);
-		if (!(tmp_gc2->flags & GRID_FLAG_UTF8)) {
-			tmp_gc2->flags |= GRID_FLAG_UTF8;
+		tmp_gcp = grid_view_get_cell(gd, s->cx - 1, s->cy);
+		if (!(tmp_gcp->flags & GRID_FLAG_UTF8)) {
+			tmp_gcp->flags |= GRID_FLAG_UTF8;
 			memset(&gu.data, 0xff, sizeof gu.data);
-			*gu.data = tmp_gc2->data;
+			*gu.data = tmp_gcp->data;
 			gu.width = 1;
 			grid_view_set_utf8(gd, s->cx - 1, s->cy, &gu);
 		}
@@ -799,9 +799,9 @@ screen_write_cell(
 	 * already ensured there is enough room.
 	 */
 	for (xx = s->cx + 1; xx < s->cx + width; xx++) {
-		tmp_gc2 = grid_view_get_cell(gd, xx, s->cy);
-		if (tmp_gc2 != NULL)
-			tmp_gc2->flags |= GRID_FLAG_PADDING;
+		tmp_gcp = grid_view_get_cell(gd, xx, s->cy);
+		if (tmp_gcp != NULL)
+			tmp_gcp->flags |= GRID_FLAG_PADDING;
 	}
 
 	/* Set the cell. */
@@ -820,8 +820,10 @@ screen_write_cell(
 	}
 	ttyctx.utf8 = &gu;
 	if (screen_check_selection(s, s->cx - width, s->cy)) {
-		s->sel.cell.data = gc->data;
-		ttyctx.cell = &s->sel.cell;
+		memcpy(&tmp_gc2, &s->sel.cell, sizeof tmp_gc2);
+		tmp_gc2.data = gc->data;
+		tmp_gc2.flags = gc->flags;
+		ttyctx.cell = &tmp_gc2;
 		tty_write(tty_cmd_cell, &ttyctx);
 	} else {
 		ttyctx.cell = gc;
diff --git a/tty.c b/tty.c
index 05342b82..48b10f7d 100644
--- a/tty.c
+++ b/tty.c
@@ -480,6 +480,7 @@ void
 tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy)
 {
 	const struct grid_cell	*gc;
+	struct grid_cell	 tmpgc;
 	const struct grid_utf8	*gu;
 	u_int			 i, sx;
 
@@ -498,8 +499,10 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy)
 			gu = grid_view_peek_utf8(s->grid, i, py);
 
 		if (screen_check_selection(s, i, py)) {
-			s->sel.cell.data = gc->data;
-			tty_cell(tty, &s->sel.cell, gu);
+			memcpy(&tmpgc, &s->sel.cell, sizeof tmpgc);
+			tmpgc.data = gc->data;
+			tmpgc.flags = gc->flags;
+			tty_cell(tty, &tmpgc, gu);
 		} else
 			tty_cell(tty, gc, gu);
 	}