From 2a7b4bb01710eab0b7819f3b80edaea636ada66f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 8 Dec 2016 22:15:37 +0000
Subject: [PATCH] Fix send-keys with UTF-8.

---
 cmd-send-keys.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index dff4f51e..3d63440e 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -63,7 +63,8 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
 	struct window_pane	*wp = item->state.tflag.wp;
 	struct session		*s = item->state.tflag.s;
 	struct mouse_event	*m = &item->mouse;
-	const u_char		*keystr;
+	struct utf8_data	*ud, *uc;
+	wchar_t			 wc;
 	int			 i, literal;
 	key_code		 key;
 	u_int			 np = 1;
@@ -124,8 +125,12 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
 					literal = 1;
 			}
 			if (literal) {
-				for (keystr = args->argv[i]; *keystr != '\0'; keystr++)
-					window_pane_key(wp, NULL, s, *keystr, NULL);
+				ud = utf8_fromcstr(args->argv[i]);
+				for (uc = ud; uc->size != 0; uc++) {
+					if (utf8_combine(uc, &wc) == UTF8_DONE)
+						window_pane_key(wp, NULL, s, wc, NULL);
+				}
+				free(ud);
 			}
 		}