Renaming continued

1 files changed, 12 insertions, 12 deletions

diff --git a/tests/31position.c b/tests/31position.c
index a62be7a..2179b95 100644
--- a/tests/31position.c
+++ b/tests/31position.c
@@ -1,38 +1,38 @@
-#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;
 	int line, col;
 
 	plan_tests (8);
 
-	tk = termkey_new_abstract ("vt100", NULL, 0);
+	tk = termo_new_abstract ("vt100", NULL, 0);
 
-	termkey_push_bytes (tk, "\e[?15;7R", 8);
+	termo_push_bytes (tk, "\e[?15;7R", 8);
 
-	is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
+	is_int (termo_getkey (tk, &key), TERMO_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, TERMO_TYPE_POSITION, "key.type for position report");
 
-	is_int (termkey_interpret_position (tk, &key, &line, &col), TERMKEY_RES_KEY,
+	is_int (termo_interpret_position (tk, &key, &line, &col), TERMO_RES_KEY,
 		"interpret_position yields RES_KEY");
 
 	is_int (line, 15, "line for position report");
 	is_int (col, 7, "column for position report");
 
 	/* A plain CSI R is likely to be <F3> though.  This is tricky :/ */
-	termkey_push_bytes (tk, "\e[R", 3);
+	termo_push_bytes (tk, "\e[R", 3);
 
-	is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY,
+	is_int (termo_getkey (tk, &key), TERMO_RES_KEY,
 		"getkey yields RES_KEY for <F3>");
 
-	is_int (key.type, TERMKEY_TYPE_FUNCTION, "key.type for <F3>");
+	is_int (key.type, TERMO_TYPE_FUNCTION, "key.type for <F3>");
 	is_int (key.code.number, 3, "key.code.number for <F3>");
 
-	termkey_destroy (tk);
+	termo_destroy (tk);
 	return exit_status ();
 }