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

Recognise rxvt-style mouse encoding

This commit is contained in:
Paul LeoNerd Evans 2012-04-12 00:12:19 +01:00
parent 789a5a3c9d
commit ff99b29b96
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
driver-csi.c
View File

@ -275,6 +275,26 @@ static TermKeyResult peekkey_csi(TermKey *tk, TermKeyCsi *csi, size_t introlen,
else if(cmd == 'M') { else if(cmd == 'M') {
size_t csi_len = csi_end + 1; size_t csi_len = csi_end + 1;
if(args >= 3) {
key->code.mouse[0] = arg[0];
key->modifiers = (key->code.mouse[0] & 0x1c) >> 2;
key->code.mouse[0] &= ~0x1c;
if(arg[1] > 0xff)
key->code.mouse[1] = 0xff;
else
key->code.mouse[1] = arg[1];
if(arg[2] > 0xff)
key->code.mouse[2] = 0xff;
else
key->code.mouse[2] = arg[2];
*nbytep = csi_len;
return TERMKEY_RES_KEY;
}
tk->buffstart += csi_len; tk->buffstart += csi_len;
tk->buffcount -= csi_len; tk->buffcount -= csi_len;

30
t/30mouse.c
View File

@ -10,7 +10,7 @@ int main(int argc, char *argv[])
char buffer[32]; char buffer[32];
size_t len; size_t len;
plan_tests(31); plan_tests(46);
/* vt100 doesn't have a mouse, we need xterm */ /* vt100 doesn't have a mouse, we need xterm */
tk = termkey_new_abstract("xterm", 0); tk = termkey_new_abstract("xterm", 0);
@ -73,6 +73,34 @@ int main(int argc, char *argv[])
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
termkey_push_bytes(tk, "\e[0;20;20M", 10);
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(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");
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(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse release rxvt protocol");
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");
termkey_destroy(tk); termkey_destroy(tk);
return exit_status(); return exit_status();