diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-06-26 15:13:39 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-06-26 15:13:39 +0000 |
| commit | 1ec736a3dc43755a283c22c090f8d3183623cce6 (patch) | |
| tree | 1ed5548fe2a24f208d2789ff8531b42bf8c6c8de | |
| parent | c506e7f71194b25c4ba2bf0087c7ebc3fff34b05 (diff) | |
| download | rtmux-1ec736a3dc43755a283c22c090f8d3183623cce6.tar.gz rtmux-1ec736a3dc43755a283c22c090f8d3183623cce6.tar.bz2 rtmux-1ec736a3dc43755a283c22c090f8d3183623cce6.zip | |
Status line fixes: don't truncate status-right now the length calculation is
done for UTF-8, limit to the maximum length correctly when printing, and always
print a space even if the left string is longer than the width available.
| -rw-r--r-- | screen-write.c | 2 | ||||
| -rw-r--r-- | status.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/screen-write.c b/screen-write.c index f0cdec30..e3a215ac 100644 --- a/screen-write.c +++ b/screen-write.c @@ -164,7 +164,7 @@ screen_write_vnputs(struct screen_write_ctx *ctx, ssize_t maxlen, gc->flags &= ~GRID_FLAG_UTF8; } else { - if (maxlen > 0 && size > (size_t) maxlen) + if (maxlen > 0 && size + 1 > (size_t) maxlen) break; size++; @@ -91,7 +91,6 @@ status_redraw(struct client *c) rlen2 = screen_write_strlen(utf8flag, "%s", right); if (rlen2 < rlen) rlen = rlen2; - right[rlen] = '\0'; /* * Figure out how much space we have for the window list. If there isn't @@ -167,8 +166,8 @@ draw: screen_write_start(&ctx, NULL, &c->status); if (llen != 0) { screen_write_cursormove(&ctx, 0, yy); - screen_write_nputs( - &ctx, llen + 1, &stdgc, utf8flag, "%s ", left); + screen_write_nputs(&ctx, llen, &stdgc, utf8flag, "%s", left); + screen_write_putc(&ctx, &stdgc, ' '); if (larrow) screen_write_putc(&ctx, &stdgc, ' '); } else { @@ -225,8 +224,8 @@ draw: /* Draw the last item. */ if (rlen != 0) { screen_write_cursormove(&ctx, c->tty.sx - rlen - 1, yy); - screen_write_nputs( - &ctx, rlen + 1, &stdgc, utf8flag, " %s", right); + screen_write_putc(&ctx, &stdgc, ' '); + screen_write_nputs(&ctx, rlen, &stdgc, utf8flag, "%s", right); } /* Draw the arrows. */ |