summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tty.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2013-06-02 07:52:15 +0000
committernicm <nicm@openbsd.org>2013-06-02 07:52:15 +0000
commit9c2fc9ebe0006fcafd870ed63eec8276ca443122 (patch)
tree1bbd3dd22e94aa75ad59b82eae5aead5c0f1699f /usr.bin/tmux/tty.c
parentTypo (diff)
downloadwireguard-openbsd-9c2fc9ebe0006fcafd870ed63eec8276ca443122.tar.xz
wireguard-openbsd-9c2fc9ebe0006fcafd870ed63eec8276ca443122.zip
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.
Diffstat (limited to 'usr.bin/tmux/tty.c')
-rw-r--r--usr.bin/tmux/tty.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index d6aec27292b..c918de26294 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.159 2013/04/11 07:27:27 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.160 2013/06/02 07:52:15 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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;
}