From 0a101ff71eb1133889b5f1b28b7779832eddb013 Mon Sep 17 00:00:00 2001
From: Paul LeoNerd Evans <leonerd@leonerd.org.uk>
Date: Thu, 7 Apr 2011 20:19:34 +0100
Subject: Bugfix termkey_strpkey parsing unicode with trailing content

---
 termkey.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'termkey.c')

diff --git a/termkey.c b/termkey.c
index 384b5a4..83d784d 100644
--- a/termkey.c
+++ b/termkey.c
@@ -1124,13 +1124,7 @@ char *termkey_strpkey(TermKey *tk, const char *str, TermKeyKey *key, TermKeyForm
   size_t nbytes;
   char *endstr;
 
-  if(parse_utf8((unsigned char *)str, strlen(str), &key->code.codepoint, &nbytes) == TERMKEY_RES_KEY &&
-     nbytes == strlen(str)) {
-    key->type = TERMKEY_TYPE_UNICODE;
-    fill_utf8(key);
-    str += nbytes;
-  }
-  else if((endstr = termkey_lookup_keyname(tk, str, &key->code.sym))) {
+  if((endstr = termkey_lookup_keyname(tk, str, &key->code.sym))) {
     key->type = TERMKEY_TYPE_KEYSYM;
     str = endstr;
   }
@@ -1138,6 +1132,12 @@ char *termkey_strpkey(TermKey *tk, const char *str, TermKeyKey *key, TermKeyForm
     key->type = TERMKEY_TYPE_FUNCTION;
     str += nbytes;
   }
+  // Unicode must be last
+  else if(parse_utf8((unsigned char *)str, strlen(str), &key->code.codepoint, &nbytes) == TERMKEY_RES_KEY) {
+    key->type = TERMKEY_TYPE_UNICODE;
+    fill_utf8(key);
+    str += nbytes;
+  }
   // TODO: Consider mouse events?
   else
     return NULL;
-- 
cgit v1.2.3-54-g00ecf