From 77878abe90a3bec0055faf6bd6e4871cc6f1a474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Tue, 14 Oct 2014 00:24:47 +0200 Subject: Renaming continued --- tests/12strpkey.c | 94 +++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'tests/12strpkey.c') diff --git a/tests/12strpkey.c b/tests/12strpkey.c index f67b67a..d21a547 100644 --- a/tests/12strpkey.c +++ b/tests/12strpkey.c @@ -1,11 +1,11 @@ -#include "../termkey.h" +#include "../termo.h" #include "taplib.h" int main (int argc, char *argv[]) { - termkey_t *tk; - termkey_key_t key; + termo_t *tk; + termo_key_t key; const char *endp; #define CLEAR_KEY do { key.type = -1; key.code.codepoint = -1; \ @@ -13,19 +13,19 @@ main (int argc, char *argv[]) plan_tests (62); - tk = termkey_new_abstract ("vt100", NULL, 0); + tk = termo_new_abstract ("vt100", NULL, 0); CLEAR_KEY; - endp = termkey_strpkey (tk, "A", &key, 0); - is_int (key.type, TERMKEY_TYPE_KEY, "key.type for unicode/A/0"); + endp = termo_strpkey (tk, "A", &key, 0); + is_int (key.type, TERMO_TYPE_KEY, "key.type 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_str (key.multibyte, "A", "key.multibyte for unicode/A/0"); is_str (endp, "", "consumed entire input for unicode/A/0"); CLEAR_KEY; - endp = termkey_strpkey (tk, "A and more", &key, 0); - is_int (key.type, TERMKEY_TYPE_KEY, + endp = termo_strpkey (tk, "A and more", &key, 0); + is_int (key.type, TERMO_TYPE_KEY, "key.type for unicode/A/0 trailing"); is_int (key.code.codepoint, 'A', "key.code.codepoint for unicode/A/0 trailing"); @@ -35,89 +35,89 @@ main (int argc, char *argv[]) "points at string tail for unicode/A/0 trailing"); CLEAR_KEY; - endp = termkey_strpkey (tk, "C-b", &key, 0); - is_int (key.type, TERMKEY_TYPE_KEY, "key.type for unicode/b/CTRL"); + endp = termo_strpkey (tk, "C-b", &key, 0); + is_int (key.type, TERMO_TYPE_KEY, "key.type for unicode/b/CTRL"); is_int (key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL"); - is_int (key.modifiers, TERMKEY_KEYMOD_CTRL, + is_int (key.modifiers, TERMO_KEYMOD_CTRL, "key.modifiers 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; - endp = termkey_strpkey (tk, "Ctrl-b", &key, TERMKEY_FORMAT_LONGMOD); - is_int (key.type, TERMKEY_TYPE_KEY, + endp = termo_strpkey (tk, "Ctrl-b", &key, TERMO_FORMAT_LONGMOD); + is_int (key.type, TERMO_TYPE_KEY, "key.type 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, + is_int (key.modifiers, TERMO_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; - endp = termkey_strpkey (tk, "^B", &key, TERMKEY_FORMAT_CARETCTRL); - is_int (key.type, TERMKEY_TYPE_KEY, + endp = termo_strpkey (tk, "^B", &key, TERMO_FORMAT_CARETCTRL); + is_int (key.type, TERMO_TYPE_KEY, "key.type 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, + is_int (key.modifiers, TERMO_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; - endp = termkey_strpkey (tk, "A-c", &key, 0); - is_int (key.type, TERMKEY_TYPE_KEY, "key.type for unicode/c/ALT"); + endp = termo_strpkey (tk, "A-c", &key, 0); + is_int (key.type, TERMO_TYPE_KEY, "key.type for unicode/c/ALT"); is_int (key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT"); - is_int (key.modifiers, TERMKEY_KEYMOD_ALT, + is_int (key.modifiers, TERMO_KEYMOD_ALT, "key.modifiers 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; - endp = termkey_strpkey (tk, "Alt-c", &key, TERMKEY_FORMAT_LONGMOD); - is_int (key.type, TERMKEY_TYPE_KEY, + endp = termo_strpkey (tk, "Alt-c", &key, TERMO_FORMAT_LONGMOD); + is_int (key.type, TERMO_TYPE_KEY, "key.type 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, + is_int (key.modifiers, TERMO_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; - endp = termkey_strpkey (tk, "M-c", &key, TERMKEY_FORMAT_ALTISMETA); - is_int (key.type, TERMKEY_TYPE_KEY, + endp = termo_strpkey (tk, "M-c", &key, TERMO_FORMAT_ALTISMETA); + is_int (key.type, TERMO_TYPE_KEY, "key.type 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, + is_int (key.modifiers, TERMO_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; - endp = termkey_strpkey (tk, "Meta-c", &key, - TERMKEY_FORMAT_ALTISMETA | TERMKEY_FORMAT_LONGMOD); - is_int (key.type, TERMKEY_TYPE_KEY, + endp = termo_strpkey (tk, "Meta-c", &key, + TERMO_FORMAT_ALTISMETA | TERMO_FORMAT_LONGMOD); + is_int (key.type, TERMO_TYPE_KEY, "key.type 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, + is_int (key.modifiers, TERMO_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; - endp = termkey_strpkey (tk, "meta c", &key, - TERMKEY_FORMAT_ALTISMETA | TERMKEY_FORMAT_LONGMOD - | TERMKEY_FORMAT_SPACEMOD | TERMKEY_FORMAT_LOWERMOD); - is_int (key.type, TERMKEY_TYPE_KEY, + endp = termo_strpkey (tk, "meta c", &key, + TERMO_FORMAT_ALTISMETA | TERMO_FORMAT_LONGMOD + | TERMO_FORMAT_SPACEMOD | TERMO_FORMAT_LOWERMOD); + is_int (key.type, TERMO_TYPE_KEY, "key.type 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, + is_int (key.modifiers, TERMO_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"); @@ -125,33 +125,33 @@ main (int argc, char *argv[]) "consumed entire input for unicode/c/ALT altismeta+long/space+lowermod"); CLEAR_KEY; - endp = termkey_strpkey (tk, "ctrl alt page up", &key, - TERMKEY_FORMAT_LONGMOD | TERMKEY_FORMAT_SPACEMOD - | TERMKEY_FORMAT_LOWERMOD | TERMKEY_FORMAT_LOWERSPACE); - is_int (key.type, TERMKEY_TYPE_KEYSYM, + endp = termo_strpkey (tk, "ctrl alt page up", &key, + TERMO_FORMAT_LONGMOD | TERMO_FORMAT_SPACEMOD + | TERMO_FORMAT_LOWERMOD | TERMO_FORMAT_LOWERSPACE); + is_int (key.type, TERMO_TYPE_KEYSYM, "key.type for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace"); - is_int (key.code.sym, TERMKEY_SYM_PAGEUP, + is_int (key.code.sym, TERMO_SYM_PAGEUP, "key.code.codepoint for sym/PageUp/CTRL+ALT long/space/lowermod+lowerspace"); - is_int (key.modifiers, TERMKEY_KEYMOD_ALT | TERMKEY_KEYMOD_CTRL, + is_int (key.modifiers, TERMO_KEYMOD_ALT | TERMO_KEYMOD_CTRL, "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"); CLEAR_KEY; - endp = termkey_strpkey (tk, "Up", &key, 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"); + endp = termo_strpkey (tk, "Up", &key, 0); + is_int (key.type, TERMO_TYPE_KEYSYM, "key.type for sym/Up/0"); + is_int (key.code.sym, TERMO_SYM_UP, "key.code.codepoint 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"); CLEAR_KEY; - endp = termkey_strpkey (tk, "F5", &key, 0); - is_int (key.type, TERMKEY_TYPE_FUNCTION, "key.type for func/5/0"); + endp = termo_strpkey (tk, "F5", &key, 0); + is_int (key.type, TERMO_TYPE_FUNCTION, "key.type 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_str (endp, "", "consumed entire input for func/5/0"); - termkey_destroy (tk); + termo_destroy (tk); return exit_status (); } -- cgit v1.2.3