circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-06 00:37:06 +00:00
Code Issues Projects Releases Wiki Activity

Drop having a separate type for style options and make them all strings, which

Browse Source 
allows formats to be expanded. Any styles without a '#{' are still validated
when they are set but any with a '#{' are not. Formats are not expanded
usefully in many cases yet, that will be changed later.

To make this work, a few other changes:

- set-option -a with a style option automatically appends a ",".

- OSC 10 and 11 don't set the window-style option anymore, instead the fg and
  bg are stored in the pane struct and act as the defaults that can be
  overridden by window-style.

- status-fg and -bg now override status-style instead of trying to keep them in
  sync.
This commit is contained in:
Nicholas Marriott
2020-04-28 13:50:07 +01:00
parent a43a156846
commit 1f8256fc50
14 changed files with 226 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
screen-redraw.c
View File

@ -260,10 +260,9 @@ screen_redraw_make_pane_status(struct client *c, struct window *w,
struct screen old;
if (wp == w->active)
style_apply(&gc, w->options, "pane-active-border-style");
style_apply(&gc, w->options, "pane-active-border-style", NULL);
else
style_apply(&gc, w->options, "pane-border-style");
style_apply(&gc, w->options, "pane-border-style", NULL);
fmt = options_get_string(w->options, "pane-border-format");
ft = format_create(c, NULL, FORMAT_PANE|wp->id, FORMAT_STATUS);
@ -536,8 +535,8 @@ screen_redraw_draw_borders(struct screen_redraw_ctx *ctx)
log_debug("%s: %s @%u", __func__, c->name, w->id);
style_apply(&other_gc, oo, "pane-border-style");
style_apply(&active_gc, oo, "pane-active-border-style");
style_apply(&other_gc, oo, "pane-border-style", NULL);
style_apply(&active_gc, oo, "pane-active-border-style", NULL);
active_gc.attr = other_gc.attr = GRID_ATTR_CHARSET;
memcpy(&m_other_gc, &other_gc, sizeof m_other_gc);