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

When a redraw is deferred because the terminal hasn't finished reading

Browse Source 
the data from the last one, other panes could update while waiting, so
we set the flag to redraw them all when the new redraw actually
happened. But this means a lot of redrawing panes unnecessarily if they
haven't changed - so instead set a flag to say "at least one pane needs
to be redrawed" then look at the invidual pane flags to see which ones
need it.
This commit is contained in:
nicm
2020-04-18 06:10:15 +00:00
parent a7a9460d27
commit 5289d4ed13
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server-client.c
View File

@ -1681,7 +1681,7 @@ server_client_check_redraw(struct client *c)
struct session *s = c->session;
struct tty *tty = &c->tty;
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 };
static struct event ev;
size_t left;
@ -1689,11 +1689,12 @@ server_client_check_redraw(struct client *c)
if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
return;
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_REDRAWSTATUS) ? " status" : "",
(c->flags & CLIENT_REDRAWBORDERS) ? " borders" : "",
(c->flags & CLIENT_REDRAWOVERLAY) ? " overlay" : "");
(c->flags & CLIENT_REDRAWOVERLAY) ? " overlay" : "",
(c->flags & CLIENT_REDRAWPANES) ? " panes" : "");
}
/*
@ -1711,6 +1712,8 @@ server_client_check_redraw(struct client *c)
break;
}
}
if (needed)
new_flags |= CLIENT_REDRAWPANES;
}
if (needed && (left = EVBUFFER_LENGTH(tty->out)) != 0) {
log_debug("%s: redraw deferred (%zu left)", c->name, left);
@ -1720,12 +1723,7 @@ server_client_check_redraw(struct client *c)
log_debug("redraw timer started");
evtimer_add(&ev, &tv);
}
/*
* 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;
c->flags |= new_flags;
return;
} else if (needed)
log_debug("%s: redraw needed", c->name);
@ -1741,10 +1739,12 @@ server_client_check_redraw(struct client *c)
*/
TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) {
if (wp->flags & PANE_REDRAW) {
log_debug("%s: redrawing pane %%%u", __func__, wp->id);
tty_update_mode(tty, tty->mode, NULL);
screen_redraw_pane(c, wp);
}
}
c->flags &= ~CLIENT_REDRAWPANES;
}
if (c->flags & CLIENT_ALLREDRAWFLAGS) {