From c2400d8ca6ffaaa520c87352a47ff45625a6fad8 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marien.zwart@gmail.com>
Date: Fri, 10 Jan 2014 13:49:35 +0100
Subject: [PATCH] (from marienz, via debian) add support for utf8 chars to
 /bind, irssi fs#553

---
 src/fe-common/core/keyboard.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index 49bcd399..05fdf901 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -304,6 +304,20 @@ static int expand_key(const char *key, GSList **out)
                         /* possibly beginning of keycombo */
 			start = key;
                         last_hyphen = FALSE;
+		} else if (g_utf8_validate(key, -1, NULL)) {
+			/* Assume we are looking at the start of a
+			 * multibyte sequence we will receive as-is,
+			 * so add it to the list as-is.
+			 */
+			const char *p, *end = g_utf8_next_char(key);
+			for (p = key; p != end; p++)
+				expand_out_char(*out, *p);
+			expand_out_char(*out, '-');
+			/* The for loop skips past the remaining character.
+			 * Nasty, I know...
+			 */
+			key = end - 1;
+			last_hyphen = FALSE;
 		} else {
 			expand_out_char(*out, *key);
 			expand_out_char(*out, '-');