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

Move to iconv

Browse Source 
That is the major change in this commit.

Also Ctrl-modified keys now should work in URxvt,
which was surprisingly trivial to achieve.

Coming up next:
 - making sure the tests still work
 - introducing CMake
This commit is contained in:
Přemysl Eric Janouch
2014-09-28 03:51:45 +02:00
parent cac1f8373b
commit 36bc6cd095
10 changed files with 312 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/02getkey.c
View File

@@ -20,10 +20,10 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after h");
is_int(key.code.codepoint, 'h', "key.code.codepoint after h");
is_int(key.modifiers, 0, "key.modifiers after h");
is_str(key.utf8, "h", "key.utf8 after h");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type after h");
is_int(key.code.codepoint, 'h', "key.code.codepoint after h");
is_int(key.modifiers, 0, "key.modifiers after h");
is_str(key.multibyte, "h", "key.multibyte after h");
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after getkey");

30
t/03utf8.c
View File

@@ -8,13 +8,13 @@ int main(int argc, char *argv[])
plan_tests(57);
tk = termkey_new_abstract("vt100", TERMKEY_FLAG_UTF8);
tk = termkey_new_abstract("vt100", "UTF-8", 0);
termkey_push_bytes(tk, "a", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY low ASCII");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type low ASCII");
is_int(key.code.codepoint, 'a', "key.code.codepoint low ASCII");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type low ASCII");
is_int(key.code.codepoint, 'a', "key.code.codepoint low ASCII");
/* 2-byte UTF-8 range is U+0080 to U+07FF (0xDF 0xBF) */
/* However, we'd best avoid the C1 range, so we'll start at U+00A0 (0xC2 0xA0) */
@@ -22,42 +22,42 @@ int main(int argc, char *argv[])
termkey_push_bytes(tk, "\xC2\xA0", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 low");
is_int(key.code.codepoint, 0x00A0, "key.code.codepoint UTF-8 2 low");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 2 low");
is_int(key.code.codepoint, 0x00A0, "key.code.codepoint UTF-8 2 low");
termkey_push_bytes(tk, "\xDF\xBF", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 high");
is_int(key.code.codepoint, 0x07FF, "key.code.codepoint UTF-8 2 high");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 2 high");
is_int(key.code.codepoint, 0x07FF, "key.code.codepoint UTF-8 2 high");
/* 3-byte UTF-8 range is U+0800 (0xE0 0xA0 0x80) to U+FFFD (0xEF 0xBF 0xBD) */
termkey_push_bytes(tk, "\xE0\xA0\x80", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 low");
is_int(key.code.codepoint, 0x0800, "key.code.codepoint UTF-8 3 low");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 3 low");
is_int(key.code.codepoint, 0x0800, "key.code.codepoint UTF-8 3 low");
termkey_push_bytes(tk, "\xEF\xBF\xBD", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 high");
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 3 high");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 3 high");
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 3 high");
/* 4-byte UTF-8 range is U+10000 (0xF0 0x90 0x80 0x80) to U+10FFFF (0xF4 0x8F 0xBF 0xBF) */
termkey_push_bytes(tk, "\xF0\x90\x80\x80", 4);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 low");
is_int(key.code.codepoint, 0x10000, "key.code.codepoint UTF-8 4 low");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 4 low");
is_int(key.code.codepoint, 0x10000, "key.code.codepoint UTF-8 4 low");
termkey_push_bytes(tk, "\xF4\x8F\xBF\xBF", 4);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 high");
is_int(key.code.codepoint, 0x10FFFF, "key.code.codepoint UTF-8 4 high");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 4 high");
is_int(key.code.codepoint, 0x10FFFF, "key.code.codepoint UTF-8 4 high");
/* Invalid continuations */