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

Bring back previons fix to only redraw panes that need it after a redraw

Browse Source 
is deferred, but clear the pane flags when they are actually redrawn
rather than every time.
This commit is contained in:
nicm 2020-04-18 07:32:53 +00:00
parent e153b928ff
commit b0a37e7514
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
screen-redraw.c
View File

@ -474,6 +474,7 @@ screen_redraw_pane(struct client *c, struct window_pane *wp)
tty_sync_start(&c->tty); tty_sync_start(&c->tty);
screen_redraw_draw_pane(&ctx, wp); screen_redraw_draw_pane(&ctx, wp);
wp->flags &= ~PANE_REDRAW;
tty_reset(&c->tty); tty_reset(&c->tty);
tty_sync_end(&c->tty); tty_sync_end(&c->tty);
@ -563,6 +564,7 @@ screen_redraw_draw_panes(struct screen_redraw_ctx *ctx)
TAILQ_FOREACH(wp, &w->panes, entry) { TAILQ_FOREACH(wp, &w->panes, entry) {
if (window_pane_visible(wp)) if (window_pane_visible(wp))
screen_redraw_draw_pane(ctx, wp); screen_redraw_draw_pane(ctx, wp);
wp->flags &= ~PANE_REDRAW;
} }
} }

18
server-client.c
View File

@ -1370,7 +1370,6 @@ server_client_loop(void)
if (resize) if (resize)
server_client_check_resize(wp); server_client_check_resize(wp);
} }
wp->flags &= ~PANE_REDRAW;
} }
check_window_name(w); check_window_name(w);
} }
@ -1681,7 +1680,7 @@ server_client_check_redraw(struct client *c)
struct session *s = c->session; struct session *s = c->session;
struct tty *tty = &c->tty; struct tty *tty = &c->tty;
struct window_pane *wp; struct window_pane *wp;
int needed, flags, mode = tty->mode; int needed, flags, mode = tty->mode, new_flags = 0;
struct timeval tv = { .tv_usec = 1000 }; struct timeval tv = { .tv_usec = 1000 };
static struct event ev; static struct event ev;
size_t left; size_t left;
@ -1689,11 +1688,12 @@ server_client_check_redraw(struct client *c)
if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED)) if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
return; return;
if (c->flags & CLIENT_ALLREDRAWFLAGS) { if (c->flags & CLIENT_ALLREDRAWFLAGS) {
log_debug("%s: redraw%s%s%s%s", c->name, log_debug("%s: redraw%s%s%s%s%s", c->name,
(c->flags & CLIENT_REDRAWWINDOW) ? " window" : "", (c->flags & CLIENT_REDRAWWINDOW) ? " window" : "",
(c->flags & CLIENT_REDRAWSTATUS) ? " status" : "", (c->flags & CLIENT_REDRAWSTATUS) ? " status" : "",
(c->flags & CLIENT_REDRAWBORDERS) ? " borders" : "", (c->flags & CLIENT_REDRAWBORDERS) ? " borders" : "",
(c->flags & CLIENT_REDRAWOVERLAY) ? " overlay" : ""); (c->flags & CLIENT_REDRAWOVERLAY) ? " overlay" : "",
(c->flags & CLIENT_REDRAWPANES) ? " panes" : "");
} }
/* /*
@ -1711,6 +1711,8 @@ server_client_check_redraw(struct client *c)
break; break;
} }
} }
if (needed)
new_flags |= CLIENT_REDRAWPANES;
} }
if (needed && (left = EVBUFFER_LENGTH(tty->out)) != 0) { if (needed && (left = EVBUFFER_LENGTH(tty->out)) != 0) {
log_debug("%s: redraw deferred (%zu left)", c->name, left); log_debug("%s: redraw deferred (%zu left)", c->name, left);
@ -1720,12 +1722,7 @@ server_client_check_redraw(struct client *c)
log_debug("redraw timer started"); log_debug("redraw timer started");
evtimer_add(&ev, &tv); evtimer_add(&ev, &tv);
} }
c->flags |= new_flags;
/*
* We may have got here for a single pane redraw, but force a
* full redraw next time in case other panes have been updated.
*/
c->flags |= CLIENT_ALLREDRAWFLAGS;
return; return;
} else if (needed) } else if (needed)
log_debug("%s: redraw needed", c->name); log_debug("%s: redraw needed", c->name);
@ -1745,6 +1742,7 @@ server_client_check_redraw(struct client *c)
screen_redraw_pane(c, wp); screen_redraw_pane(c, wp);
} }
} }
c->flags &= ~CLIENT_REDRAWPANES;
} }
if (c->flags & CLIENT_ALLREDRAWFLAGS) { if (c->flags & CLIENT_ALLREDRAWFLAGS) {

4
tmux.h
View File

@ -1542,12 +1542,14 @@ struct client {
#define CLIENT_CONTROL_NOOUTPUT 0x4000000 #define CLIENT_CONTROL_NOOUTPUT 0x4000000
#define CLIENT_DEFAULTSOCKET 0x8000000 #define CLIENT_DEFAULTSOCKET 0x8000000
#define CLIENT_STARTSERVER 0x10000000 #define CLIENT_STARTSERVER 0x10000000
#define CLIENT_REDRAWPANES 0x20000000
#define CLIENT_ALLREDRAWFLAGS \ #define CLIENT_ALLREDRAWFLAGS \
(CLIENT_REDRAWWINDOW| \ (CLIENT_REDRAWWINDOW| \
CLIENT_REDRAWSTATUS| \ CLIENT_REDRAWSTATUS| \
CLIENT_REDRAWSTATUSALWAYS| \ CLIENT_REDRAWSTATUSALWAYS| \
CLIENT_REDRAWBORDERS| \ CLIENT_REDRAWBORDERS| \
CLIENT_REDRAWOVERLAY) CLIENT_REDRAWOVERLAY| \
CLIENT_REDRAWPANES)
#define CLIENT_UNATTACHEDFLAGS \ #define CLIENT_UNATTACHEDFLAGS \
(CLIENT_DEAD| \ (CLIENT_DEAD| \
CLIENT_SUSPENDED| \ CLIENT_SUSPENDED| \

10
tty.c
View File

@ -944,6 +944,7 @@ tty_fake_bce(const struct tty *tty, struct window_pane *wp, u_int bg)
static void static void
tty_redraw_region(struct tty *tty, const struct tty_ctx *ctx) tty_redraw_region(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct client *c = tty->client;
struct window_pane *wp = ctx->wp; struct window_pane *wp = ctx->wp;
struct screen *s = wp->screen; struct screen *s = wp->screen;
u_int i; u_int i;
@ -953,6 +954,7 @@ tty_redraw_region(struct tty *tty, const struct tty_ctx *ctx)
* likely to be followed by some more scrolling. * likely to be followed by some more scrolling.
*/ */
if (tty_large_region(tty, ctx)) { if (tty_large_region(tty, ctx)) {
log_debug("%s: %s, large redraw of %%%u", __func__, c->name, wp->id);
wp->flags |= PANE_REDRAW; wp->flags |= PANE_REDRAW;
return; return;
} }
@ -1484,6 +1486,14 @@ tty_write(void (*cmdfn)(struct tty *, const struct tty_ctx *),
TAILQ_FOREACH(c, &clients, entry) { TAILQ_FOREACH(c, &clients, entry) {
if (!tty_client_ready(c, wp)) if (!tty_client_ready(c, wp))
continue; continue;
if (c->flags & CLIENT_REDRAWPANES) {
/*
* Redraw is already deferred to redraw another pane -
* redraw this one also when that happens.
*/
wp->flags |= PANE_REDRAW;
break;
}
ctx->bigger = tty_window_offset(&c->tty, &ctx->ox, &ctx->oy, ctx->bigger = tty_window_offset(&c->tty, &ctx->ox, &ctx->oy,
&ctx->sx, &ctx->sy); &ctx->sx, &ctx->sy);