From 13441e8cb8b0ce68db3204a44bbdc004bee42a0f Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 2 Jun 2013 07:52:15 +0000 Subject: The actual terminfo entries we ended up with for cursor changes are Cs, Ce, Ss and Se (not Cc, Ce, Cs, Csr). So use and document these instead of the ones we were using earlier. --- tty.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tty.c') diff --git a/tty.c b/tty.c index 74988eb3..652d2b77 100644 --- a/tty.c +++ b/tty.c @@ -270,11 +270,11 @@ tty_stop_tty(struct tty *tty) tty_raw(tty, tty_term_string(tty->term, TTYC_SGR0)); tty_raw(tty, tty_term_string(tty->term, TTYC_RMKX)); tty_raw(tty, tty_term_string(tty->term, TTYC_CLEAR)); - if (tty_term_has(tty->term, TTYC_CS1) && tty->cstyle != 0) { - if (tty_term_has(tty->term, TTYC_CSR1)) - tty_raw(tty, tty_term_string(tty->term, TTYC_CSR1)); + if (tty_term_has(tty->term, TTYC_SS) && tty->cstyle != 0) { + if (tty_term_has(tty->term, TTYC_SE)) + tty_raw(tty, tty_term_string(tty->term, TTYC_SE)); else - tty_raw(tty, tty_term_string1(tty->term, TTYC_CS1, 0)); + tty_raw(tty, tty_term_string1(tty->term, TTYC_SS, 0)); } tty_raw(tty, tty_term_string(tty->term, TTYC_CR)); @@ -455,7 +455,7 @@ tty_force_cursor_colour(struct tty *tty, const char *ccolour) if (*ccolour == '\0') tty_putcode(tty, TTYC_CR); else - tty_putcode_ptr1(tty, TTYC_CC, ccolour); + tty_putcode_ptr1(tty, TTYC_CS, ccolour); free(tty->ccolour); tty->ccolour = xstrdup(ccolour); } @@ -479,12 +479,12 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s) tty_putcode(tty, TTYC_CIVIS); } if (tty->cstyle != s->cstyle) { - if (tty_term_has(tty->term, TTYC_CS1)) { + if (tty_term_has(tty->term, TTYC_SS)) { if (s->cstyle == 0 && - tty_term_has(tty->term, TTYC_CSR1)) - tty_putcode(tty, TTYC_CSR1); + tty_term_has(tty->term, TTYC_SE)) + tty_putcode(tty, TTYC_SE); else - tty_putcode1(tty, TTYC_CS1, s->cstyle); + tty_putcode1(tty, TTYC_SS, s->cstyle); } tty->cstyle = s->cstyle; } -- cgit From d6debc21c777dc0e993fd7928bbba51075685491 Mon Sep 17 00:00:00 2001 From: Stuart Henderson Date: Tue, 11 Jun 2013 19:18:02 +0000 Subject: revert r1.156 "Add support for focus notifications when tmux pane changes" beck@ found annoying beeps if a machine was shutdown while tmux is running and you then focus in/out of an xterm; kettenis tracked it down to 1.156. --- tty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tty.c') diff --git a/tty.c b/tty.c index 652d2b77..cf6e9652 100644 --- a/tty.c +++ b/tty.c @@ -220,7 +220,7 @@ tty_start_tty(struct tty *tty) tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l"); if (tty_term_has(tty->term, TTYC_XT)) - tty_puts(tty, "\033[c\033[>4;1m\033[?1004h\033[m"); + tty_puts(tty, "\033[c\033[>4;1m\033[m"); tty->cx = UINT_MAX; tty->cy = UINT_MAX; @@ -283,7 +283,7 @@ tty_stop_tty(struct tty *tty) tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l"); if (tty_term_has(tty->term, TTYC_XT)) - tty_raw(tty, "\033[>4m\033[?1004l\033[m"); + tty_raw(tty, "\033[>4m\033[m"); tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP)); -- cgit