circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Cache the window styles and do not look up the window-style options

Browse Source 
unless they have changed.
This commit is contained in:
nicm
2016-05-30 09:50:20 +00:00
parent 36ab4c7c49
commit 1921fac814
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd-set-option.c
View File

@@ -200,6 +200,11 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
status_timer_start_all(); status_timer_start_all();
if (strcmp(oe->name, "monitor-silence") == 0) if (strcmp(oe->name, "monitor-silence") == 0)
alerts_reset_all(); 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. */ /* When the pane-border-status option has been changed, resize panes. */
if (strcmp(oe->name, "pane-border-status") == 0) { if (strcmp(oe->name, "pane-border-status") == 0) {

4
tmux.h
View File

@@ -943,10 +943,14 @@ struct window {
#define WINDOW_ZOOMED 0x1000 #define WINDOW_ZOOMED 0x1000
#define WINDOW_FORCEWIDTH 0x2000 #define WINDOW_FORCEWIDTH 0x2000
#define WINDOW_FORCEHEIGHT 0x4000 #define WINDOW_FORCEHEIGHT 0x4000
#define WINDOW_STYLECHANGED 0x8000
#define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE) #define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE)
struct options *options; struct options *options;
struct grid_cell style;
struct grid_cell active_style;
u_int references; u_int references;
RB_ENTRY(window) entry; RB_ENTRY(window) entry;

35
tty.c
View File

@@ -676,7 +676,8 @@ tty_fake_bce(const struct tty *tty, const struct window_pane *wp)
struct grid_cell gc; struct grid_cell gc;
memcpy(&gc, &grid_default_cell, sizeof 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)) if (gc.bg == 8 && !(gc.flags & GRID_FLAG_BG256))
return (0); return (0);
@@ -1133,10 +1134,10 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct window_pane *wp = ctx->wp; struct window_pane *wp = ctx->wp;
struct screen *s = wp->screen; struct screen *s = wp->screen;
u_int cx; u_int cx, width;
u_int 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? */ /* Is the cursor in the very last position? */
width = ctx->cell->data.width; width = ctx->cell->data.width;
@@ -1443,7 +1444,8 @@ tty_attributes(struct tty *tty, const struct grid_cell *gc,
u_char changed; u_char changed;
memcpy(&gc2, gc, sizeof gc2); 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 * 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 void
tty_default_colours(struct grid_cell *gc, const struct window_pane *wp) tty_default_colours(struct grid_cell *gc, const struct window_pane *wp)
{ {
const struct grid_cell *agc, *pgc, *wgc; struct window *w = wp->window;
struct options *oo = w->options;
if (wp == NULL) const struct grid_cell *agc, *pgc, *wgc;
return;
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; 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 (gc->fg == 8 && !(gc->flags & GRID_FLAG_FG256)) {
if (pgc->fg != 8 || (pgc->flags & GRID_FLAG_FG256)) { if (pgc->fg != 8 || (pgc->flags & GRID_FLAG_FG256)) {
gc->fg = pgc->fg; gc->fg = pgc->fg;
gc->flags |= (pgc->flags & GRID_FLAG_FG256); 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))) { (agc->fg != 8 || (agc->flags & GRID_FLAG_FG256))) {
gc->fg = agc->fg; gc->fg = agc->fg;
gc->flags |= (agc->flags & GRID_FLAG_FG256); 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)) { if (pgc->bg != 8 || (pgc->flags & GRID_FLAG_BG256)) {
gc->bg = pgc->bg; gc->bg = pgc->bg;
gc->flags |= (pgc->flags & GRID_FLAG_BG256); 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))) { (agc->bg != 8 || (agc->flags & GRID_FLAG_BG256))) {
gc->bg = agc->bg; gc->bg = agc->bg;
gc->flags |= (agc->flags & GRID_FLAG_BG256); gc->flags |= (agc->flags & GRID_FLAG_BG256);

2
window.c
View File

@@ -291,7 +291,7 @@ window_create1(u_int sx, u_int sy)
w = xcalloc(1, sizeof *w); w = xcalloc(1, sizeof *w);
w->name = NULL; w->name = NULL;
w->flags = 0; w->flags = WINDOW_STYLECHANGED;
TAILQ_INIT(&w->panes); TAILQ_INIT(&w->panes);
w->active = NULL; w->active = NULL;