1 files changed, 28 insertions, 28 deletions

diff --git a/tests/13cmpkey.c b/tests/13cmpkey.c
index 1e12b5c..46672f2 100644
--- a/tests/13cmpkey.c
+++ b/tests/13cmpkey.c
@@ -1,72 +1,72 @@
-#include "../termkey.h"
+#include "../termo.h"
 #include "taplib.h"
 
 int
 main (int argc, char *argv[])
 {
-	termkey_t *tk;
-	termkey_key_t key1, key2;
+	termo_t *tk;
+	termo_key_t key1, key2;
 
 	plan_tests (12);
 
-	tk = termkey_new_abstract ("vt100", NULL, 0);
+	tk = termo_new_abstract ("vt100", NULL, 0);
 
-	key1.type = TERMKEY_TYPE_KEY;
+	key1.type = TERMO_TYPE_KEY;
 	key1.code.codepoint = 'A';
 	key1.modifiers = 0;
 
-	is_int (termkey_keycmp (tk, &key1, &key1), 0, "cmpkey same structure");
+	is_int (termo_keycmp (tk, &key1, &key1), 0, "cmpkey same structure");
 
-	key2.type = TERMKEY_TYPE_KEY;
+	key2.type = TERMO_TYPE_KEY;
 	key2.code.codepoint = 'A';
 	key2.modifiers = 0;
 
-	is_int (termkey_keycmp (tk, &key1, &key2), 0, "cmpkey identical structure");
+	is_int (termo_keycmp (tk, &key1, &key2), 0, "cmpkey identical structure");
 
-	key2.modifiers = TERMKEY_KEYMOD_CTRL;
+	key2.modifiers = TERMO_KEYMOD_CTRL;
 
-	ok (termkey_keycmp (tk, &key1, &key2) < 0,
+	ok (termo_keycmp (tk, &key1, &key2) < 0,
 		"cmpkey orders CTRL after nomod");
-	ok (termkey_keycmp (tk, &key2, &key1) > 0,
+	ok (termo_keycmp (tk, &key2, &key1) > 0,
 		"cmpkey orders nomod before CTRL");
 
 	key2.code.codepoint = 'B';
 	key2.modifiers = 0;
 
-	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 (termo_keycmp (tk, &key1, &key2) < 0, "cmpkey orders 'B' after 'A'");
+	ok (termo_keycmp (tk, &key2, &key1) > 0, "cmpkey orders 'A' before 'B'");
 
-	key1.modifiers = TERMKEY_KEYMOD_CTRL;
+	key1.modifiers = TERMO_KEYMOD_CTRL;
 
-	ok (termkey_keycmp (tk, &key1, &key2) < 0,
+	ok (termo_keycmp (tk, &key1, &key2) < 0,
 		"cmpkey orders nomod 'B' after CTRL 'A'");
-	ok (termkey_keycmp (tk, &key2, &key1) > 0,
+	ok (termo_keycmp (tk, &key2, &key1) > 0,
 		"cmpkey orders CTRL 'A' before nomod 'B'");
 
-	key2.type = TERMKEY_TYPE_KEYSYM;
-	key2.code.sym = TERMKEY_SYM_UP;
+	key2.type = TERMO_TYPE_KEYSYM;
+	key2.code.sym = TERMO_SYM_UP;
 
-	ok (termkey_keycmp (tk, &key1, &key2) < 0,
+	ok (termo_keycmp (tk, &key1, &key2) < 0,
 		"cmpkey orders KEYSYM after KEY");
-	ok (termkey_keycmp (tk, &key2, &key1) > 0,
+	ok (termo_keycmp (tk, &key2, &key1) > 0,
 		"cmpkey orders KEY before KEYSYM");
 
-	key1.type = TERMKEY_TYPE_KEYSYM;
-	key1.code.sym = TERMKEY_SYM_SPACE;
+	key1.type = TERMO_TYPE_KEYSYM;
+	key1.code.sym = TERMO_SYM_SPACE;
 	key1.modifiers = 0;
-	key2.type = TERMKEY_TYPE_KEY;
+	key2.type = TERMO_TYPE_KEY;
 	key2.code.codepoint = ' ';
 	key2.modifiers = 0;
 
-	is_int (termkey_keycmp (tk, &key1, &key2), 0,
+	is_int (termo_keycmp (tk, &key1, &key2), 0,
 		"cmpkey considers KEYSYM/SPACE and KEY/SP identical");
 
-	termkey_set_canonflags (tk,
-		termkey_get_canonflags (tk) | TERMKEY_CANON_SPACESYMBOL);
-	is_int (termkey_keycmp (tk, &key1, &key2), 0,
+	termo_set_canonflags (tk,
+		termo_get_canonflags (tk) | TERMO_CANON_SPACESYMBOL);
+	is_int (termo_keycmp (tk, &key1, &key2), 0,
 		"cmpkey considers KEYSYM/SPACE and KEY/SP"
 		" identical under SPACESYMBOL");
 
-	termkey_destroy (tk);
+	termo_destroy (tk);
 	return exit_status ();
 }