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

Add a flag to protect against nested syncs and add some extra logging to

Browse Source 
redrawing.
This commit is contained in:
nicm 2020-04-18 06:20:50 +00:00
parent d94bdf7420
commit 1d2bd864f2
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
screen-redraw.c
View File

@ -438,17 +438,24 @@ screen_redraw_screen(struct client *c)
tty_sync_start(&c->tty); tty_sync_start(&c->tty);
if (flags & (CLIENT_REDRAWWINDOW|CLIENT_REDRAWBORDERS)) { if (flags & (CLIENT_REDRAWWINDOW|CLIENT_REDRAWBORDERS)) {
log_debug("%s: redrawing borders", c->name);
if (ctx.pane_status != PANE_STATUS_OFF) if (ctx.pane_status != PANE_STATUS_OFF)
screen_redraw_draw_pane_status(&ctx); screen_redraw_draw_pane_status(&ctx);
screen_redraw_draw_borders(&ctx); screen_redraw_draw_borders(&ctx);
} }
if (flags & CLIENT_REDRAWWINDOW) if (flags & CLIENT_REDRAWWINDOW) {
log_debug("%s: redrawing panes", c->name);
screen_redraw_draw_panes(&ctx); screen_redraw_draw_panes(&ctx);
}
if (ctx.statuslines != 0 && if (ctx.statuslines != 0 &&
(flags & (CLIENT_REDRAWSTATUS|CLIENT_REDRAWSTATUSALWAYS))) (flags & (CLIENT_REDRAWSTATUS|CLIENT_REDRAWSTATUSALWAYS))) {
log_debug("%s: redrawing status", c->name);
screen_redraw_draw_status(&ctx); screen_redraw_draw_status(&ctx);
if (c->overlay_draw != NULL && (flags & CLIENT_REDRAWOVERLAY)) }
if (c->overlay_draw != NULL && (flags & CLIENT_REDRAWOVERLAY)) {
log_debug("%s: redrawing overlay", c->name);
c->overlay_draw(c, &ctx); c->overlay_draw(c, &ctx);
}
tty_reset(&c->tty); tty_reset(&c->tty);
tty_sync_end(&c->tty); tty_sync_end(&c->tty);

1
server-client.c
View File

@ -1741,6 +1741,7 @@ server_client_check_redraw(struct client *c)
*/ */
TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) { TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) {
if (wp->flags & PANE_REDRAW) { if (wp->flags & PANE_REDRAW) {
log_debug("%s: redrawing pane %%%u", __func__, wp->id);
tty_update_mode(tty, tty->mode, NULL); tty_update_mode(tty, tty->mode, NULL);
screen_redraw_pane(c, wp); screen_redraw_pane(c, wp);
} }

1
tmux.h
View File

@ -1244,6 +1244,7 @@ struct tty {
#define TTY_BLOCK 0x80 #define TTY_BLOCK 0x80
#define TTY_HAVEDA 0x100 #define TTY_HAVEDA 0x100
#define TTY_HAVEDSR 0x200 #define TTY_HAVEDSR 0x200
#define TTY_SYNCING 0x400
int flags; int flags;
struct tty_term *term; struct tty_term *term;

8
tty.c
View File

@ -1438,15 +1438,19 @@ tty_draw_line(struct tty *tty, struct window_pane *wp, struct screen *s,
void void
tty_sync_start(struct tty *tty) tty_sync_start(struct tty *tty)
{ {
if (tty_get_flags(tty) & TERM_SYNC) if ((~tty->flags & TTY_SYNCING) && (tty_get_flags(tty) & TERM_SYNC)) {
tty_puts(tty, "\033P=1s\033\\"); tty_puts(tty, "\033P=1s\033\\");
tty->flags |= TTY_SYNCING;
}
} }
void void
tty_sync_end(struct tty *tty) tty_sync_end(struct tty *tty)
{ {
if (tty_get_flags(tty) & TERM_SYNC) if (tty_get_flags(tty) & TERM_SYNC) {
tty_puts(tty, "\033P=2s\033\\"); tty_puts(tty, "\033P=2s\033\\");
tty->flags &= ~TTY_SYNCING;
}
} }
static int static int