circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-03-29 02:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Correctly handle UTF8 mouse option being toggled, from Egmont Koblinger.

Browse Source
This commit is contained in:
Nicholas Marriott 2013-03-22 10:34:46 +00:00
parent 67b4d5b609
commit 22a2949bd2
1 changed files with 37 additions and 9 deletions

46
tty.c
View File

@ -161,7 +161,6 @@ tty_open(struct tty *tty, const char *overrides, char **cause)
return (0); return (0);
} }
/* ARGSUSED */
void void
tty_read_callback(unused struct bufferevent *bufev, void *data) tty_read_callback(unused struct bufferevent *bufev, void *data)
{ {
@ -171,7 +170,6 @@ tty_read_callback(unused struct bufferevent *bufev, void *data)
; ;
} }
/* ARGSUSED */
void void
tty_error_callback( tty_error_callback(
unused struct bufferevent *bufev, unused short what, unused void *data) unused struct bufferevent *bufev, unused short what, unused void *data)
@ -220,10 +218,10 @@ tty_start_tty(struct tty *tty)
tty_putcode(tty, TTYC_CNORM); tty_putcode(tty, TTYC_CNORM);
if (tty_term_has(tty->term, TTYC_KMOUS)) if (tty_term_has(tty->term, TTYC_KMOUS))
tty_puts(tty, "\033[?1000l"); tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l");
if (tty_term_has(tty->term, TTYC_XT)) if (tty_term_has(tty->term, TTYC_XT))
tty_puts(tty, "\033[c"); tty_puts(tty, "\033[c\033[>4;1m");
tty->cx = UINT_MAX; tty->cx = UINT_MAX;
tty->cy = UINT_MAX; tty->cy = UINT_MAX;
@ -267,8 +265,6 @@ tty_stop_tty(struct tty *tty)
if (tcsetattr(tty->fd, TCSANOW, &tty->tio) == -1) if (tcsetattr(tty->fd, TCSANOW, &tty->tio) == -1)
return; return;
setblocking(tty->fd, 1);
tty_raw(tty, tty_term_string2(tty->term, TTYC_CSR, 0, ws.ws_row - 1)); tty_raw(tty, tty_term_string2(tty->term, TTYC_CSR, 0, ws.ws_row - 1));
if (tty_use_acs(tty)) if (tty_use_acs(tty))
tty_raw(tty, tty_term_string(tty->term, TTYC_RMACS)); tty_raw(tty, tty_term_string(tty->term, TTYC_RMACS));
@ -285,9 +281,14 @@ tty_stop_tty(struct tty *tty)
tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM)); tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
if (tty_term_has(tty->term, TTYC_KMOUS)) if (tty_term_has(tty->term, TTYC_KMOUS))
tty_raw(tty, "\033[?1000l"); tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l");
if (tty_term_has(tty->term, TTYC_XT))
tty_puts(tty, "\033[>4m");
tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP)); tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
setblocking(tty->fd, 1);
} }
void void
@ -332,7 +333,21 @@ tty_free(struct tty *tty)
void void
tty_raw(struct tty *tty, const char *s) tty_raw(struct tty *tty, const char *s)
{ {
write(tty->fd, s, strlen(s)); ssize_t n, slen;
u_int i;
slen = strlen(s);
for (i = 0; i < 5; i++) {
n = write(tty->fd, s, slen);
if (n >= 0) {
s += n;
slen -= n;
if (slen == 0)
break;
} else if (n == -1 && errno != EAGAIN)
break;
usleep(100);
}
} }
void void
@ -474,10 +489,21 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
} }
tty->cstyle = s->cstyle; tty->cstyle = s->cstyle;
} }
if (changed & ALL_MOUSE_MODES) { if (changed & (ALL_MOUSE_MODES|MODE_MOUSE_UTF8)) {
if (mode & ALL_MOUSE_MODES) { if (mode & ALL_MOUSE_MODES) {
/*
* Enable the UTF-8 (1005) extension if configured to.
* Enable the SGR (1006) extension unconditionally, as
* this is safe from misinterpretation. Do it in this
* order, because in some terminals it's the last one
* that takes effect and SGR is the preferred one.
*/
if (mode & MODE_MOUSE_UTF8) if (mode & MODE_MOUSE_UTF8)
tty_puts(tty, "\033[?1005h"); tty_puts(tty, "\033[?1005h");
else
tty_puts(tty, "\033[?1005l");
tty_puts(tty, "\033[?1006h");
if (mode & MODE_MOUSE_ANY) if (mode & MODE_MOUSE_ANY)
tty_puts(tty, "\033[?1003h"); tty_puts(tty, "\033[?1003h");
else if (mode & MODE_MOUSE_BUTTON) else if (mode & MODE_MOUSE_BUTTON)
@ -491,6 +517,8 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
tty_puts(tty, "\033[?1002l"); tty_puts(tty, "\033[?1002l");
else if (tty->mode & MODE_MOUSE_STANDARD) else if (tty->mode & MODE_MOUSE_STANDARD)
tty_puts(tty, "\033[?1000l"); tty_puts(tty, "\033[?1000l");
tty_puts(tty, "\033[?1006l");
if (tty->mode & MODE_MOUSE_UTF8) if (tty->mode & MODE_MOUSE_UTF8)
tty_puts(tty, "\033[?1005l"); tty_puts(tty, "\033[?1005l");
} }