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

Use format for status-style.

Browse Source
This commit is contained in:
Nicholas Marriott 2020-04-30 14:56:46 +01:00
parent 66bab1f6cf
commit 272f3dbf2e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
status.c
View File

@ -346,8 +346,15 @@ status_redraw(struct client *c)
if (c->tty.sy == 0 || lines == 0) if (c->tty.sy == 0 || lines == 0)
return (1); 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. */ /* 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"); fg = options_get_number(s->options, "status-fg");
if (fg != 8) if (fg != 8)
gc.fg = fg; gc.fg = fg;
@ -367,13 +374,6 @@ status_redraw(struct client *c)
} }
screen_write_start(&ctx, NULL, &sl->screen); 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. */ /* Write the status lines. */
o = options_get(s->options, "status-format"); o = options_get(s->options, "status-format");
if (o == NULL) { if (o == NULL) {