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

Make the tests work again 

Our UTF-8 parsing now behaves differently, though.
This commit is contained in:
Přemysl Eric Janouch 2014-09-28 05:56:13 +02:00
parent 36bc6cd095
commit 3465d5553f
17 changed files with 961 additions and 767 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
t/01base.c
View File

@ -2,30 +2,28 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
plan_tests(6); plan_tests (6);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
ok (!!tk, "termkey_new_abstract");
is_int (termkey_get_buffer_size (tk), 256, "termkey_get_buffer_size");
ok (termkey_is_started (tk), "termkey_is_started true after construction");
ok(!!tk, "termkey_new_abstract"); termkey_stop (tk);
ok (!termkey_is_started (tk),
"termkey_is_started false after termkey_stop()");
is_int(termkey_get_buffer_size(tk), 256, "termkey_get_buffer_size"); termkey_start (tk);
ok(termkey_is_started(tk), "termkey_is_started true after construction"); ok (termkey_is_started (tk),
"termkey_is_started true after termkey_start()");
termkey_stop(tk); termkey_destroy (tk);
ok(!termkey_is_started(tk), "termkey_is_started false after termkey_stop()"); ok (1, "termkey_free");
return exit_status ();
termkey_start(tk);
ok(termkey_is_started(tk), "termkey_is_started true after termkey_start()");
termkey_destroy(tk);
ok(1, "termkey_free");
return exit_status();
} }

101
t/02getkey.c
View File

@ -1,75 +1,92 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
plan_tests(31); plan_tests (31);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free initially 256"); is_int (termkey_get_buffer_remaining (tk),
256, "buffer free initially 256");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE when empty"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE,
"getkey yields RES_NONE when empty");
is_int(termkey_push_bytes(tk, "h", 1), 1, "push_bytes returns 1"); is_int (termkey_push_bytes (tk, "h", 1), 1, "push_bytes returns 1");
is_int(termkey_get_buffer_remaining(tk), 255, "buffer free 255 after push_bytes"); is_int (termkey_get_buffer_remaining (tk), 255,
"buffer free 255 after push_bytes");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after h");
is_int(key.type, TERMKEY_TYPE_KEY, "key.type 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.code.codepoint, 'h', "key.code.codepoint after h");
is_int(key.modifiers, 0, "key.modifiers after h"); is_int (key.modifiers, 0, "key.modifiers after h");
is_str(key.multibyte, "h", "key.multibyte after h"); is_str (key.multibyte, "h", "key.multibyte after h");
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after getkey"); is_int (termkey_get_buffer_remaining (tk), 256,
"buffer free 256 after getkey");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE a second time"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE,
"getkey yields RES_NONE a second time");
termkey_push_bytes(tk, "\x01", 1); termkey_push_bytes (tk, "\x01", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after C-a"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after C-a");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after C-a"); is_int (key.type, TERMKEY_TYPE_KEY, "key.type after C-a");
is_int(key.code.codepoint, 'a', "key.code.codepoint after C-a"); is_int (key.code.codepoint, 'a', "key.code.codepoint after C-a");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers after C-a"); is_int (key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers after C-a");
termkey_push_bytes(tk, "\033OA", 3); termkey_push_bytes (tk, "\033OA", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Up"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after Up");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after Up"); is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type after Up");
is_int(key.code.sym, TERMKEY_SYM_UP, "key.code.sym after Up"); is_int (key.code.sym, TERMKEY_SYM_UP, "key.code.sym after Up");
is_int(key.modifiers, 0, "key.modifiers after Up"); is_int (key.modifiers, 0, "key.modifiers after Up");
is_int(termkey_push_bytes(tk, "\033O", 2), 2, "push_bytes returns 2"); is_int (termkey_push_bytes (tk, "\033O", 2), 2, "push_bytes returns 2");
is_int(termkey_get_buffer_remaining(tk), 254, "buffer free 254 after partial write"); is_int (termkey_get_buffer_remaining (tk), 254,
"buffer free 254 after partial write");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN after partial write"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN after partial write");
termkey_push_bytes(tk, "C", 1); termkey_push_bytes (tk, "C", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Right completion"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after Right completion");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after Right"); is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type after Right");
is_int(key.code.sym, TERMKEY_SYM_RIGHT, "key.code.sym after Right"); is_int (key.code.sym, TERMKEY_SYM_RIGHT, "key.code.sym after Right");
is_int(key.modifiers, 0, "key.modifiers after Right"); is_int (key.modifiers, 0, "key.modifiers after Right");
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after completion"); is_int (termkey_get_buffer_remaining (tk), 256,
"buffer free 256 after completion");
termkey_push_bytes(tk, "\033[27;5u", 7); termkey_push_bytes (tk, "\033[27;5u", 7);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Ctrl-Escape"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after Ctrl-Escape");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after Ctrl-Escape"); is_int (key.type, TERMKEY_TYPE_KEYSYM,
is_int(key.code.sym, TERMKEY_SYM_ESCAPE, "key.code.sym after Ctrl-Escape"); "key.type after Ctrl-Escape");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers after Ctrl-Escape"); is_int (key.code.sym, TERMKEY_SYM_ESCAPE,
"key.code.sym after Ctrl-Escape");
is_int (key.modifiers, TERMKEY_KEYMOD_CTRL,
"key.modifiers after Ctrl-Escape");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status(); return exit_status ();
} }

221
t/03utf8.c
View File

@ -1,141 +1,188 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
plan_tests(57); plan_tests (33 /* 57 */);
tk = termkey_new_abstract("vt100", "UTF-8", 0); tk = termkey_new_abstract ("vt100", "UTF-8", 0);
termkey_push_bytes(tk, "a", 1); termkey_push_bytes (tk, "a", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY low ASCII"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_KEY, "key.type low ASCII"); "getkey yields RES_KEY 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) */ /* 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) */ /* However, we'd best avoid the C1 range, so we'll start at U+00A0 (0xC2 0xA0) */
termkey_push_bytes(tk, "\xC2\xA0", 2); 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 (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 2 low"); "getkey yields RES_KEY 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); 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 (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 2 high"); "getkey yields RES_KEY 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) */ /* 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); 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 (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 3 low"); "getkey yields RES_KEY 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); 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 (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 3 high"); "getkey yields RES_KEY 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) */ /* 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); 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 (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 4 low"); "getkey yields RES_KEY 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); 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 (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_KEY, "key.type UTF-8 4 high"); "getkey yields RES_KEY 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");
#if 0
/* XXX: With the move to iconv, this has changed significantly. */
/* Invalid continuations */ /* Invalid continuations */
termkey_push_bytes(tk, "\xC2!", 2); termkey_push_bytes (tk, "\xC2!", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid cont"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 2 invalid cont"); "getkey yields RES_KEY UTF-8 2 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid after"); is_int (key.code.codepoint, 0xFFFD,
is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 2 invalid after"); "key.code.codepoint UTF-8 2 invalid cont");
is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY UTF-8 2 invalid after");
is_int (key.code.codepoint, '!',
"key.code.codepoint UTF-8 2 invalid after");
termkey_push_bytes(tk, "\xE0!", 2); termkey_push_bytes (tk, "\xE0!", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 3 invalid cont"); "getkey yields RES_KEY UTF-8 3 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after"); is_int (key.code.codepoint, 0xFFFD,
is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 3 invalid after"); "key.code.codepoint UTF-8 3 invalid cont");
is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY UTF-8 3 invalid after");
is_int (key.code.codepoint, '!',
"key.code.codepoint UTF-8 3 invalid after");
termkey_push_bytes(tk, "\xE0\xA0!", 3); termkey_push_bytes (tk, "\xE0\xA0!", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont 2"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 3 invalid cont 2"); "getkey yields RES_KEY UTF-8 3 invalid cont 2");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after"); is_int (key.code.codepoint, 0xFFFD,
is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 3 invalid after"); "key.code.codepoint UTF-8 3 invalid cont 2");
is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY UTF-8 3 invalid after");
is_int (key.code.codepoint, '!',
"key.code.codepoint UTF-8 3 invalid after");
termkey_push_bytes(tk, "\xF0!", 2); termkey_push_bytes (tk, "\xF0!", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 4 invalid cont"); "getkey yields RES_KEY UTF-8 4 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after"); is_int (key.code.codepoint, 0xFFFD,
is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 4 invalid after"); "key.code.codepoint UTF-8 4 invalid cont");
is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY UTF-8 4 invalid after");
is_int (key.code.codepoint, '!',
"key.code.codepoint UTF-8 4 invalid after");
termkey_push_bytes(tk, "\xF0\x90!", 3); termkey_push_bytes (tk, "\xF0\x90!", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 2"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 4 invalid cont 2"); "getkey yields RES_KEY UTF-8 4 invalid cont 2");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after"); is_int (key.code.codepoint, 0xFFFD,
is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 4 invalid after"); "key.code.codepoint UTF-8 4 invalid cont 2");
is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY UTF-8 4 invalid after");
is_int (key.code.codepoint, '!',
"key.code.codepoint UTF-8 4 invalid after");
termkey_push_bytes(tk, "\xF0\x90\x80!", 4); termkey_push_bytes (tk, "\xF0\x90\x80!", 4);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 3"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 4 invalid cont 3"); "getkey yields RES_KEY UTF-8 4 invalid cont 3");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after"); is_int (key.code.codepoint, 0xFFFD,
is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 4 invalid after"); "key.code.codepoint UTF-8 4 invalid cont 3");
is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY UTF-8 4 invalid after");
is_int (key.code.codepoint, '!',
"key.code.codepoint UTF-8 4 invalid after");
#endif
/* Partials */ /* Partials */
termkey_push_bytes(tk, "\xC2", 1); termkey_push_bytes (tk, "\xC2", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 2 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN UTF-8 2 partial");
termkey_push_bytes(tk, "\xA0", 1); termkey_push_bytes (tk, "\xA0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0x00A0, "key.code.codepoint UTF-8 2 partial"); "getkey yields RES_KEY UTF-8 2 partial");
is_int (key.code.codepoint, 0x00A0,
"key.code.codepoint UTF-8 2 partial");
termkey_push_bytes(tk, "\xE0", 1); termkey_push_bytes (tk, "\xE0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 3 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN UTF-8 3 partial");
termkey_push_bytes(tk, "\xA0", 1); termkey_push_bytes (tk, "\xA0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 3 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN UTF-8 3 partial");
termkey_push_bytes(tk, "\x80", 1); termkey_push_bytes (tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0x0800, "key.code.codepoint UTF-8 3 partial"); "getkey yields RES_KEY UTF-8 3 partial");
is_int (key.code.codepoint, 0x0800,
"key.code.codepoint UTF-8 3 partial");
termkey_push_bytes(tk, "\xF0", 1); termkey_push_bytes (tk, "\xF0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN UTF-8 4 partial");
termkey_push_bytes(tk, "\x90", 1); termkey_push_bytes (tk, "\x90", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN UTF-8 4 partial");
termkey_push_bytes(tk, "\x80", 1); termkey_push_bytes (tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN UTF-8 4 partial");
termkey_push_bytes(tk, "\x80", 1); termkey_push_bytes (tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 partial"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.code.codepoint, 0x10000, "key.code.codepoint UTF-8 4 partial"); "getkey yields RES_KEY UTF-8 4 partial");
is_int (key.code.codepoint, 0x10000,
"key.code.codepoint UTF-8 4 partial");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

43
t/04flags.c
View File

@ -2,34 +2,39 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
plan_tests(8); plan_tests (8);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
termkey_push_bytes(tk, " ", 1); termkey_push_bytes (tk, " ", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after space");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after space"); is_int (key.type, TERMKEY_TYPE_KEY, "key.type after space");
is_int(key.code.codepoint, ' ', "key.code.codepoint after space"); is_int (key.code.codepoint, ' ', "key.code.codepoint after space");
is_int(key.modifiers, 0, "key.modifiers after space"); is_int (key.modifiers, 0, "key.modifiers after space");
termkey_set_flags(tk, TERMKEY_FLAG_SPACESYMBOL); termkey_set_flags (tk, TERMKEY_FLAG_SPACESYMBOL);
termkey_push_bytes(tk, " ", 1); termkey_push_bytes (tk, " ", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after space");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after space with FLAG_SPACESYMBOL"); is_int (key.type, TERMKEY_TYPE_KEYSYM,
is_int(key.code.sym, TERMKEY_SYM_SPACE, "key.code.sym after space with FLAG_SPACESYMBOL"); "key.type after space with FLAG_SPACESYMBOL");
is_int(key.modifiers, 0, "key.modifiers after space with FLAG_SPACESYMBOL"); is_int (key.code.sym, TERMKEY_SYM_SPACE,
"key.code.sym after space with FLAG_SPACESYMBOL");
is_int (key.modifiers, 0,
"key.modifiers after space with FLAG_SPACESYMBOL");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

89
t/05read.c
View File

@ -3,70 +3,83 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
int fd[2]; int fd[2];
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
plan_tests(21); plan_tests (21);
/* We'll need a real filehandle we can write/read. /* We'll need a real filehandle we can write/read.
* pipe() can make us one */ * pipe () can make us one */
pipe(fd); pipe (fd);
/* Sanitise this just in case */ /* Sanitise this just in case */
putenv("TERM=vt100"); putenv ("TERM=vt100");
tk = termkey_new(fd[0], TERMKEY_FLAG_NOTERMIOS); tk = termkey_new (fd[0], NULL, TERMKEY_FLAG_NOTERMIOS);
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free initially 256"); is_int (termkey_get_buffer_remaining (tk), 256,
"buffer free initially 256");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE when empty"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE,
"getkey yields RES_NONE when empty");
write(fd[1], "h", 1); write (fd[1], "h", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE before advisereadable"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE,
"getkey yields RES_NONE before advisereadable");
is_int(termkey_advisereadable(tk), TERMKEY_RES_AGAIN, "advisereadable yields RES_AGAIN after h"); is_int (termkey_advisereadable (tk), TERMKEY_RES_AGAIN,
"advisereadable yields RES_AGAIN after h");
is_int(termkey_get_buffer_remaining(tk), 255, "buffer free 255 after advisereadable"); is_int (termkey_get_buffer_remaining (tk), 255,
"buffer free 255 after advisereadable");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h"); 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.type, TERMKEY_TYPE_KEY, "key.type after h");
is_int(key.code.codepoint, 'h', "key.code.codepoint after h"); is_int (key.code.codepoint, 'h', "key.code.codepoint after h");
is_int(key.modifiers, 0, "key.modifiers after h"); is_int (key.modifiers, 0, "key.modifiers after h");
is_str(key.utf8, "h", "key.utf8 after h"); is_str (key.multibyte, "h", "key.multibyte after h");
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after getkey"); is_int (termkey_get_buffer_remaining (tk), 256,
"buffer free 256 after getkey");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE a second time"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE,
"getkey yields RES_NONE a second time");
write(fd[1], "\033O", 2); write (fd[1], "\033O", 2);
termkey_advisereadable(tk); termkey_advisereadable (tk);
is_int(termkey_get_buffer_remaining(tk), 254, "buffer free 254 after partial write"); is_int (termkey_get_buffer_remaining (tk), 254,
"buffer free 254 after partial write");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN after partial write"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN,
"getkey yields RES_AGAIN after partial write");
write(fd[1], "C", 1); write (fd[1], "C", 1);
termkey_advisereadable(tk); termkey_advisereadable (tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Right completion"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY after Right completion");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after Right"); is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type after Right");
is_int(key.code.sym, TERMKEY_SYM_RIGHT, "key.code.sym after Right"); is_int (key.code.sym, TERMKEY_SYM_RIGHT, "key.code.sym after Right");
is_int(key.modifiers, 0, "key.modifiers after Right"); is_int (key.modifiers, 0, "key.modifiers after Right");
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after completion"); is_int (termkey_get_buffer_remaining (tk), 256,
"buffer free 256 after completion");
termkey_stop(tk); termkey_stop (tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_ERROR, "getkey yields RES_ERROR after termkey_stop()"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_ERROR,
is_int(errno, EINVAL, "getkey error is EINVAL"); "getkey yields RES_ERROR after termkey_stop ()");
is_int (errno, EINVAL, "getkey error is EINVAL");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

40
t/06buffer.c
View File

@ -2,31 +2,37 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
plan_tests(9); plan_tests (9);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free initially 256"); is_int (termkey_get_buffer_remaining (tk), 256,
is_int(termkey_get_buffer_size(tk), 256, "buffer size initially 256"); "buffer free initially 256");
is_int (termkey_get_buffer_size (tk), 256,
"buffer size initially 256");
is_int(termkey_push_bytes(tk, "h", 1), 1, "push_bytes returns 1"); is_int (termkey_push_bytes (tk, "h", 1), 1, "push_bytes returns 1");
is_int(termkey_get_buffer_remaining(tk), 255, "buffer free 255 after push_bytes"); is_int (termkey_get_buffer_remaining (tk), 255,
is_int(termkey_get_buffer_size(tk), 256, "buffer size 256 after push_bytes"); "buffer free 255 after push_bytes");
is_int (termkey_get_buffer_size (tk), 256,
"buffer size 256 after push_bytes");
ok(!!termkey_set_buffer_size(tk, 512), "buffer set size OK"); ok (!!termkey_set_buffer_size (tk, 512), "buffer set size OK");
is_int(termkey_get_buffer_remaining(tk), 511, "buffer free 511 after push_bytes"); is_int (termkey_get_buffer_remaining (tk), 511,
is_int(termkey_get_buffer_size(tk), 512, "buffer size 512 after push_bytes"); "buffer free 511 after push_bytes");
is_int (termkey_get_buffer_size (tk), 512,
"buffer size 512 after push_bytes");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "buffered key still useable after resize"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"buffered key still useable after resize");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

48
t/10keyname.c
View File

@ -1,38 +1,40 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeySym sym; termkey_sym_t sym;
const char *end; const char *end;
plan_tests(10); plan_tests (10);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
sym = termkey_keyname2sym(tk, "Space"); sym = termkey_keyname2sym (tk, "Space");
is_int(sym, TERMKEY_SYM_SPACE, "keyname2sym Space"); is_int (sym, TERMKEY_SYM_SPACE, "keyname2sym Space");
sym = termkey_keyname2sym(tk, "SomeUnknownKey"); sym = termkey_keyname2sym (tk, "SomeUnknownKey");
is_int(sym, TERMKEY_SYM_UNKNOWN, "keyname2sym SomeUnknownKey"); is_int (sym, TERMKEY_SYM_UNKNOWN, "keyname2sym SomeUnknownKey");
end = termkey_lookup_keyname(tk, "Up", &sym); end = termkey_lookup_keyname (tk, "Up", &sym);
ok(!!end, "termkey_get_keyname Up returns non-NULL"); ok (!!end, "termkey_get_keyname Up returns non-NULL");
is_str(end, "", "termkey_get_keyname Up return points at endofstring"); is_str (end, "", "termkey_get_keyname Up return points at endofstring");
is_int(sym, TERMKEY_SYM_UP, "termkey_get_keyname Up yields Up symbol"); is_int (sym, TERMKEY_SYM_UP, "termkey_get_keyname Up yields Up symbol");
end = termkey_lookup_keyname(tk, "DownMore", &sym); end = termkey_lookup_keyname (tk, "DownMore", &sym);
ok(!!end, "termkey_get_keyname DownMore returns non-NULL"); ok (!!end, "termkey_get_keyname DownMore returns non-NULL");
is_str(end, "More", "termkey_get_keyname DownMore return points at More"); is_str (end, "More", "termkey_get_keyname DownMore return points at More");
is_int(sym, TERMKEY_SYM_DOWN, "termkey_get_keyname DownMore yields Down symbol"); is_int (sym, TERMKEY_SYM_DOWN,
"termkey_get_keyname DownMore yields Down symbol");
end = termkey_lookup_keyname(tk, "SomeUnknownKey", &sym); end = termkey_lookup_keyname (tk, "SomeUnknownKey", &sym);
ok(!end, "termkey_get_keyname SomeUnknownKey returns NULL"); ok (!end, "termkey_get_keyname SomeUnknownKey returns NULL");
is_str(termkey_get_keyname(tk, TERMKEY_SYM_SPACE), "Space", "get_keyname SPACE"); is_str (termkey_get_keyname (tk, TERMKEY_SYM_SPACE), "Space",
"get_keyname SPACE");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

182
t/11strfkey.c
View File

@ -1,137 +1,151 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
char buffer[16]; char buffer[16];
size_t len; size_t len;
plan_tests(44); plan_tests (44);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
key.type = TERMKEY_TYPE_UNICODE; key.type = TERMKEY_TYPE_KEY;
key.code.codepoint = 'A'; key.code.codepoint = 'A';
key.modifiers = 0; key.modifiers = 0;
key.utf8[0] = 0; key.multibyte[0] = 0;
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 1, "length for unicode/A/0"); is_int (len, 1, "length for unicode/A/0");
is_str(buffer, "A", "buffer for unicode/A/0"); is_str (buffer, "A", "buffer for unicode/A/0");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_WRAPBRACKET); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 1, "length for unicode/A/0 wrapbracket"); TERMKEY_FORMAT_WRAPBRACKET);
is_str(buffer, "A", "buffer for unicode/A/0 wrapbracket"); is_int (len, 1, "length for unicode/A/0 wrapbracket");
is_str (buffer, "A", "buffer for unicode/A/0 wrapbracket");
key.type = TERMKEY_TYPE_UNICODE; key.type = TERMKEY_TYPE_KEY;
key.code.codepoint = 'b'; key.code.codepoint = 'b';
key.modifiers = TERMKEY_KEYMOD_CTRL; key.modifiers = TERMKEY_KEYMOD_CTRL;
key.utf8[0] = 0; key.multibyte[0] = 0;
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 3, "length for unicode/b/CTRL"); is_int (len, 3, "length for unicode/b/CTRL");
is_str(buffer, "C-b", "buffer for unicode/b/CTRL"); is_str (buffer, "C-b", "buffer for unicode/b/CTRL");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_LONGMOD); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 6, "length for unicode/b/CTRL longmod"); TERMKEY_FORMAT_LONGMOD);
is_str(buffer, "Ctrl-b", "buffer for unicode/b/CTRL longmod"); is_int (len, 6, "length for unicode/b/CTRL longmod");
is_str (buffer, "Ctrl-b", "buffer for unicode/b/CTRL longmod");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_SPACEMOD); TERMKEY_FORMAT_LONGMOD | TERMKEY_FORMAT_SPACEMOD);
is_int(len, 6, "length for unicode/b/CTRL longmod|spacemod"); is_int (len, 6, "length for unicode/b/CTRL longmod|spacemod");
is_str(buffer, "Ctrl b", "buffer for unicode/b/CTRL longmod|spacemod"); is_str (buffer, "Ctrl b", "buffer for unicode/b/CTRL longmod|spacemod");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_LOWERMOD); TERMKEY_FORMAT_LONGMOD | TERMKEY_FORMAT_LOWERMOD);
is_int(len, 6, "length for unicode/b/CTRL longmod|lowermod"); is_int (len, 6, "length for unicode/b/CTRL longmod|lowermod");
is_str(buffer, "ctrl-b", "buffer for unicode/b/CTRL longmod|lowermod"); is_str (buffer, "ctrl-b", "buffer for unicode/b/CTRL longmod|lowermod");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_SPACEMOD|TERMKEY_FORMAT_LOWERMOD); TERMKEY_FORMAT_LONGMOD | TERMKEY_FORMAT_SPACEMOD
is_int(len, 6, "length for unicode/b/CTRL longmod|spacemod|lowermode"); | TERMKEY_FORMAT_LOWERMOD);
is_str(buffer, "ctrl b", "buffer for unicode/b/CTRL longmod|spacemod|lowermode"); is_int (len, 6, "length for unicode/b/CTRL longmod|spacemod|lowermode");
is_str (buffer, "ctrl b",
"buffer for unicode/b/CTRL longmod|spacemod|lowermode");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_CARETCTRL); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 2, "length for unicode/b/CTRL caretctrl"); TERMKEY_FORMAT_CARETCTRL);
is_str(buffer, "^B", "buffer for unicode/b/CTRL caretctrl"); is_int (len, 2, "length for unicode/b/CTRL caretctrl");
is_str (buffer, "^B", "buffer for unicode/b/CTRL caretctrl");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_WRAPBRACKET); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 5, "length for unicode/b/CTRL wrapbracket"); TERMKEY_FORMAT_WRAPBRACKET);
is_str(buffer, "<C-b>", "buffer for unicode/b/CTRL wrapbracket"); is_int (len, 5, "length 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_KEY;
key.code.codepoint = 'c'; key.code.codepoint = 'c';
key.modifiers = TERMKEY_KEYMOD_ALT; key.modifiers = TERMKEY_KEYMOD_ALT;
key.utf8[0] = 0; key.multibyte[0] = 0;
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 3, "length for unicode/c/ALT"); is_int (len, 3, "length for unicode/c/ALT");
is_str(buffer, "A-c", "buffer for unicode/c/ALT"); is_str (buffer, "A-c", "buffer for unicode/c/ALT");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_LONGMOD); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 5, "length for unicode/c/ALT longmod"); TERMKEY_FORMAT_LONGMOD);
is_str(buffer, "Alt-c", "buffer for unicode/c/ALT longmod"); is_int (len, 5, "length for unicode/c/ALT longmod");
is_str (buffer, "Alt-c", "buffer for unicode/c/ALT longmod");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_ALTISMETA); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 3, "length for unicode/c/ALT altismeta"); TERMKEY_FORMAT_ALTISMETA);
is_str(buffer, "M-c", "buffer for unicode/c/ALT altismeta"); is_int (len, 3, "length for unicode/c/ALT altismeta");
is_str (buffer, "M-c", "buffer for unicode/c/ALT altismeta");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_ALTISMETA); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 6, "length for unicode/c/ALT longmod|altismeta"); TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_ALTISMETA);
is_str(buffer, "Meta-c", "buffer for unicode/c/ALT longmod|altismeta"); is_int (len, 6, "length for unicode/c/ALT longmod|altismeta");
is_str (buffer, "Meta-c", "buffer for unicode/c/ALT longmod|altismeta");
key.type = TERMKEY_TYPE_KEYSYM; key.type = TERMKEY_TYPE_KEYSYM;
key.code.sym = TERMKEY_SYM_UP; key.code.sym = TERMKEY_SYM_UP;
key.modifiers = 0; key.modifiers = 0;
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 2, "length for sym/Up/0"); is_int (len, 2, "length for sym/Up/0");
is_str(buffer, "Up", "buffer for sym/Up/0"); is_str (buffer, "Up", "buffer for sym/Up/0");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_WRAPBRACKET); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 4, "length for sym/Up/0 wrapbracket"); TERMKEY_FORMAT_WRAPBRACKET);
is_str(buffer, "<Up>", "buffer for sym/Up/0 wrapbracket"); is_int (len, 4, "length for sym/Up/0 wrapbracket");
is_str (buffer, "<Up>", "buffer for sym/Up/0 wrapbracket");
key.type = TERMKEY_TYPE_KEYSYM; key.type = TERMKEY_TYPE_KEYSYM;
key.code.sym = TERMKEY_SYM_PAGEUP; key.code.sym = TERMKEY_SYM_PAGEUP;
key.modifiers = 0; key.modifiers = 0;
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 6, "length for sym/PageUp/0"); is_int (len, 6, "length for sym/PageUp/0");
is_str(buffer, "PageUp", "buffer for sym/PageUp/0"); is_str (buffer, "PageUp", "buffer for sym/PageUp/0");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_LOWERSPACE); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 7, "length for sym/PageUp/0 lowerspace"); TERMKEY_FORMAT_LOWERSPACE);
is_str(buffer, "page up", "buffer for sym/PageUp/0 lowerspace"); is_int (len, 7, "length for sym/PageUp/0 lowerspace");
is_str (buffer, "page up", "buffer for sym/PageUp/0 lowerspace");
/* If size of buffer is too small, strfkey should return something consistent */ /* If size of buffer is too small,
len = termkey_strfkey(tk, buffer, 4, &key, 0); * strfkey should return something consistent */
is_int(len, 6, "length for sym/PageUp/0"); len = termkey_strfkey (tk, buffer, 4, &key, 0);
is_str(buffer, "Pag", "buffer of len 4 for sym/PageUp/0"); is_int (len, 6, "length for sym/PageUp/0");
is_str (buffer, "Pag", "buffer of len 4 for sym/PageUp/0");
len = termkey_strfkey(tk, buffer, 4, &key, TERMKEY_FORMAT_LOWERSPACE); len = termkey_strfkey (tk, buffer, 4, &key, TERMKEY_FORMAT_LOWERSPACE);
is_int(len, 7, "length for sym/PageUp/0 lowerspace"); is_int (len, 7, "length for sym/PageUp/0 lowerspace");
is_str(buffer, "pag", "buffer of len 4 for sym/PageUp/0 lowerspace"); is_str (buffer, "pag", "buffer of len 4 for sym/PageUp/0 lowerspace");
key.type = TERMKEY_TYPE_FUNCTION; key.type = TERMKEY_TYPE_FUNCTION;
key.code.number = 5; key.code.number = 5;
key.modifiers = 0; key.modifiers = 0;
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 2, "length for func/5/0"); is_int (len, 2, "length for func/5/0");
is_str(buffer, "F5", "buffer for func/5/0"); is_str (buffer, "F5", "buffer for func/5/0");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_WRAPBRACKET); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 4, "length for func/5/0 wrapbracket"); TERMKEY_FORMAT_WRAPBRACKET);
is_str(buffer, "<F5>", "buffer for func/5/0 wrapbracket"); is_int (len, 4, "length for func/5/0 wrapbracket");
is_str (buffer, "<F5>", "buffer for func/5/0 wrapbracket");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_LOWERSPACE); len = termkey_strfkey (tk, buffer, sizeof buffer, &key,
is_int(len, 2, "length for func/5/0 lowerspace"); TERMKEY_FORMAT_LOWERSPACE);
is_str(buffer, "f5", "buffer for func/5/0 lowerspace"); is_int (len, 2, "length for func/5/0 lowerspace");
is_str (buffer, "f5", "buffer for func/5/0 lowerspace");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

204
t/12strpkey.c
View File

@ -1,121 +1,157 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
const char *endp; const char *endp;
#define CLEAR_KEY do { key.type = -1; key.code.codepoint = -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.multibyte[0] = 0; } while (0)
plan_tests(62); plan_tests (62);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "A", &key, 0); endp = termkey_strpkey (tk, "A", &key, 0);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/A/0"); is_int (key.type, TERMKEY_TYPE_KEY, "key.type for unicode/A/0");
is_int(key.code.codepoint, 'A', "key.code.codepoint 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.multibyte, "A", "key.multibyte for unicode/A/0");
is_str(endp, "", "consumed entire input for unicode/A/0"); is_str (endp, "", "consumed entire input for unicode/A/0");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "A and more", &key, 0); 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.type, TERMKEY_TYPE_KEY,
is_int(key.code.codepoint, 'A', "key.code.codepoint for unicode/A/0 trailing"); "key.type for unicode/A/0 trailing");
is_int(key.modifiers, 0, "key.modifiers for unicode/A/0 trailing"); is_int (key.code.codepoint, 'A',
is_str(key.utf8, "A", "key.utf8 for unicode/A/0 trailing"); "key.code.codepoint for unicode/A/0 trailing");
is_str(endp, " and more", "points at string tail for unicode/A/0 trailing"); is_int (key.modifiers, 0, "key.modifiers for unicode/A/0 trailing");
is_str (key.multibyte, "A", "key.multibyte for unicode/A/0 trailing");
is_str (endp, " and more",
"points at string tail for unicode/A/0 trailing");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "C-b", &key, 0); endp = termkey_strpkey (tk, "C-b", &key, 0);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL"); is_int (key.type, TERMKEY_TYPE_KEY, "key.type for unicode/b/CTRL");
is_int(key.code.codepoint, 'b', "key.code.codepoint 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,
is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL"); "key.modifiers for unicode/b/CTRL");
is_str(endp, "", "consumed entire input for unicode/b/CTRL"); is_str (key.multibyte, "b", "key.multibyte for unicode/b/CTRL");
is_str (endp, "", "consumed entire input for unicode/b/CTRL");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "Ctrl-b", &key, TERMKEY_FORMAT_LONGMOD); endp = termkey_strpkey (tk, "Ctrl-b", &key, TERMKEY_FORMAT_LONGMOD);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL longmod"); is_int (key.type, TERMKEY_TYPE_KEY,
is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL longmod"); "key.type for unicode/b/CTRL longmod");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL longmod"); is_int (key.code.codepoint, 'b',
is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL longmod"); "key.code.codepoint for unicode/b/CTRL longmod");
is_str(endp, "", "consumed entire input for unicode/b/CTRL longmod"); is_int (key.modifiers, TERMKEY_KEYMOD_CTRL,
"key.modifiers for unicode/b/CTRL longmod");
is_str (key.multibyte, "b", "key.multibyte for unicode/b/CTRL longmod");
is_str (endp, "", "consumed entire input for unicode/b/CTRL longmod");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "^B", &key, TERMKEY_FORMAT_CARETCTRL); endp = termkey_strpkey (tk, "^B", &key, TERMKEY_FORMAT_CARETCTRL);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL caretctrl"); is_int (key.type, TERMKEY_TYPE_KEY,
is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL caretctrl"); "key.type for unicode/b/CTRL caretctrl");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL caretctrl"); is_int (key.code.codepoint, 'b',
is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL caretctrl"); "key.code.codepoint for unicode/b/CTRL caretctrl");
is_str(endp, "", "consumed entire input for unicode/b/CTRL caretctrl"); is_int (key.modifiers, TERMKEY_KEYMOD_CTRL,
"key.modifiers for unicode/b/CTRL caretctrl");
is_str (key.multibyte, "b", "key.multibyte for unicode/b/CTRL caretctrl");
is_str (endp, "", "consumed entire input for unicode/b/CTRL caretctrl");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "A-c", &key, 0); endp = termkey_strpkey (tk, "A-c", &key, 0);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT"); is_int (key.type, TERMKEY_TYPE_KEY, "key.type for unicode/c/ALT");
is_int(key.code.codepoint, 'c', "key.code.codepoint 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,
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT"); "key.modifiers for unicode/c/ALT");
is_str(endp, "", "consumed entire input for unicode/c/ALT"); is_str (key.multibyte, "c", "key.multibyte for unicode/c/ALT");
is_str (endp, "", "consumed entire input for unicode/c/ALT");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "Alt-c", &key, TERMKEY_FORMAT_LONGMOD); endp = termkey_strpkey (tk, "Alt-c", &key, TERMKEY_FORMAT_LONGMOD);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT longmod"); is_int (key.type, TERMKEY_TYPE_KEY,
is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT longmod"); "key.type for unicode/c/ALT longmod");
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT longmod"); is_int (key.code.codepoint, 'c',
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT longmod"); "key.code.codepoint for unicode/c/ALT longmod");
is_str(endp, "", "consumed entire input for unicode/c/ALT longmod"); is_int (key.modifiers, TERMKEY_KEYMOD_ALT,
"key.modifiers for unicode/c/ALT longmod");
is_str (key.multibyte, "c", "key.multibyte for unicode/c/ALT longmod");
is_str (endp, "", "consumed entire input for unicode/c/ALT longmod");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "M-c", &key, TERMKEY_FORMAT_ALTISMETA); endp = termkey_strpkey (tk, "M-c", &key, TERMKEY_FORMAT_ALTISMETA);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta"); is_int (key.type, TERMKEY_TYPE_KEY,
is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta"); "key.type for unicode/c/ALT altismeta");
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta"); is_int (key.code.codepoint, 'c',
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta"); "key.code.codepoint for unicode/c/ALT altismeta");
is_str(endp, "", "consumed entire input for unicode/c/ALT altismeta"); is_int (key.modifiers, TERMKEY_KEYMOD_ALT,
"key.modifiers for unicode/c/ALT altismeta");
is_str (key.multibyte, "c", "key.multibyte for unicode/c/ALT altismeta");
is_str (endp, "", "consumed entire input for unicode/c/ALT altismeta");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "Meta-c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD); endp = termkey_strpkey (tk, "Meta-c", &key,
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta+longmod"); TERMKEY_FORMAT_ALTISMETA | TERMKEY_FORMAT_LONGMOD);
is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta+longmod"); is_int (key.type, TERMKEY_TYPE_KEY,
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta+longmod"); "key.type for unicode/c/ALT altismeta+longmod");
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta+longmod"); is_int (key.code.codepoint, 'c',
is_str(endp, "", "consumed entire input for unicode/c/ALT altismeta+longmod"); "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_str (key.multibyte, "c", "key.multibyte for unicode/c/ALT altismeta+longmod");
is_str (endp, "",
"consumed entire input for unicode/c/ALT altismeta+longmod");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "meta c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_SPACEMOD|TERMKEY_FORMAT_LOWERMOD); endp = termkey_strpkey (tk, "meta c", &key,
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta+long/space+lowermod"); TERMKEY_FORMAT_ALTISMETA | TERMKEY_FORMAT_LONGMOD
is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta+long/space+lowermod"); | TERMKEY_FORMAT_SPACEMOD | TERMKEY_FORMAT_LOWERMOD);
is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta+long/space+lowermod"); is_int (key.type, TERMKEY_TYPE_KEY,
is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta+long/space_lowermod"); "key.type for unicode/c/ALT altismeta+long/space+lowermod");
is_str(endp, "", "consumed entire input for unicode/c/ALT altismeta+long/space+lowermod"); is_int (key.code.codepoint, 'c',
"key.code.codepoint for unicode/c/ALT altismeta+long/space+lowermod");
is_int (key.modifiers, TERMKEY_KEYMOD_ALT,
"key.modifiers for unicode/c/ALT altismeta+long/space+lowermod");
is_str (key.multibyte, "c",
"key.multibyte for unicode/c/ALT altismeta+long/space_lowermod");
is_str (endp, "",
"consumed entire input for unicode/c/ALT altismeta+long/space+lowermod");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "ctrl alt page up", &key, TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_SPACEMOD|TERMKEY_FORMAT_LOWERMOD|TERMKEY_FORMAT_LOWERSPACE); endp = termkey_strpkey (tk, "ctrl alt page up", &key,
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace"); TERMKEY_FORMAT_LONGMOD | TERMKEY_FORMAT_SPACEMOD
is_int(key.code.sym, TERMKEY_SYM_PAGEUP, "key.code.codepoint for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace"); | TERMKEY_FORMAT_LOWERMOD | TERMKEY_FORMAT_LOWERSPACE);
is_int(key.modifiers, TERMKEY_KEYMOD_ALT | TERMKEY_KEYMOD_CTRL, is_int (key.type, TERMKEY_TYPE_KEYSYM,
"key.type for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace");
is_int (key.code.sym, TERMKEY_SYM_PAGEUP,
"key.code.codepoint for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace");
is_int (key.modifiers, TERMKEY_KEYMOD_ALT | TERMKEY_KEYMOD_CTRL,
"key.modifiers for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace"); "key.modifiers for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace");
is_str(endp, "", "consumed entire input for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace"); is_str (endp, "",
"consumed entire input for sym/PageUp/CTRL+ALT"
" long/space/lowermod+lowerspace");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "Up", &key, 0); endp = termkey_strpkey (tk, "Up", &key, 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.codepoint 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");
is_str(endp, "", "consumed entire input for sym/Up/0"); is_str (endp, "", "consumed entire input for sym/Up/0");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "F5", &key, 0); endp = termkey_strpkey (tk, "F5", &key, 0);
is_int(key.type, TERMKEY_TYPE_FUNCTION, "key.type for func/5/0"); is_int (key.type, TERMKEY_TYPE_FUNCTION, "key.type for func/5/0");
is_int(key.code.number, 5, "key.code.number for func/5/0"); is_int (key.code.number, 5, "key.code.number for func/5/0");
is_int(key.modifiers, 0, "key.modifiers for func/5/0"); is_int (key.modifiers, 0, "key.modifiers for func/5/0");
is_str(endp, "", "consumed entire input for func/5/0"); is_str (endp, "", "consumed entire input for func/5/0");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

58
t/13cmpkey.c
View File

@ -1,62 +1,72 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key1, key2; termkey_key_t key1, key2;
plan_tests(12); plan_tests (12);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
key1.type = TERMKEY_TYPE_UNICODE; key1.type = TERMKEY_TYPE_KEY;
key1.code.codepoint = 'A'; key1.code.codepoint = 'A';
key1.modifiers = 0; key1.modifiers = 0;
is_int(termkey_keycmp(tk, &key1, &key1), 0, "cmpkey same structure"); is_int (termkey_keycmp (tk, &key1, &key1), 0, "cmpkey same structure");
key2.type = TERMKEY_TYPE_UNICODE; key2.type = TERMKEY_TYPE_KEY;
key2.code.codepoint = 'A'; key2.code.codepoint = 'A';
key2.modifiers = 0; key2.modifiers = 0;
is_int(termkey_keycmp(tk, &key1, &key2), 0, "cmpkey identical structure"); is_int (termkey_keycmp (tk, &key1, &key2), 0, "cmpkey identical structure");
key2.modifiers = TERMKEY_KEYMOD_CTRL; key2.modifiers = TERMKEY_KEYMOD_CTRL;
ok(termkey_keycmp(tk, &key1, &key2) < 0, "cmpkey orders CTRL after nomod"); ok (termkey_keycmp (tk, &key1, &key2) < 0,
ok(termkey_keycmp(tk, &key2, &key1) > 0, "cmpkey orders nomod before CTRL"); "cmpkey orders CTRL after nomod");
ok (termkey_keycmp (tk, &key2, &key1) > 0,
"cmpkey orders nomod before CTRL");
key2.code.codepoint = 'B'; key2.code.codepoint = 'B';
key2.modifiers = 0; key2.modifiers = 0;
ok(termkey_keycmp(tk, &key1, &key2) < 0, "cmpkey orders 'B' after 'A'"); ok (termkey_keycmp (tk, &key1, &key2) < 0, "cmpkey orders 'B' after 'A'");
ok(termkey_keycmp(tk, &key2, &key1) > 0, "cmpkey orders 'A' before 'B'"); ok (termkey_keycmp (tk, &key2, &key1) > 0, "cmpkey orders 'A' before 'B'");
key1.modifiers = TERMKEY_KEYMOD_CTRL; key1.modifiers = TERMKEY_KEYMOD_CTRL;
ok(termkey_keycmp(tk, &key1, &key2) < 0, "cmpkey orders nomod 'B' after CTRL 'A'"); ok (termkey_keycmp (tk, &key1, &key2) < 0,
ok(termkey_keycmp(tk, &key2, &key1) > 0, "cmpkey orders CTRL 'A' before nomod 'B'"); "cmpkey orders nomod 'B' after CTRL 'A'");
ok (termkey_keycmp (tk, &key2, &key1) > 0,
"cmpkey orders CTRL 'A' before nomod 'B'");
key2.type = TERMKEY_TYPE_KEYSYM; key2.type = TERMKEY_TYPE_KEYSYM;
key2.code.sym = TERMKEY_SYM_UP; key2.code.sym = TERMKEY_SYM_UP;
ok(termkey_keycmp(tk, &key1, &key2) < 0, "cmpkey orders KEYSYM after UNICODE"); ok (termkey_keycmp (tk, &key1, &key2) < 0,
ok(termkey_keycmp(tk, &key2, &key1) > 0, "cmpkey orders UNICODE before KEYSYM"); "cmpkey orders KEYSYM after KEY");
ok (termkey_keycmp (tk, &key2, &key1) > 0,
"cmpkey orders KEY before KEYSYM");
key1.type = TERMKEY_TYPE_KEYSYM; key1.type = TERMKEY_TYPE_KEYSYM;
key1.code.sym = TERMKEY_SYM_SPACE; key1.code.sym = TERMKEY_SYM_SPACE;
key1.modifiers = 0; key1.modifiers = 0;
key2.type = TERMKEY_TYPE_UNICODE; key2.type = TERMKEY_TYPE_KEY;
key2.code.codepoint = ' '; key2.code.codepoint = ' ';
key2.modifiers = 0; key2.modifiers = 0;
is_int(termkey_keycmp(tk, &key1, &key2), 0, "cmpkey considers KEYSYM/SPACE and UNICODE/SP identical"); is_int (termkey_keycmp (tk, &key1, &key2), 0,
"cmpkey considers KEYSYM/SPACE and KEY/SP identical");
termkey_set_canonflags(tk, termkey_get_canonflags(tk) | TERMKEY_CANON_SPACESYMBOL); termkey_set_canonflags (tk,
is_int(termkey_keycmp(tk, &key1, &key2), 0, "cmpkey considers KEYSYM/SPACE and UNICODE/SP identical under SPACESYMBOL"); termkey_get_canonflags (tk) | TERMKEY_CANON_SPACESYMBOL);
is_int (termkey_keycmp (tk, &key1, &key2), 0,
"cmpkey considers KEYSYM/SPACE and KEY/SP"
" identical under SPACESYMBOL");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

93
t/20canon.c
View File

@ -1,67 +1,74 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
const char *endp; const char *endp;
#define CLEAR_KEY do { key.type = -1; key.code.codepoint = -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.multibyte[0] = 0; } while (0)
plan_tests(26); plan_tests (26);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, " ", &key, 0); endp = termkey_strpkey (tk, " ", &key, 0);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for SP/unicode"); is_int (key.type, TERMKEY_TYPE_KEY, "key.type for SP/unicode");
is_int(key.code.codepoint, ' ', "key.code.codepoint for SP/unicode"); is_int (key.code.codepoint, ' ', "key.code.codepoint for SP/unicode");
is_int(key.modifiers, 0, "key.modifiers for SP/unicode"); is_int (key.modifiers, 0, "key.modifiers for SP/unicode");
is_str(key.utf8, " ", "key.utf8 for SP/unicode"); is_str (key.multibyte, " ", "key.multibyte for SP/unicode");
is_str(endp, "", "consumed entire input for SP/unicode"); is_str (endp, "", "consumed entire input for SP/unicode");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "Space", &key, 0); endp = termkey_strpkey (tk, "Space", &key, 0);
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for Space/unicode"); is_int (key.type, TERMKEY_TYPE_KEY, "key.type for Space/unicode");
is_int(key.code.codepoint, ' ', "key.code.codepoint for Space/unicode"); is_int (key.code.codepoint, ' ', "key.code.codepoint for Space/unicode");
is_int(key.modifiers, 0, "key.modifiers for Space/unicode"); is_int (key.modifiers, 0, "key.modifiers for Space/unicode");
is_str(key.utf8, " ", "key.utf8 for Space/unicode"); is_str (key.multibyte, " ", "key.multibyte for Space/unicode");
is_str(endp, "", "consumed entire input for Space/unicode"); is_str (endp, "", "consumed entire input for Space/unicode");
termkey_set_canonflags(tk, termkey_get_canonflags(tk) | TERMKEY_CANON_SPACESYMBOL); termkey_set_canonflags (tk,
termkey_get_canonflags (tk) | TERMKEY_CANON_SPACESYMBOL);
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, " ", &key, 0); endp = termkey_strpkey (tk, " ", &key, 0);
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for SP/symbol"); is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type for SP/symbol");
is_int(key.code.sym, TERMKEY_SYM_SPACE, "key.code.codepoint for SP/symbol"); is_int (key.code.sym, TERMKEY_SYM_SPACE,
is_int(key.modifiers, 0, "key.modifiers for SP/symbol"); "key.code.codepoint for SP/symbol");
is_str(endp, "", "consumed entire input for SP/symbol"); is_int (key.modifiers, 0, "key.modifiers for SP/symbol");
is_str (endp, "", "consumed entire input for SP/symbol");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "Space", &key, 0); endp = termkey_strpkey (tk, "Space", &key, 0);
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for Space/symbol"); is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type for Space/symbol");
is_int(key.code.sym, TERMKEY_SYM_SPACE, "key.code.codepoint for Space/symbol"); is_int (key.code.sym, TERMKEY_SYM_SPACE,
is_int(key.modifiers, 0, "key.modifiers for Space/symbol"); "key.code.codepoint for Space/symbol");
is_str(endp, "", "consumed entire input for Space/symbol"); is_int (key.modifiers, 0, "key.modifiers for Space/symbol");
is_str (endp, "", "consumed entire input for Space/symbol");
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "DEL", &key, 0); endp = termkey_strpkey (tk, "DEL", &key, 0);
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for Del/unconverted"); is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type for Del/unconverted");
is_int(key.code.sym, TERMKEY_SYM_DEL, "key.code.codepoint for Del/unconverted"); is_int (key.code.sym, TERMKEY_SYM_DEL,
is_int(key.modifiers, 0, "key.modifiers for Del/unconverted"); "key.code.codepoint for Del/unconverted");
is_str(endp, "", "consumed entire input for Del/unconverted"); is_int (key.modifiers, 0, "key.modifiers for Del/unconverted");
is_str (endp, "", "consumed entire input for Del/unconverted");
termkey_set_canonflags(tk, termkey_get_canonflags(tk) | TERMKEY_CANON_DELBS); termkey_set_canonflags (tk,
termkey_get_canonflags (tk) | TERMKEY_CANON_DELBS);
CLEAR_KEY; CLEAR_KEY;
endp = termkey_strpkey(tk, "DEL", &key, 0); endp = termkey_strpkey (tk, "DEL", &key, 0);
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for Del/as-backspace"); is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type for Del/as-backspace");
is_int(key.code.sym, TERMKEY_SYM_BACKSPACE, "key.code.codepoint for Del/as-backspace"); is_int (key.code.sym, TERMKEY_SYM_BACKSPACE,
is_int(key.modifiers, 0, "key.modifiers for Del/as-backspace"); "key.code.codepoint for Del/as-backspace");
is_str(endp, "", "consumed entire input for Del/as-backspace"); is_int (key.modifiers, 0, "key.modifiers for Del/as-backspace");
is_str (endp, "", "consumed entire input for Del/as-backspace");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

189
t/30mouse.c
View File

@ -1,155 +1,174 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
TermKeyMouseEvent ev; termkey_mouse_event_t ev;
int button, line, col; int button, line, col;
char buffer[32]; char buffer[32];
size_t len; size_t len;
plan_tests(60); plan_tests (60);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
termkey_push_bytes(tk, "\e[M !!", 6); termkey_push_bytes (tk, "\e[M !!", 6);
key.type = -1; key.type = -1;
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for mouse press");
is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse press"); is_int (key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse press");
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_PRESS, "mouse event for press"); is_int (ev, TERMKEY_MOUSE_PRESS, "mouse event for press");
is_int(button, 1, "mouse button for press"); is_int (button, 1, "mouse button for press");
is_int(line, 1, "mouse line for press"); is_int (line, 1, "mouse line for press");
is_int(col, 1, "mouse column for press"); is_int (col, 1, "mouse column for press");
is_int(key.modifiers, 0, "modifiers for press"); is_int (key.modifiers, 0, "modifiers for press");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 13, "string length for press"); is_int (len, 13, "string length for press");
is_str(buffer, "MousePress(1)", "string buffer for press"); is_str (buffer, "MousePress(1)", "string buffer for press");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_MOUSE_POS); len = termkey_strfkey (tk, buffer, sizeof buffer,
is_int(len, 21, "string length for press"); &key, TERMKEY_FORMAT_MOUSE_POS);
is_str(buffer, "MousePress(1) @ (1,1)", "string buffer for press"); is_int (len, 21, "string length for press");
is_str (buffer, "MousePress(1) @ (1,1)", "string buffer for press");
termkey_push_bytes(tk, "\e[M@\"!", 6); termkey_push_bytes (tk, "\e[M@\"!", 6);
key.type = -1; key.type = -1;
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
termkey_getkey(tk, &key); termkey_getkey (tk, &key);
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_DRAG, "mouse event for drag"); is_int (ev, TERMKEY_MOUSE_DRAG, "mouse event for drag");
is_int(button, 1, "mouse button for drag"); is_int (button, 1, "mouse button for drag");
is_int(line, 1, "mouse line for drag"); is_int (line, 1, "mouse line for drag");
is_int(col, 2, "mouse column for drag"); is_int (col, 2, "mouse column for drag");
is_int(key.modifiers, 0, "modifiers for press"); is_int (key.modifiers, 0, "modifiers for press");
termkey_push_bytes(tk, "\e[M##!", 6); termkey_push_bytes (tk, "\e[M##!", 6);
key.type = -1; key.type = -1;
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
termkey_getkey(tk, &key); termkey_getkey (tk, &key);
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_RELEASE, "mouse event for release"); is_int (ev, TERMKEY_MOUSE_RELEASE, "mouse event for release");
is_int(line, 1, "mouse line for release"); is_int (line, 1, "mouse line for release");
is_int(col, 3, "mouse column for release"); is_int (col, 3, "mouse column for release");
is_int(key.modifiers, 0, "modifiers for press"); is_int (key.modifiers, 0, "modifiers for press");
termkey_push_bytes(tk, "\e[M0++", 6); termkey_push_bytes (tk, "\e[M0++", 6);
key.type = -1; key.type = -1;
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
termkey_getkey(tk, &key); termkey_getkey (tk, &key);
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_PRESS, "mouse event for Ctrl-press"); is_int (ev, TERMKEY_MOUSE_PRESS, "mouse event for Ctrl-press");
is_int(button, 1, "mouse button for Ctrl-press"); is_int (button, 1, "mouse button for Ctrl-press");
is_int(line, 11, "mouse line for Ctrl-press"); is_int (line, 11, "mouse line for Ctrl-press");
is_int(col, 11, "mouse column for Ctrl-press"); is_int (col, 11, "mouse column for Ctrl-press");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "modifiers for Ctrl-press"); is_int (key.modifiers, TERMKEY_KEYMOD_CTRL, "modifiers for Ctrl-press");
len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0);
is_int(len, 15, "string length for Ctrl-press"); is_int (len, 15, "string length for Ctrl-press");
is_str(buffer, "C-MousePress(1)", "string buffer for Ctrl-press"); is_str (buffer, "C-MousePress(1)", "string buffer for Ctrl-press");
// rxvt protocol // rxvt protocol
termkey_push_bytes(tk, "\e[0;20;20M", 10); termkey_push_bytes (tk, "\e[0;20;20M", 10);
key.type = -1; key.type = -1;
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press rxvt protocol"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for mouse press rxvt protocol");
is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse press rxvt protocol"); is_int (key.type, TERMKEY_TYPE_MOUSE,
"key.type for mouse press rxvt protocol");
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_PRESS, "mouse event for press rxvt protocol"); is_int (ev, TERMKEY_MOUSE_PRESS, "mouse event for press rxvt protocol");
is_int(button, 1, "mouse button for press rxvt protocol"); is_int (button, 1, "mouse button for press rxvt protocol");
is_int(line, 20, "mouse line for press rxvt protocol"); is_int (line, 20, "mouse line for press rxvt protocol");
is_int(col, 20, "mouse column for press rxvt protocol"); is_int (col, 20, "mouse column for press rxvt protocol");
is_int(key.modifiers, 0, "modifiers for press rxvt protocol"); is_int (key.modifiers, 0, "modifiers for press rxvt protocol");
termkey_push_bytes(tk, "\e[3;20;20M", 10); termkey_push_bytes (tk, "\e[3;20;20M", 10);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse release rxvt protocol"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for mouse release rxvt protocol");
is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse release rxvt protocol"); is_int (key.type, TERMKEY_TYPE_MOUSE,
"key.type for mouse release rxvt protocol");
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_RELEASE, "mouse event for release rxvt protocol"); is_int (ev, TERMKEY_MOUSE_RELEASE, "mouse event for release rxvt protocol");
is_int(line, 20, "mouse line for release rxvt protocol"); is_int (line, 20, "mouse line for release rxvt protocol");
is_int(col, 20, "mouse column for release rxvt protocol"); is_int (col, 20, "mouse column for release rxvt protocol");
is_int(key.modifiers, 0, "modifiers for release rxvt protocol"); is_int (key.modifiers, 0, "modifiers for release rxvt protocol");
// SGR protocol // SGR protocol
termkey_push_bytes(tk, "\e[<0;30;30M", 11); termkey_push_bytes (tk, "\e[<0;30;30M", 11);
key.type = -1; key.type = -1;
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press SGR encoding"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for mouse press SGR encoding");
is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse press SGR encoding"); is_int (key.type, TERMKEY_TYPE_MOUSE,
"key.type for mouse press SGR encoding");
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_PRESS, "mouse event for press SGR"); is_int (ev, TERMKEY_MOUSE_PRESS, "mouse event for press SGR");
is_int(button, 1, "mouse button for press SGR"); is_int (button, 1, "mouse button for press SGR");
is_int(line, 30, "mouse line for press SGR"); is_int (line, 30, "mouse line for press SGR");
is_int(col, 30, "mouse column for press SGR"); is_int (col, 30, "mouse column for press SGR");
is_int(key.modifiers, 0, "modifiers for press SGR"); is_int (key.modifiers, 0, "modifiers for press SGR");
termkey_push_bytes(tk, "\e[<0;30;30m", 11); termkey_push_bytes (tk, "\e[<0;30;30m", 11);
key.type = -1; key.type = -1;
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse release SGR encoding"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for mouse release SGR encoding");
is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse release SGR encoding"); is_int (key.type, TERMKEY_TYPE_MOUSE,
"key.type for mouse release SGR encoding");
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); is_int (termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col),
TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
is_int(ev, TERMKEY_MOUSE_RELEASE, "mouse event for release SGR"); is_int (ev, TERMKEY_MOUSE_RELEASE, "mouse event for release SGR");
termkey_push_bytes(tk, "\e[<0;500;300M", 13); termkey_push_bytes (tk, "\e[<0;500;300M", 13);
key.type = -1; key.type = -1;
ev = -1; button = -1; line = -1; col = -1; ev = -1; button = -1; line = -1; col = -1;
termkey_getkey(tk, &key); termkey_getkey (tk, &key);
termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col); termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col);
is_int(line, 300, "mouse line for press SGR wide"); is_int (line, 300, "mouse line for press SGR wide");
is_int(col, 500, "mouse column for press SGR wide"); is_int (col, 500, "mouse column for press SGR wide");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status(); return exit_status ();
} }

42
t/31position.c
View File

@ -1,38 +1,38 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
int line, col; int line, col;
plan_tests(8); plan_tests (8);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
termkey_push_bytes(tk, "\e[?15;7R", 8); termkey_push_bytes (tk, "\e[?15;7R", 8);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for position report"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for position report");
is_int(key.type, TERMKEY_TYPE_POSITION, "key.type for position report"); is_int (key.type, TERMKEY_TYPE_POSITION, "key.type for position report");
is_int(termkey_interpret_position(tk, &key, &line, &col), TERMKEY_RES_KEY, "interpret_position yields RES_KEY"); is_int (termkey_interpret_position (tk, &key, &line, &col), TERMKEY_RES_KEY,
"interpret_position yields RES_KEY");
is_int(line, 15, "line for position report"); is_int (line, 15, "line for position report");
is_int(col, 7, "column for position report"); is_int (col, 7, "column for position report");
/* A plain CSI R is likely to be <F3> though. /* A plain CSI R is likely to be <F3> though. This is tricky :/ */
* This is tricky :/ termkey_push_bytes (tk, "\e[R", 3);
*/
termkey_push_bytes(tk, "\e[R", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for <F3>"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for <F3>");
is_int(key.type, TERMKEY_TYPE_FUNCTION, "key.type for <F3>"); is_int (key.type, TERMKEY_TYPE_FUNCTION, "key.type for <F3>");
is_int(key.code.number, 3, "key.code.number for <F3>"); is_int (key.code.number, 3, "key.code.number for <F3>");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

48
t/32modereport.c
View File

@ -1,41 +1,45 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
int initial, mode, value; int initial, mode, value;
plan_tests(12); plan_tests (12);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
termkey_push_bytes(tk, "\e[?1;2$y", 8); termkey_push_bytes (tk, "\e[?1;2$y", 8);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mode report"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for mode report");
is_int(key.type, TERMKEY_TYPE_MODEREPORT, "key.type for mode report"); is_int (key.type, TERMKEY_TYPE_MODEREPORT, "key.type for mode report");
is_int(termkey_interpret_modereport(tk, &key, &initial, &mode, &value), TERMKEY_RES_KEY, "interpret_modereoprt yields RES_KEY"); is_int (termkey_interpret_modereport (tk, &key, &initial, &mode, &value),
TERMKEY_RES_KEY, "interpret_modereoprt yields RES_KEY");
is_int(initial, '?', "initial indicator from mode report"); is_int (initial, '?', "initial indicator from mode report");
is_int(mode, 1, "mode number from mode report"); is_int (mode, 1, "mode number from mode report");
is_int(value, 2, "mode value from mode report"); is_int (value, 2, "mode value from mode report");
termkey_push_bytes(tk, "\e[4;1$y", 7); termkey_push_bytes (tk, "\e[4;1$y", 7);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mode report"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for mode report");
is_int(key.type, TERMKEY_TYPE_MODEREPORT, "key.type for mode report"); is_int (key.type, TERMKEY_TYPE_MODEREPORT, "key.type for mode report");
is_int(termkey_interpret_modereport(tk, &key, &initial, &mode, &value), TERMKEY_RES_KEY, "interpret_modereoprt yields RES_KEY"); is_int (termkey_interpret_modereport (tk, &key, &initial, &mode, &value),
TERMKEY_RES_KEY, "interpret_modereoprt yields RES_KEY");
is_int(initial, 0, "initial indicator from mode report"); is_int (initial, 0, "initial indicator from mode report");
is_int(mode, 4, "mode number from mode report"); is_int (mode, 4, "mode number from mode report");
is_int(value, 1, "mode value from mode report"); is_int (value, 1, "mode value from mode report");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

58
t/39csi.c
View File

@ -1,46 +1,52 @@
#include "../termkey.h" #include "../termkey.h"
#include "taplib.h" #include "taplib.h"
int main(int argc, char *argv[]) int
main (int argc, char *argv[])
{ {
TermKey *tk; termkey_t *tk;
TermKeyKey key; termkey_key_t key;
long args[16]; long args[16];
size_t nargs = 16; size_t nargs = 16;
unsigned long command; unsigned long command;
plan_tests(15); plan_tests (15);
tk = termkey_new_abstract("vt100", 0); tk = termkey_new_abstract ("vt100", NULL, 0);
termkey_push_bytes(tk, "\e[5;25v", 7); termkey_push_bytes (tk, "\e[5;25v", 7);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for CSI v"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
"getkey yields RES_KEY for CSI v");
is_int(key.type, TERMKEY_TYPE_UNKNOWN_CSI, "key.type for unknown CSI"); is_int (key.type, TERMKEY_TYPE_UNKNOWN_CSI, "key.type for unknown CSI");
is_int(termkey_interpret_csi(tk, &key, args, &nargs, &command), TERMKEY_RES_KEY, "interpret_csi yields RES_KEY"); is_int (termkey_interpret_csi (tk, &key, args, &nargs, &command),
TERMKEY_RES_KEY, "interpret_csi yields RES_KEY");
is_int(nargs, 2, "nargs for unknown CSI"); is_int (nargs, 2, "nargs for unknown CSI");
is_int(args[0], 5, "args[0] for unknown CSI"); is_int (args[0], 5, "args[0] for unknown CSI");
is_int(args[1], 25, "args[1] for unknown CSI"); is_int (args[1], 25, "args[1] for unknown CSI");
is_int(command, 'v', "command for unknown CSI"); is_int (command, 'v', "command for unknown CSI");
termkey_push_bytes(tk, "\e[?w", 4); termkey_push_bytes (tk, "\e[?w", 4);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for CSI ? w"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_UNKNOWN_CSI, "key.type for unknown CSI"); "getkey yields RES_KEY for CSI ? w");
is_int(termkey_interpret_csi(tk, &key, args, &nargs, &command), TERMKEY_RES_KEY, "interpret_csi yields RES_KEY"); is_int (key.type, TERMKEY_TYPE_UNKNOWN_CSI, "key.type for unknown CSI");
is_int(command, '?'<<8 | 'w', "command for unknown CSI"); is_int (termkey_interpret_csi (tk, &key, args, &nargs, &command),
TERMKEY_RES_KEY, "interpret_csi yields RES_KEY");
is_int (command, ('?' << 8) | 'w', "command for unknown CSI");
termkey_push_bytes(tk, "\e[?$x", 5); termkey_push_bytes (tk, "\e[?$x", 5);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for CSI ? $x"); is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
is_int(key.type, TERMKEY_TYPE_UNKNOWN_CSI, "key.type for unknown CSI"); "getkey yields RES_KEY for CSI ? $x");
is_int(termkey_interpret_csi(tk, &key, args, &nargs, &command), TERMKEY_RES_KEY, "interpret_csi yields RES_KEY"); is_int (key.type, TERMKEY_TYPE_UNKNOWN_CSI, "key.type for unknown CSI");
is_int(command, '$'<<16 | '?'<<8 | 'x', "command for unknown CSI"); is_int (termkey_interpret_csi (tk, &key, args, &nargs, &command),
TERMKEY_RES_KEY, "interpret_csi yields RES_KEY");
is_int (command, ('$' << 16) | ('?' << 8) | 'x', "command for unknown CSI");
termkey_destroy(tk); termkey_destroy (tk);
return exit_status ();
return exit_status();
} }

76
t/taplib.c
View File

@ -4,66 +4,76 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
static int nexttest = 1; static int g_nexttest = 1;
static int _exit_status = 0; static int g_exit_status = 0;
void plan_tests(int n) void
plan_tests (int n)
{ {
printf("1..%d\n", n); printf ("1..%d\n", n);
} }
void pass(char *name) void
pass (char *name)
{ {
printf("ok %d - %s\n", nexttest++, name); printf ("ok %d - %s\n", g_nexttest++, name);
} }
void fail(char *name) void
fail (char *name)
{ {
printf("not ok %d - %s\n", nexttest++, name); printf ("not ok %d - %s\n", g_nexttest++, name);
_exit_status = 1; g_exit_status = 1;
} }
void ok(int cmp, char *name) void
ok (int cmp, char *name)
{ {
if(cmp) if (cmp)
pass(name); pass (name);
else else
fail(name); fail (name);
} }
void diag(char *fmt, ...) void
diag (char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start (args, fmt);
fprintf(stderr, "# "); fprintf (stderr, "# ");
vfprintf(stderr, fmt, args); vfprintf (stderr, fmt, args);
fprintf(stderr, "\n"); fprintf (stderr, "\n");
va_end(args); va_end (args);
} }
void is_int(int got, int expect, char *name) void
is_int (int got, int expect, char *name)
{ {
if(got == expect) if (got == expect)
ok(1, name); ok (1, name);
else { else
ok(0, name); {
diag("got %d expected %d", got, expect); ok (0, name);
diag ("got %d expected %d", got, expect);
} }
} }
void is_str(const char *got, const char *expect, char *name) void
is_str (const char *got, const char *expect, char *name)
{ {
if(strcmp(got, expect) == 0) if (strcmp (got, expect) == 0)
ok(1, name); ok (1, name);
else { else
ok(0, name); {
diag("got '%s' expected '%s'", got, expect); ok (0, name);
diag ("got '%s' expected '%s'", got, expect);
} }
} }
int exit_status(void) int
exit_status(void)
{ {
return _exit_status; return g_exit_status;
} }

14
t/taplib.h
View File

@ -1,7 +1,7 @@
void plan_tests(int n); void plan_tests (int n);
void ok(int cmp, char *name); void ok (int cmp, char *name);
void pass(char *name); void pass (char *name);
void fail(char *name); void fail (char *name);
void is_int(int got, int expect, char *name); void is_int (int got, int expect, char *name);
void is_str(const char *got, const char *expect, char *name); void is_str (const char *got, const char *expect, char *name);
int exit_status(void); int exit_status (void);