p/termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix termkey_strpkey parsing unicode with trailing content

Browse Source
This commit is contained in:
Paul LeoNerd Evans
2011-04-07 20:19:34 +01:00
parent c626393aeb
commit 0a101ff71e
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
termkey.c
View File

@@ -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;