summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2017-10-11 11:26:58 +0000
committernicm <nicm@openbsd.org>2017-10-11 11:26:58 +0000
commitc48b7ec23751c290a22400aba6c38c7c4680fffe (patch)
treeb8d5bee34544f2054319aca9f60ad4a1640f0f49
parentTweak parse_decimal() and its invocations to emit a (diff)
downloadwireguard-openbsd-c48b7ec23751c290a22400aba6c38c7c4680fffe.tar.xz
wireguard-openbsd-c48b7ec23751c290a22400aba6c38c7c4680fffe.zip
Clear to end of line properly with UTF-8 present.
-rw-r--r--usr.bin/tmux/mode-tree.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/tmux/mode-tree.c b/usr.bin/tmux/mode-tree.c
index 1bdbb0d2406..73ab8d0c55a 100644
--- a/usr.bin/tmux/mode-tree.c
+++ b/usr.bin/tmux/mode-tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mode-tree.c,v 1.12 2017/10/11 08:08:16 nicm Exp $ */
+/* $OpenBSD: mode-tree.c,v 1.13 2017/10/11 11:26:58 nicm Exp $ */
/*
* Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -554,10 +554,12 @@ mode_tree_draw(struct mode_tree_data *mtd)
}
if (i != mtd->current) {
- screen_write_puts(&ctx, &gc0, "%.*s", w, text);
+ screen_write_nputs(&ctx, w, &gc0, "%s", text);
screen_write_clearendofline(&ctx, 8);
- } else
- screen_write_puts(&ctx, &gc, "%-*.*s", w, w, text);
+ } else {
+ screen_write_nputs(&ctx, w, &gc, "%s", text);
+ screen_write_clearendofline(&ctx, gc.bg);
+ }
free(text);
if (mti->tagged) {