From fba9ebcc0c6c8e28150f484b9d1f1cb1f588eb9c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 6 Mar 2017 09:02:36 +0000
Subject: [PATCH 1/2] When redrawing a combined UTF-8 characters in its
 existing position, need to save and restore the cursor so that the next
 character goes into the right place.

---
 screen-write.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/screen-write.c b/screen-write.c
index 937870f9..d9d37437 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1151,7 +1151,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 	struct grid_cell 	 tmp_gc, now_gc;
 	struct tty_ctx		 ttyctx;
 	u_int			 sx = screen_size_x(s), sy = screen_size_y(s);
-	u_int		 	 width = gc->data.width, xx, last;
+	u_int		 	 width = gc->data.width, xx, last, cx, cy;
 	int			 selected, skip = 1;
 
 	/* Ignore padding cells. */
@@ -1163,10 +1163,12 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 	if (width == 0) {
 		screen_write_collect_flush(ctx, 0);
 		if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) {
+			cx = s->cx; cy = s->cy;
 			screen_write_cursormove(ctx, xx, s->cy);
 			screen_write_initctx(ctx, &ttyctx);
 			ttyctx.cell = gc;
 			tty_write(tty_cmd_cell, &ttyctx);
+			s->cx = cx; s->cy = cy;
 		}
 		return;
 	}

From dc8fefe902279836958c7438718e838d3687aed2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 6 Mar 2017 09:02:59 +0000
Subject: [PATCH 2/2] Collect strings correctly when on terminals that don't
 support UTF-8.

---
 tty.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/tty.c b/tty.c
index d454e97d..acc7ab54 100644
--- a/tty.c
+++ b/tty.c
@@ -709,7 +709,11 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
 	for (i = 0; i < sx; i++) {
 		grid_view_get_cell(s->grid, i, py, &gc);
 		if (len != 0 &&
-		    (gc.attr & GRID_ATTR_CHARSET ||
+		    (((~tty->flags & TTY_UTF8) &&
+		    (gc.data.size != 1 ||
+		    *gc.data.data >= 0x7f ||
+		    gc.data.width != 1)) ||
+		    (gc.attr & GRID_ATTR_CHARSET) ||
 		    gc.flags != last.flags ||
 		    gc.attr != last.attr ||
 		    gc.fg != last.fg ||
@@ -726,10 +730,19 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
 			screen_select_cell(s, &last, &gc);
 		else
 			memcpy(&last, &gc, sizeof last);
-		if (gc.attr & GRID_ATTR_CHARSET) {
+		if (((~tty->flags & TTY_UTF8) &&
+		    (gc.data.size != 1 ||
+		    *gc.data.data >= 0x7f ||
+		    gc.data.width != 1)) ||
+		    (gc.attr & GRID_ATTR_CHARSET)) {
 			tty_attributes(tty, &last, wp);
-			for (j = 0; j < gc.data.size; j++)
-				tty_putc(tty, gc.data.data[j]);
+			if (~tty->flags & TTY_UTF8) {
+				for (j = 0; j < gc.data.width; j++)
+					tty_putc(tty, '_');
+			} else {
+				for (j = 0; j < gc.data.size; j++)
+					tty_putc(tty, gc.data.data[j]);
+			}
 		} else {
 			memcpy(buf + len, gc.data.data, gc.data.size);
 			len += gc.data.size;