aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorn6tadam <n6tadam@xteddy.org>2015-05-19 12:01:20 +0100
committern6tadam <n6tadam@xteddy.org>2015-05-19 12:01:20 +0100
commit1ec93570bf765c4cd67a3d6be1d5c2f8ca9f5f06 (patch)
tree10b054412a682ca6f16f4cdb422c085d2f0f6eb6
parent4123d69b51c1806fe37dde7f2bd28ac916cb1407 (diff)
parent2c53b23d5968da2e796ead6ed9f8ff3c33b8bbfb (diff)
downloadrtmux-1ec93570bf765c4cd67a3d6be1d5c2f8ca9f5f06.tar.gz
rtmux-1ec93570bf765c4cd67a3d6be1d5c2f8ca9f5f06.tar.bz2
rtmux-1ec93570bf765c4cd67a3d6be1d5c2f8ca9f5f06.zip
Merge branch 'obsd-master'
-rw-r--r--tty.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/tty.c b/tty.c
index a58ca937..63380c29 100644
--- a/tty.c
+++ b/tty.c
@@ -507,14 +507,17 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
mode &= ~MODE_CURSOR;
changed = mode ^ tty->mode;
- if (changed & (MODE_CURSOR|MODE_BLINKING)) {
- if (mode & MODE_CURSOR) {
- if (mode & MODE_BLINKING &&
- tty_term_has(tty->term, TTYC_CVVIS))
- tty_putcode(tty, TTYC_CVVIS);
- else
- tty_putcode(tty, TTYC_CNORM);
- } else
+ if (changed & MODE_BLINKING) {
+ if (tty_term_has(tty->term, TTYC_CVVIS))
+ tty_putcode(tty, TTYC_CVVIS);
+ else
+ tty_putcode(tty, TTYC_CNORM);
+ changed |= MODE_CURSOR;
+ }
+ if (changed & MODE_CURSOR) {
+ if (mode & MODE_CURSOR)
+ tty_putcode(tty, TTYC_CNORM);
+ else
tty_putcode(tty, TTYC_CIVIS);
}
if (s != NULL && tty->cstyle != s->cstyle) {