circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Remove support for the UTF-8 mouse extension. This was a briefly used,

Browse Source 
poor idea that was fairly quickly replaced by SGR mouse input (which is
now widespread). It is impossible to tell the difference between UTF-8
and non-UTF-8 mouse input; since the mouse-utf8 option was removed tmux
has not handled it correctly in any case; and it is ridiculous to have
three different forms of mouse input.
This commit is contained in:
nicm
2015-11-23 20:53:09 +00:00
parent 28e72ae34d
commit 32e510bd70
7 changed files with 11 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tty-keys.c
View File

@@ -481,6 +481,7 @@ tty_keys_next(struct tty *tty)
/* Get key buffer. */
buf = EVBUFFER_DATA(tty->event->input);
len = EVBUFFER_LENGTH(tty->event->input);
if (len == 0)
return (0);
log_debug("keys are %zu (%.*s)", len, (int) len, buf);
@@ -653,10 +654,8 @@ int
tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
{
struct mouse_event *m = &tty->mouse;
struct utf8_data ud;
u_int i, value, x, y, b, sgr_b;
u_int i, x, y, b, sgr_b;
u_char sgr_type, c;
enum utf8_state more;
/*
* Standard mouse sequences are \033[M followed by three characters
@@ -686,8 +685,8 @@ tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
return (1);
/*
* Third byte is M in old standard and UTF-8 extension, < in SGR
* extension.
* Third byte is M in old standard (and UTF-8 extension which we do not
* support), < in SGR extension.
*/
if (buf[2] == 'M') {
/* Read the three inputs. */
@@ -695,32 +694,13 @@ tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
for (i = 0; i < 3; i++) {
if (len <= *size)
return (1);
if (tty->mode & MODE_MOUSE_UTF8) {
if (utf8_open(&ud, buf[*size]) == UTF8_MORE) {
if (ud.size != 2)
return (-1);
(*size)++;
if (len <= *size)
return (1);
more = utf8_append(&ud, buf[*size]);
if (more != UTF8_DONE)
return (-1);
value = utf8_combine(&ud);
} else
value = (u_char)buf[*size];
(*size)++;
} else {
value = (u_char)buf[*size];
(*size)++;
}
c = (u_char)buf[(*size)++];
if (i == 0)
b = value;
b = c;
else if (i == 1)
x = value;
x = c;
else
y = value;
y = c;
}
log_debug("mouse input: %.*s", (int)*size, buf);