===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input-keys.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- src/usr.bin/tmux/input-keys.c	2016/01/19 15:59:12	1.53
+++ src/usr.bin/tmux/input-keys.c	2016/03/01 12:02:08	1.54
@@ -1,4 +1,4 @@
-/* $OpenBSD: input-keys.c,v 1.53 2016/01/19 15:59:12 nicm Exp $ */
+/* $OpenBSD: input-keys.c,v 1.54 2016/03/01 12:02:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -135,6 +135,19 @@
 	{ 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 @@
 		    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;