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: [PATCH] Bugfix termkey_strpkey parsing unicode with trailing content

---
 t/12strpkey.c | 10 +++++++++-
 termkey.c     | 14 +++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/t/12strpkey.c b/t/12strpkey.c
index 43e4eb0..ef5acd9 100644
--- a/t/12strpkey.c
+++ b/t/12strpkey.c
@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
 
 #define CLEAR_KEY do { key.type = -1; key.code.codepoint = -1; key.modifiers = -1; key.utf8[0] = 0; } while(0)
 
-  plan_tests(48);
+  plan_tests(53);
 
   tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS);
 
@@ -21,6 +21,14 @@ int main(int argc, char *argv[])
   is_str(key.utf8,        "A",                  "key.utf8 for unicode/A/0");
   is_str(endp, "", "consumed entire input for unicode/A/0");
 
+  CLEAR_KEY;
+  endp = termkey_strpkey(tk, "A and more", &key, 0);
+  is_int(key.type,        TERMKEY_TYPE_UNICODE, "key.type for unicode/A/0 trailing");
+  is_int(key.code.codepoint, 'A',               "key.code.codepoint for unicode/A/0 trailing");
+  is_int(key.modifiers,   0,                    "key.modifiers for unicode/A/0 trailing");
+  is_str(key.utf8,        "A",                  "key.utf8 for unicode/A/0 trailing");
+  is_str(endp, " and more", "points at string tail for unicode/A/0 trailing");
+
   CLEAR_KEY;
   endp = termkey_strpkey(tk, "C-b", &key, 0);
   is_int(key.type,        TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL");
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;