Merge branch 'obsd-master'

This commit is contained in:
n6tadam 2015-05-19 12:01:20 +01:00
commit 1ec93570bf

13
tty.c
View File

@ -507,14 +507,17 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
mode &= ~MODE_CURSOR; mode &= ~MODE_CURSOR;
changed = mode ^ tty->mode; changed = mode ^ tty->mode;
if (changed & (MODE_CURSOR|MODE_BLINKING)) { if (changed & MODE_BLINKING) {
if (mode & MODE_CURSOR) { if (tty_term_has(tty->term, TTYC_CVVIS))
if (mode & MODE_BLINKING &&
tty_term_has(tty->term, TTYC_CVVIS))
tty_putcode(tty, TTYC_CVVIS); tty_putcode(tty, TTYC_CVVIS);
else else
tty_putcode(tty, TTYC_CNORM); tty_putcode(tty, TTYC_CNORM);
} else changed |= MODE_CURSOR;
}
if (changed & MODE_CURSOR) {
if (mode & MODE_CURSOR)
tty_putcode(tty, TTYC_CNORM);
else
tty_putcode(tty, TTYC_CIVIS); tty_putcode(tty, TTYC_CIVIS);
} }
if (s != NULL && tty->cstyle != s->cstyle) { if (s != NULL && tty->cstyle != s->cstyle) {