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

Unicode codepoint is stored in key->code.codepoint, not code.number

This commit is contained in:
Paul LeoNerd Evans 2011-04-01 10:41:44 +01:00
parent 6424282c4d
commit 59800c356b
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/11strfkey.c
View File

@ -13,7 +13,7 @@ int main(int argc, char *argv[])
tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS); tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS);
key.type = TERMKEY_TYPE_UNICODE; key.type = TERMKEY_TYPE_UNICODE;
key.code.number = 'A'; key.code.codepoint = 'A';
key.modifiers = 0; key.modifiers = 0;
key.utf8[0] = 0; key.utf8[0] = 0;
@ -26,7 +26,7 @@ int main(int argc, char *argv[])
is_str(buffer, "A", "buffer for unicode/A/0 wrapbracket"); is_str(buffer, "A", "buffer for unicode/A/0 wrapbracket");
key.type = TERMKEY_TYPE_UNICODE; key.type = TERMKEY_TYPE_UNICODE;
key.code.number = 'b'; key.code.codepoint = 'b';
key.modifiers = TERMKEY_KEYMOD_CTRL; key.modifiers = TERMKEY_KEYMOD_CTRL;
key.utf8[0] = 0; key.utf8[0] = 0;
@ -47,7 +47,7 @@ int main(int argc, char *argv[])
is_str(buffer, "<C-b>", "buffer for unicode/b/CTRL wrapbracket"); is_str(buffer, "<C-b>", "buffer for unicode/b/CTRL wrapbracket");
key.type = TERMKEY_TYPE_UNICODE; key.type = TERMKEY_TYPE_UNICODE;
key.code.number = 'c'; key.code.codepoint = 'c';
key.modifiers = TERMKEY_KEYMOD_ALT; key.modifiers = TERMKEY_KEYMOD_ALT;
key.utf8[0] = 0; key.utf8[0] = 0;

20
t/12strpkey.c
View File

@ -7,7 +7,7 @@ int main(int argc, char *argv[])
TermKeyKey key; TermKeyKey key;
TermKeyResult res; TermKeyResult res;
#define CLEAR_KEY do { key.type = -1; key.code.number = -1; key.modifiers = -1; key.utf8[0] = 0; } while(0) #define CLEAR_KEY do { key.type = -1; key.code.codepoint = -1; key.modifiers = -1; key.utf8[0] = 0; } while(0)
plan_tests(44); plan_tests(44);
@ -17,7 +17,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "A", &key, 0); res = termkey_strpkey(tk, "A", &key, 0);
is_int(res, TERMKEY_RES_KEY, "result for unicode/A/0"); is_int(res, TERMKEY_RES_KEY, "result for unicode/A/0");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/A/0"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/A/0");
is_int(key.code.number, 'A', "key.code.number for unicode/A/0"); is_int(key.code.codepoint, 'A', "key.code.codepoint for unicode/A/0");
is_int(key.modifiers, 0, "key.modifiers for unicode/A/0"); is_int(key.modifiers, 0, "key.modifiers for unicode/A/0");
is_str(key.utf8, "A", "key.utf8 for unicode/A/0"); is_str(key.utf8, "A", "key.utf8 for unicode/A/0");
@ -25,7 +25,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "C-b", &key, 0); res = termkey_strpkey(tk, "C-b", &key, 0);
is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL"); is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL");
is_int(key.code.number, 'b', "key.code.number for unicode/b/CTRL"); is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL"); is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL");
is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL"); is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL");
@ -33,7 +33,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "Ctrl-b", &key, TERMKEY_FORMAT_LONGMOD); res = termkey_strpkey(tk, "Ctrl-b", &key, TERMKEY_FORMAT_LONGMOD);
is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL longmod"); is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL longmod");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL longmod"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL longmod");
is_int(key.code.number, 'b', "key.code.number for unicode/b/CTRL longmod"); is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL longmod");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL longmod"); is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL longmod");
is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL longmod"); is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL longmod");
@ -41,7 +41,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "^B", &key, TERMKEY_FORMAT_CARETCTRL); res = termkey_strpkey(tk, "^B", &key, TERMKEY_FORMAT_CARETCTRL);
is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL caretctrl"); is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL caretctrl");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL caretctrl"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL caretctrl");
is_int(key.code.number, 'b', "key.code.number for unicode/b/CTRL caretctrl"); is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL caretctrl");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL caretctrl"); is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL caretctrl");
is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL caretctrl"); is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL caretctrl");
@ -49,7 +49,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "A-c", &key, 0); res = termkey_strpkey(tk, "A-c", &key, 0);
is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT"); is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT");
is_int(key.code.number, 'c', "key.code.number for unicode/c/ALT"); is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT");
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT");
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT");
@ -57,7 +57,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "Alt-c", &key, TERMKEY_FORMAT_LONGMOD); res = termkey_strpkey(tk, "Alt-c", &key, TERMKEY_FORMAT_LONGMOD);
is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT longmod"); is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT longmod");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT longmod"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT longmod");
is_int(key.code.number, 'c', "key.code.number for unicode/c/ALT longmod"); is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT longmod");
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT longmod"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT longmod");
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT longmod"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT longmod");
@ -65,7 +65,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "M-c", &key, TERMKEY_FORMAT_ALTISMETA); res = termkey_strpkey(tk, "M-c", &key, TERMKEY_FORMAT_ALTISMETA);
is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT altismeta"); is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT altismeta");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta");
is_int(key.code.number, 'c', "key.code.number for unicode/c/ALT altismeta"); is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta");
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta");
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta");
@ -73,7 +73,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "Meta-c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD); res = termkey_strpkey(tk, "Meta-c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD);
is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT altismeta+longmod"); is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT altismeta+longmod");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta+longmod"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta+longmod");
is_int(key.code.number, 'c', "key.code.number for unicode/c/ALT altismeta+longmod"); is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta+longmod");
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta+longmod"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta+longmod");
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta+longmod"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta+longmod");
@ -81,7 +81,7 @@ int main(int argc, char *argv[])
res = termkey_strpkey(tk, "Up", &key, 0); res = termkey_strpkey(tk, "Up", &key, 0);
is_int(res, TERMKEY_RES_KEY, "result for sym/Up/0"); is_int(res, TERMKEY_RES_KEY, "result for sym/Up/0");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for sym/Up/0"); is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for sym/Up/0");
is_int(key.code.sym, TERMKEY_SYM_UP, "key.code.number for sym/Up/0"); is_int(key.code.sym, TERMKEY_SYM_UP, "key.code.codepoint for sym/Up/0");
is_int(key.modifiers, 0, "key.modifiers for sym/Up/0"); is_int(key.modifiers, 0, "key.modifiers for sym/Up/0");
termkey_destroy(tk); termkey_destroy(tk);

10
termkey.c
View File

@ -1082,13 +1082,13 @@ TermKeyResult termkey_strpkey(TermKey *tk, const char *str, TermKeyKey *key, Ter
return res; return res;
if(key->type != TERMKEY_TYPE_UNICODE) if(key->type != TERMKEY_TYPE_UNICODE)
return TERMKEY_RES_NONE; return TERMKEY_RES_NONE;
if(key->code.number < '@' || key->code.number > '_') if(key->code.codepoint < '@' || key->code.codepoint > '_')
return TERMKEY_RES_NONE; return TERMKEY_RES_NONE;
if(key->modifiers != 0) if(key->modifiers != 0)
return TERMKEY_RES_NONE; return TERMKEY_RES_NONE;
if(key->code.number >= 'A' && key->code.number <= 'Z') if(key->code.codepoint >= 'A' && key->code.codepoint <= 'Z')
key->code.number += 0x20; key->code.codepoint += 0x20;
key->modifiers = TERMKEY_KEYMOD_CTRL; key->modifiers = TERMKEY_KEYMOD_CTRL;
fill_utf8(key); fill_utf8(key);
return res; return res;
@ -1112,13 +1112,11 @@ TermKeyResult termkey_strpkey(TermKey *tk, const char *str, TermKeyKey *key, Ter
str = hyphen + 1; str = hyphen + 1;
} }
long codepoint;
size_t nbytes; size_t nbytes;
if(parse_utf8((unsigned char *)str, strlen(str), &codepoint, &nbytes) == TERMKEY_RES_KEY && if(parse_utf8((unsigned char *)str, strlen(str), &key->code.codepoint, &nbytes) == TERMKEY_RES_KEY &&
nbytes == strlen(str)) { nbytes == strlen(str)) {
key->type = TERMKEY_TYPE_UNICODE; key->type = TERMKEY_TYPE_UNICODE;
key->code.number = codepoint;
fill_utf8(key); fill_utf8(key);
} }
else if((key->code.sym = termkey_keyname2sym(tk, str)) != TERMKEY_SYM_UNKNOWN) { else if((key->code.sym = termkey_keyname2sym(tk, str)) != TERMKEY_SYM_UNKNOWN) {