summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2020-04-21 13:48:57 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2020-04-21 13:48:57 +0000
commitd58536265b75aab04080853a9764891edafd8760 (patch)
tree4a11ec1d328c8e03a73d87a43ae5663d7db0bb24 /usr.bin
parent5a408be90a7e579238cf3de0db567b4e99cbe47d (diff)
Move the background colour to clear with (if any) up as well as the data
when scrolling, redraw problem reported by sthen@.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/screen-write.c5
-rw-r--r--usr.bin/tmux/tty-features.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index 7fdccbddf6e..f553bbee147 100644
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.174 2020/04/20 15:49:05 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.175 2020/04/21 13:48:56 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1372,10 +1372,11 @@ screen_write_collect_scroll(struct screen_write_ctx *ctx)
for (y = s->rupper; y < s->rlower; y++) {
cl = &ctx->s->write_list[y + 1];
TAILQ_CONCAT(&ctx->s->write_list[y].items, &cl->items, entry);
+ ctx->s->write_list[y].bg = cl->bg;
ctx->s->write_list[y].data = cl->data;
}
- ctx->s->write_list[s->rlower].data = saved;
ctx->s->write_list[s->rlower].bg = 1 + 8;
+ ctx->s->write_list[s->rlower].data = saved;
}
/* Flush collected lines. */
diff --git a/usr.bin/tmux/tty-features.c b/usr.bin/tmux/tty-features.c
index 32629708de2..0ef9f300ded 100644
--- a/usr.bin/tmux/tty-features.c
+++ b/usr.bin/tmux/tty-features.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-features.c,v 1.4 2020/04/21 10:37:11 nicm Exp $ */
+/* $OpenBSD: tty-features.c,v 1.5 2020/04/21 13:48:56 nicm Exp $ */
/*
* Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -33,8 +33,8 @@
* - alternate escape (under XT).
*
* Also:
- * - XT is used to decide whether to send DA and DSR,
- * - DECSLRM and DECFRA use a flag instead of capabilities.
+ * - XT is used to decide whether to send DA and DSR;
+ * - DECSLRM and DECFRA use a flag instead of capabilities;
* - UTF-8 is a separate flag on the client; needed for unattached clients.
*/