diff options
| -rw-r--r-- | cmd-set-option.c | 5 | ||||
| -rw-r--r-- | tmux.h | 4 | ||||
| -rw-r--r-- | tty.c | 35 | ||||
| -rw-r--r-- | window.c | 2 |
4 files changed, 32 insertions, 14 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c index 6fc6c8ba..356668ee 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -200,6 +200,11 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq) status_timer_start_all(); if (strcmp(oe->name, "monitor-silence") == 0) alerts_reset_all(); + if (strcmp(oe->name, "window-style") == 0 || + strcmp(oe->name, "window-active-style") == 0) { + RB_FOREACH(w, windows, &windows) + w->flags |= WINDOW_STYLECHANGED; + } /* When the pane-border-status option has been changed, resize panes. */ if (strcmp(oe->name, "pane-border-status") == 0) { @@ -943,10 +943,14 @@ struct window { #define WINDOW_ZOOMED 0x1000 #define WINDOW_FORCEWIDTH 0x2000 #define WINDOW_FORCEHEIGHT 0x4000 +#define WINDOW_STYLECHANGED 0x8000 #define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE) struct options *options; + struct grid_cell style; + struct grid_cell active_style; + u_int references; RB_ENTRY(window) entry; @@ -676,7 +676,8 @@ tty_fake_bce(const struct tty *tty, const struct window_pane *wp) struct grid_cell gc; memcpy(&gc, &grid_default_cell, sizeof gc); - tty_default_colours(&gc, wp); + if (wp != NULL) + tty_default_colours(&gc, wp); if (gc.bg == 8 && !(gc.flags & GRID_FLAG_BG256)) return (0); @@ -1133,10 +1134,10 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx) { struct window_pane *wp = ctx->wp; struct screen *s = wp->screen; - u_int cx; - u_int width; + u_int cx, width; - tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower); + if (ctx->ocy == ctx->orlower) + tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower); /* Is the cursor in the very last position? */ width = ctx->cell->data.width; @@ -1443,7 +1444,8 @@ tty_attributes(struct tty *tty, const struct grid_cell *gc, u_char changed; memcpy(&gc2, gc, sizeof gc2); - tty_default_colours(&gc2, wp); + if (wp != NULL) + tty_default_colours(&gc2, wp); /* * If no setab, try to use the reverse attribute as a best-effort for a @@ -1793,20 +1795,27 @@ tty_try_rgb(struct tty *tty, const struct grid_cell_rgb *rgb, const char *type) void tty_default_colours(struct grid_cell *gc, const struct window_pane *wp) { - const struct grid_cell *agc, *pgc, *wgc; - - if (wp == NULL) - return; + struct window *w = wp->window; + struct options *oo = w->options; + const struct grid_cell *agc, *pgc, *wgc; + if (w->flags & WINDOW_STYLECHANGED) { + w->flags &= ~WINDOW_STYLECHANGED; + agc = options_get_style(oo, "window-active-style"); + memcpy(&w->active_style, agc, sizeof w->active_style); + wgc = options_get_style(oo, "window-style"); + memcpy(&w->style, wgc, sizeof w->style); + } else { + agc = &w->active_style; + wgc = &w->style; + } pgc = &wp->colgc; - agc = options_get_style(wp->window->options, "window-active-style"); - wgc = options_get_style(wp->window->options, "window-style"); if (gc->fg == 8 && !(gc->flags & GRID_FLAG_FG256)) { if (pgc->fg != 8 || (pgc->flags & GRID_FLAG_FG256)) { gc->fg = pgc->fg; gc->flags |= (pgc->flags & GRID_FLAG_FG256); - } else if (wp == wp->window->active && + } else if (wp == w->active && (agc->fg != 8 || (agc->flags & GRID_FLAG_FG256))) { gc->fg = agc->fg; gc->flags |= (agc->flags & GRID_FLAG_FG256); @@ -1820,7 +1829,7 @@ tty_default_colours(struct grid_cell *gc, const struct window_pane *wp) if (pgc->bg != 8 || (pgc->flags & GRID_FLAG_BG256)) { gc->bg = pgc->bg; gc->flags |= (pgc->flags & GRID_FLAG_BG256); - } else if (wp == wp->window->active && + } else if (wp == w->active && (agc->bg != 8 || (agc->flags & GRID_FLAG_BG256))) { gc->bg = agc->bg; gc->flags |= (agc->flags & GRID_FLAG_BG256); @@ -291,7 +291,7 @@ window_create1(u_int sx, u_int sy) w = xcalloc(1, sizeof *w); w->name = NULL; - w->flags = 0; + w->flags = WINDOW_STYLECHANGED; TAILQ_INIT(&w->panes); w->active = NULL; |