diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-09-07 10:49:33 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-09-07 10:49:33 +0000 |
| commit | 098fdbf528d23bfdfc87a25ef8596184ea9e37d9 (patch) | |
| tree | 45e49ae2b3fdff96428ce9874b720fd6d094fc84 /usr.bin/tmux/status.c | |
| parent | 7c92b6f5b2780bbb057203c76c0a26460a715451 (diff) | |
Permit embedded colour and attributes in status-left and status-right using new
#[] special characters, for example #[fg=red,bg=blue,blink].
Diffstat (limited to 'usr.bin/tmux/status.c')
| -rw-r--r-- | usr.bin/tmux/status.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 4ce1d006070..a6469dee67e 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.30 2009/09/02 06:33:20 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.31 2009/09/07 10:49:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -107,14 +107,14 @@ status_redraw(struct client *c) left = status_replace(s, options_get_string( &s->options, "status-left"), c->status_timer.tv_sec); llen = options_get_number(&s->options, "status-left-length"); - llen2 = screen_write_strlen(utf8flag, "%s", left); + llen2 = screen_write_cstrlen(utf8flag, "%s", left); if (llen2 < llen) llen = llen2; right = status_replace(s, options_get_string( &s->options, "status-right"), c->status_timer.tv_sec); rlen = options_get_number(&s->options, "status-right-length"); - rlen2 = screen_write_strlen(utf8flag, "%s", right); + rlen2 = screen_write_cstrlen(utf8flag, "%s", right); if (rlen2 < rlen) rlen = rlen2; @@ -192,7 +192,7 @@ draw: screen_write_start(&ctx, NULL, &c->status); if (llen != 0) { screen_write_cursormove(&ctx, 0, yy); - screen_write_nputs(&ctx, llen, &sl_stdgc, utf8flag, "%s", left); + screen_write_cnputs(&ctx, llen, &sl_stdgc, utf8flag, "%s", left); screen_write_putc(&ctx, &stdgc, ' '); if (larrow) screen_write_putc(&ctx, &stdgc, ' '); @@ -266,7 +266,7 @@ draw: if (rlen != 0) { screen_write_cursormove(&ctx, c->tty.sx - rlen - 1, yy); screen_write_putc(&ctx, &stdgc, ' '); - screen_write_nputs(&ctx, rlen, &sr_stdgc, utf8flag, "%s", right); + screen_write_cnputs(&ctx, rlen, &sr_stdgc, utf8flag, "%s", right); } /* Draw the arrows. */ @@ -400,6 +400,20 @@ status_replace(struct session *s, const char *fmt, time_t t) len--; } break; + case '[': + /* + * Embedded style, handled at display time. + * Leave present and skip input until ]. + */ + *optr++ = '#'; + + iptr--; /* include [ */ + while (*iptr != ']' && *iptr != '\0') { + if (optr >= out + (sizeof out) - 1) + break; + *optr++ = *iptr++; + } + break; case '#': *optr++ = '#'; break; |