From 2083a6ea2050fb211eab3da0df0ff5a40b4973b4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 20 Apr 2020 14:59:31 +0000
Subject: Change how sync works to always send the end sequence after all
 output is done when we are returning to the event loop (since we always move
 the cursor at that point). Also a man fix from jmc.

---
 server-client.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'server-client.c')

diff --git a/server-client.c b/server-client.c
index cd850593..8da55ac0 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1541,7 +1541,7 @@ server_client_reset_state(struct client *c)
 	struct window_pane	*wp = w->active, *loop;
 	struct screen		*s;
 	struct options		*oo = c->session->options;
-	int			 mode, cursor;
+	int			 mode, cursor, flags;
 	u_int			 cx = 0, cy = 0, ox, oy, sx, sy;
 
 	if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
@@ -1606,6 +1606,16 @@ server_client_reset_state(struct client *c)
 	/* Set the terminal mode and reset attributes. */
 	tty_update_mode(&c->tty, mode, s);
 	tty_reset(&c->tty);
+
+	/*
+	 * All writing must be done, send a sync end (if it was started). It
+	 * may have been started by redrawing so needs to go out even if the
+	 * block flag is set.
+	 */
+	flags = (c->tty.flags & TTY_BLOCK);
+	c->tty.flags &= ~TTY_BLOCK;
+	tty_sync_end(&c->tty);
+	c->tty.flags |= flags;
 }
 
 /* Repeat time callback. */
-- 
cgit