Change focus to be driven by events rather than walking all panes at end

of event loop, this way the ordering of in and out can be enforced.
GitHub issue 2808.

1 files changed, 4 insertions, 2 deletions

diff --git a/tty-keys.c b/tty-keys.c
index 02fba0e5..156fceba 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -821,11 +821,13 @@ complete_key:
 
 	/* Check for focus events. */
 	if (key == KEYC_FOCUS_OUT) {
-		tty->client->flags &= ~CLIENT_FOCUSED;
+		c->flags &= ~CLIENT_FOCUSED;
+		window_update_focus(c->session->curw->window);
 		notify_client("client-focus-out", c);
 	} else if (key == KEYC_FOCUS_IN) {
-		tty->client->flags |= CLIENT_FOCUSED;
+		c->flags |= CLIENT_FOCUSED;
 		notify_client("client-focus-in", c);
+		window_update_focus(c->session->curw->window);
 	}
 
 	/* Fire the key. */