aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-12-11 14:01:25 +0000
committerThomas Adam <thomas@xteddy.org>2019-12-11 14:01:25 +0000
commit96abf400a50d3a8dcb7fed0d53c636127c995264 (patch)
tree599bc08804f2c4a8b8930a920ed37c9ea6786537
parent6aeb6790660d39117abaeef2d97c8af5447ae1b8 (diff)
parentf733d3f3ebd144d0d0e1c11a544eb093637590e6 (diff)
downloadrtmux-96abf400a50d3a8dcb7fed0d53c636127c995264.tar.gz
rtmux-96abf400a50d3a8dcb7fed0d53c636127c995264.tar.bz2
rtmux-96abf400a50d3a8dcb7fed0d53c636127c995264.zip
Merge branch 'obsd-master'
-rw-r--r--tty.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tty.c b/tty.c
index 594f02fa..2d7acb17 100644
--- a/tty.c
+++ b/tty.c
@@ -335,7 +335,8 @@ tty_start_tty(struct tty *tty)
tty->flags |= TTY_STARTED;
tty_invalidate(tty);
- tty_force_cursor_colour(tty, "");
+ if (*tty->ccolour != '\0')
+ tty_force_cursor_colour(tty, "");
tty->mouse_drag_flag = 0;
tty->mouse_drag_update = NULL;
@@ -381,7 +382,8 @@ tty_stop_tty(struct tty *tty)
}
if (tty->mode & MODE_BRACKETPASTE)
tty_raw(tty, "\033[?2004l");
- tty_raw(tty, tty_term_string(tty->term, TTYC_CR));
+ if (*tty->ccolour != '\0')
+ tty_raw(tty, tty_term_string(tty->term, TTYC_CR));
tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
if (tty_term_has(tty->term, TTYC_KMOUS))