circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-05 23:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Use formats for status-style and message-style.

Browse Source
This commit is contained in:
nicm 2020-05-16 15:19:04 +00:00
parent 58fb81d19a
commit a3cbc014c3
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
status.c
View File

@ -346,8 +346,15 @@ status_redraw(struct client *c)
if (c->tty.sy == 0 || lines == 0)
return (1);
/* Create format tree. */
flags = FORMAT_STATUS;
if (c->flags & CLIENT_STATUSFORCE)
flags |= FORMAT_FORCE;
ft = format_create(c, NULL, FORMAT_NONE, flags);
format_defaults(ft, c, NULL, NULL, NULL);
/* Set up default colour. */
style_apply(&gc, s->options, "status-style", NULL);
style_apply(&gc, s->options, "status-style", ft);
fg = options_get_number(s->options, "status-fg");
if (fg != 8)
gc.fg = fg;
@ -367,13 +374,6 @@ status_redraw(struct client *c)
}
screen_write_start(&ctx, NULL, &sl->screen);
/* Create format tree. */
flags = FORMAT_STATUS;
if (c->flags & CLIENT_STATUSFORCE)
flags |= FORMAT_FORCE;
ft = format_create(c, NULL, FORMAT_NONE, flags);
format_defaults(ft, c, NULL, NULL, NULL);
/* Write the status lines. */
o = options_get(s->options, "status-format");
if (o == NULL) {
@ -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;