Extract modifiers for mouse events at peekkey time
This commit is contained in:
parent
5f942e9e3e
commit
789a5a3c9d
20
t/30mouse.c
20
t/30mouse.c
@ -10,7 +10,7 @@ int main(int argc, char *argv[])
|
||||
char buffer[32];
|
||||
size_t len;
|
||||
|
||||
plan_tests(20);
|
||||
plan_tests(31);
|
||||
|
||||
/* vt100 doesn't have a mouse, we need xterm */
|
||||
tk = termkey_new_abstract("xterm", 0);
|
||||
@ -27,6 +27,7 @@ int main(int argc, char *argv[])
|
||||
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");
|
||||
@ -45,6 +46,7 @@ int main(int argc, char *argv[])
|
||||
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);
|
||||
|
||||
@ -54,6 +56,22 @@ int main(int argc, char *argv[])
|
||||
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_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");
|
||||
|
||||
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");
|
||||
|
||||
termkey_destroy(tk);
|
||||
|
||||
|
13
termkey.c
13
termkey.c
@ -894,7 +894,10 @@ static TermKeyResult peekkey_mouse(TermKey *tk, TermKeyKey *key, size_t *nbytep)
|
||||
key->code.mouse[0] = CHARAT(0) - 0x20;
|
||||
key->code.mouse[1] = CHARAT(1) - 0x20;
|
||||
key->code.mouse[2] = CHARAT(2) - 0x20;
|
||||
key->modifiers = 0;
|
||||
|
||||
key->modifiers = (key->code.mouse[0] & 0x1c) >> 2;
|
||||
key->code.mouse[0] &= ~0x1c;
|
||||
|
||||
*nbytep = 3;
|
||||
return TERMKEY_RES_KEY;
|
||||
}
|
||||
@ -922,12 +925,14 @@ TermKeyResult termkey_interpret_mouse(TermKey *tk, const TermKeyKey *key, TermKe
|
||||
|
||||
int drag = code & 0x20;
|
||||
|
||||
switch(code & ~0x20) {
|
||||
code &= ~0x3c;
|
||||
|
||||
switch(code) {
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
*event = drag ? TERMKEY_MOUSE_DRAG : TERMKEY_MOUSE_PRESS;
|
||||
btn = (code & ~0x20) + 1;
|
||||
btn = code + 1;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
@ -938,7 +943,7 @@ TermKeyResult termkey_interpret_mouse(TermKey *tk, const TermKeyKey *key, TermKe
|
||||
case 64:
|
||||
case 65:
|
||||
*event = drag ? TERMKEY_MOUSE_DRAG : TERMKEY_MOUSE_PRESS;
|
||||
btn = (code & ~0x20) + 4 - 64;
|
||||
btn = code + 4 - 64;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user