From 5289d4ed13e18fa4430aba27af0d525d2f76fc30 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 18 Apr 2020 06:10:15 +0000
Subject: When a redraw is deferred because the terminal hasn't finished
 reading 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.

---
 screen-redraw.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'screen-redraw.c')

diff --git a/screen-redraw.c b/screen-redraw.c
index c510fb68..c9e70590 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -438,17 +438,24 @@ screen_redraw_screen(struct client *c)
 	tty_sync_start(&c->tty);
 
 	if (flags & (CLIENT_REDRAWWINDOW|CLIENT_REDRAWBORDERS)) {
+		log_debug("%s: redrawing borders", c->name);
 		if (ctx.pane_status != PANE_STATUS_OFF)
 			screen_redraw_draw_pane_status(&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);
+	}
 	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);
-	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);
+	}
 
 	tty_reset(&c->tty);
 	tty_sync_end(&c->tty);
-- 
cgit 


From d94bdf7420eb6d0ef88783a35db2c592a3fccec0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 18 Apr 2020 06:15:07 +0000
Subject: Revert previous, there is still a problem.

---
 screen-redraw.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'screen-redraw.c')

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


From 1d2bd864f25a58ab85a6f9f0a448f3a69d8491cd Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 18 Apr 2020 06:20:50 +0000
Subject: Add a flag to protect against nested syncs and add some extra logging
 to redrawing.

---
 screen-redraw.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'screen-redraw.c')

diff --git a/screen-redraw.c b/screen-redraw.c
index c510fb68..c9e70590 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -438,17 +438,24 @@ screen_redraw_screen(struct client *c)
 	tty_sync_start(&c->tty);
 
 	if (flags & (CLIENT_REDRAWWINDOW|CLIENT_REDRAWBORDERS)) {
+		log_debug("%s: redrawing borders", c->name);
 		if (ctx.pane_status != PANE_STATUS_OFF)
 			screen_redraw_draw_pane_status(&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);
+	}
 	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);
-	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);
+	}
 
 	tty_reset(&c->tty);
 	tty_sync_end(&c->tty);
-- 
cgit