From 2bb0b9d6c5edd7c4127c971f5ccebed969f86c1c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 13 Aug 2021 06:52:51 +0000
Subject: 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.

---
 session.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'session.c')

diff --git a/session.c b/session.c
index cb0093a2..73f44e18 100644
--- a/session.c
+++ b/session.c
@@ -489,6 +489,8 @@ session_last(struct session *s)
 int
 session_set_current(struct session *s, struct winlink *wl)
 {
+	struct winlink	*old = s->curw;
+
 	if (wl == NULL)
 		return (-1);
 	if (wl == s->curw)
@@ -497,6 +499,10 @@ session_set_current(struct session *s, struct winlink *wl)
 	winlink_stack_remove(&s->lastw, wl);
 	winlink_stack_push(&s->lastw, s->curw);
 	s->curw = wl;
+	if (options_get_number(global_options, "focus-events")) {
+		window_update_focus(old->window);
+		window_update_focus(wl->window);
+	}
 	winlink_clear_flags(wl);
 	window_update_activity(wl->window);
 	tty_update_window_offset(wl->window);
-- 
cgit v1.2.3