From 3465d5553fbe88a75320d1da3f7228619492b036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Sun, 28 Sep 2014 05:56:13 +0200 Subject: Make the tests work again Our UTF-8 parsing now behaves differently, though. --- t/30mouse.c | 231 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 125 insertions(+), 106 deletions(-) (limited to 't/30mouse.c') diff --git a/t/30mouse.c b/t/30mouse.c index 91724e2..e4f4b27 100644 --- a/t/30mouse.c +++ b/t/30mouse.c @@ -1,155 +1,174 @@ #include "../termkey.h" #include "taplib.h" -int main(int argc, char *argv[]) +int +main (int argc, char *argv[]) { - TermKey *tk; - TermKeyKey key; - TermKeyMouseEvent ev; - int button, line, col; - char buffer[32]; - size_t len; + termkey_t *tk; + termkey_key_t key; + termkey_mouse_event_t ev; + int button, line, col; + char buffer[32]; + 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; - is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press"); + key.type = -1; + 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; - is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); + 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(ev, TERMKEY_MOUSE_PRESS, "mouse event for press"); - is_int(button, 1, "mouse button for press"); - is_int(line, 1, "mouse line for press"); - is_int(col, 1, "mouse column for press"); - is_int(key.modifiers, 0, "modifiers for press"); + is_int (ev, TERMKEY_MOUSE_PRESS, "mouse event for press"); + is_int (button, 1, "mouse button for press"); + is_int (line, 1, "mouse line for press"); + is_int (col, 1, "mouse column for press"); + is_int (key.modifiers, 0, "modifiers for press"); - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); - is_int(len, 13, "string length for press"); - is_str(buffer, "MousePress(1)", "string buffer for press"); + len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0); + is_int (len, 13, "string length for press"); + is_str (buffer, "MousePress(1)", "string buffer for press"); - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_MOUSE_POS); - is_int(len, 21, "string length for press"); - is_str(buffer, "MousePress(1) @ (1,1)", "string buffer for press"); + len = termkey_strfkey (tk, buffer, sizeof buffer, + &key, TERMKEY_FORMAT_MOUSE_POS); + 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; - ev = -1; button = -1; line = -1; col = -1; - termkey_getkey(tk, &key); - is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); + key.type = -1; + ev = -1; button = -1; line = -1; col = -1; + 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(ev, TERMKEY_MOUSE_DRAG, "mouse event for drag"); - is_int(button, 1, "mouse button for drag"); - is_int(line, 1, "mouse line for drag"); - is_int(col, 2, "mouse column for drag"); - is_int(key.modifiers, 0, "modifiers for press"); + is_int (ev, TERMKEY_MOUSE_DRAG, "mouse event for drag"); + is_int (button, 1, "mouse button for drag"); + is_int (line, 1, "mouse line for drag"); + is_int (col, 2, "mouse column for drag"); + 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; - ev = -1; button = -1; line = -1; col = -1; - termkey_getkey(tk, &key); - is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); + key.type = -1; + ev = -1; button = -1; line = -1; col = -1; + 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(ev, TERMKEY_MOUSE_RELEASE, "mouse event for release"); - is_int(line, 1, "mouse line for release"); - is_int(col, 3, "mouse column for release"); - is_int(key.modifiers, 0, "modifiers for press"); + is_int (ev, TERMKEY_MOUSE_RELEASE, "mouse event for release"); + is_int (line, 1, "mouse line for release"); + is_int (col, 3, "mouse column for release"); + 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; - ev = -1; button = -1; line = -1; col = -1; - termkey_getkey(tk, &key); - is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); + key.type = -1; + ev = -1; button = -1; line = -1; col = -1; + 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(ev, TERMKEY_MOUSE_PRESS, "mouse event for Ctrl-press"); - is_int(button, 1, "mouse button for Ctrl-press"); - is_int(line, 11, "mouse line 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 (ev, TERMKEY_MOUSE_PRESS, "mouse event for Ctrl-press"); + is_int (button, 1, "mouse button for Ctrl-press"); + is_int (line, 11, "mouse line for Ctrl-press"); + is_int (col, 11, "mouse column for Ctrl-press"); + is_int (key.modifiers, TERMKEY_KEYMOD_CTRL, "modifiers for Ctrl-press"); - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); - is_int(len, 15, "string length for Ctrl-press"); - is_str(buffer, "C-MousePress(1)", "string buffer for Ctrl-press"); + len = termkey_strfkey (tk, buffer, sizeof buffer, &key, 0); + is_int (len, 15, "string length for Ctrl-press"); + is_str (buffer, "C-MousePress(1)", "string buffer for Ctrl-press"); - // rxvt protocol - termkey_push_bytes(tk, "\e[0;20;20M", 10); + // rxvt protocol + termkey_push_bytes (tk, "\e[0;20;20M", 10); - key.type = -1; - is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press rxvt protocol"); + key.type = -1; + 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(button, 1, "mouse button 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(key.modifiers, 0, "modifiers 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 (line, 20, "mouse line for press rxvt protocol"); + is_int (col, 20, "mouse column 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; - is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); + 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(ev, TERMKEY_MOUSE_RELEASE, "mouse event 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(key.modifiers, 0, "modifiers 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 (col, 20, "mouse column for release rxvt protocol"); + is_int (key.modifiers, 0, "modifiers for release rxvt protocol"); - // SGR protocol - termkey_push_bytes(tk, "\e[<0;30;30M", 11); + // SGR protocol + termkey_push_bytes (tk, "\e[<0;30;30M", 11); - key.type = -1; - is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press SGR encoding"); + key.type = -1; + 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; - is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); + 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(ev, TERMKEY_MOUSE_PRESS, "mouse event for press SGR"); - is_int(button, 1, "mouse button for press SGR"); - is_int(line, 30, "mouse line for press SGR"); - is_int(col, 30, "mouse column for press SGR"); - is_int(key.modifiers, 0, "modifiers 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 (line, 30, "mouse line for press SGR"); + is_int (col, 30, "mouse column 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; - is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse release SGR encoding"); + key.type = -1; + 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; - is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY"); + 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(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; - ev = -1; button = -1; line = -1; col = -1; - termkey_getkey(tk, &key); - termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col); + key.type = -1; + ev = -1; button = -1; line = -1; col = -1; + termkey_getkey (tk, &key); + termkey_interpret_mouse (tk, &key, &ev, &button, &line, &col); - is_int(line, 300, "mouse line for press SGR wide"); - is_int(col, 500, "mouse column for press SGR wide"); + is_int (line, 300, "mouse line 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 (); } -- cgit v1.2.3