aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2020-04-30 14:59:58 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2020-04-30 14:59:58 +0100
commit8e01221d022fa702dd99db52285b2d2941e0f4cc (patch)
treed6917985083abe5cf97ca8ca1dccd896aea74fb1
parent272f3dbf2e4230064be6de6d6d6a71c724f49ec6 (diff)
downloadrtmux-8e01221d022fa702dd99db52285b2d2941e0f4cc.tar.gz
rtmux-8e01221d022fa702dd99db52285b2d2941e0f4cc.tar.bz2
rtmux-8e01221d022fa702dd99db52285b2d2941e0f4cc.zip
Allow formats for message-style.
-rw-r--r--status.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/status.c b/status.c
index 89216f8c..a4844294 100644
--- a/status.c
+++ b/status.c
@@ -490,6 +490,7 @@ status_message_redraw(struct client *c)
size_t len;
u_int lines, offset;
struct grid_cell gc;
+ struct format_tree *ft;
if (c->tty.sx == 0 || c->tty.sy == 0)
return (0);
@@ -504,7 +505,9 @@ status_message_redraw(struct client *c)
if (len > c->tty.sx)
len = c->tty.sx;
- style_apply(&gc, s->options, "message-style", NULL);
+ ft = format_create_defaults(NULL, c, NULL, NULL, NULL);
+ style_apply(&gc, s->options, "message-style", ft);
+ format_free(ft);
screen_write_start(&ctx, NULL, sl->active);
screen_write_fast_copy(&ctx, &sl->screen, 0, 0, c->tty.sx, lines - 1);
@@ -636,6 +639,7 @@ status_prompt_redraw(struct client *c)
u_int i, lines, offset, left, start, width;
u_int pcursor, pwidth;
struct grid_cell gc, cursorgc;
+ struct format_tree *ft;
if (c->tty.sx == 0 || c->tty.sy == 0)
return (0);
@@ -646,10 +650,12 @@ status_prompt_redraw(struct client *c)
lines = 1;
screen_init(sl->active, c->tty.sx, lines, 0);
+ ft = format_create_defaults(NULL, c, NULL, NULL, NULL);
if (c->prompt_mode == PROMPT_COMMAND)
- style_apply(&gc, s->options, "message-command-style", NULL);
+ style_apply(&gc, s->options, "message-command-style", ft);
else
- style_apply(&gc, s->options, "message-style", NULL);
+ style_apply(&gc, s->options, "message-style", ft);
+ format_free(ft);
memcpy(&cursorgc, &gc, sizeof cursorgc);
cursorgc.attr ^= GRID_ATTR_REVERSE;