From 26945d7956bf1f160fba72677082e1a9c6968e0c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 1 Mar 2016 12:02:08 +0000
Subject: Use system wcwidth() instead of carrying around UTF-8 width tables.

---
 input-keys.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index 254845cb..47786d27 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -135,6 +135,19 @@ const struct input_key_ent input_keys[] = {
 	{ KEYC_KP_PERIOD,	".",		0 },
 };
 
+/* Split a character into two UTF-8 bytes. */
+static size_t
+input_split2(u_int c, u_char *dst)
+{
+	if (c > 0x7f) {
+		dst[0] = (c >> 6) | 0xc0;
+		dst[1] = (c & 0x3f) | 0x80;
+		return (2);
+	}
+	dst[0] = c;
+	return (1);
+}
+
 /* Translate a key code into an output key sequence. */
 void
 input_key(struct window_pane *wp, key_code key, struct mouse_event *m)
@@ -251,9 +264,9 @@ input_key_mouse(struct window_pane *wp, struct mouse_event *m)
 		    m->sgr_b, x + 1, y + 1, m->sgr_type);
 	} else if (wp->screen->mode & MODE_MOUSE_UTF8) {
 		len = xsnprintf(buf, sizeof buf, "\033[M");
-		len += utf8_split2(m->b + 32, &buf[len]);
-		len += utf8_split2(x + 33, &buf[len]);
-		len += utf8_split2(y + 33, &buf[len]);
+		len += input_split2(m->b + 32, &buf[len]);
+		len += input_split2(x + 33, &buf[len]);
+		len += input_split2(y + 33, &buf[len]);
 	} else {
 		if (m->b > 223)
 			return;
-- 
cgit