aboutsummaryrefslogtreecommitdiff
path: root/mode-tree.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-12-12 15:38:33 +0000
committerThomas Adam <thomas@xteddy.org>2019-12-12 15:38:33 +0000
commit58908b045b48b224063ce04d3db63741d32d0898 (patch)
tree7f6a79252f87a0f01c6f57b6d7795e6f30025cfd /mode-tree.c
parent7922f4ee7bd4c18509c6774971fd007a4c5a10e3 (diff)
parentdcf41ec9275a2a1a87a5943d9ba189d83de67a89 (diff)
downloadrtmux-58908b045b48b224063ce04d3db63741d32d0898.tar.gz
rtmux-58908b045b48b224063ce04d3db63741d32d0898.tar.bz2
rtmux-58908b045b48b224063ce04d3db63741d32d0898.zip
Merge branch 'obsd-master'
Diffstat (limited to 'mode-tree.c')
-rw-r--r--mode-tree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mode-tree.c b/mode-tree.c
index 054989fb..b9fa5f65 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -598,6 +598,8 @@ mode_tree_draw(struct mode_tree_data *mtd)
xasprintf(&text, "%-*s%s%s%s: ", keylen, key, start, mti->name,
tag);
width = utf8_cstrwidth(text);
+ if (width > w)
+ width = w;
free(start);
if (mti->tagged) {
@@ -607,11 +609,11 @@ mode_tree_draw(struct mode_tree_data *mtd)
if (i != mtd->current) {
screen_write_clearendofline(&ctx, 8);
- screen_write_puts(&ctx, &gc0, "%s", text);
+ screen_write_nputs(&ctx, w, &gc0, "%s", text);
format_draw(&ctx, &gc0, w - width, mti->text, NULL);
} else {
screen_write_clearendofline(&ctx, gc.bg);
- screen_write_puts(&ctx, &gc, "%s", text);
+ screen_write_nputs(&ctx, w, &gc, "%s", text);
format_draw(&ctx, &gc, w - width, mti->text, NULL);
}
free(text);