From 649e5970e98b0073763f42a25dcab02aadea688f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 30 Oct 2020 08:55:56 +0000
Subject: Add a -O flag to display-menu to change the mouse behaviour and not
 close the menu when the mouse is released, from teo_paul1 at yahoo dot com.

---
 server-client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server-client.c')

diff --git a/server-client.c b/server-client.c
index 4c9706f7..3c2b54d5 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1693,8 +1693,8 @@ server_client_reset_state(struct client *c)
 	 * mode.
 	 */
 	if (options_get_number(oo, "mouse")) {
-		mode &= ~ALL_MOUSE_MODES;
 		if (c->overlay_draw == NULL) {
+			mode &= ~ALL_MOUSE_MODES;
 			TAILQ_FOREACH(loop, &w->panes, entry) {
 				if (loop->screen->mode & MODE_MOUSE_ALL)
 					mode |= MODE_MOUSE_ALL;
-- 
cgit 


From 910457f68dfc04c491f31d773788c61300f3f8c7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 30 Oct 2020 09:00:07 +0000
Subject: There is no reason not to fire focus events when a pane is in a mode,
 GitHub issue 2372.

---
 server-client.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'server-client.c')

diff --git a/server-client.c b/server-client.c
index 3c2b54d5..190897ff 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1590,10 +1590,6 @@ server_client_check_pane_focus(struct window_pane *wp)
 	if (wp->window->active != wp)
 		goto not_focused;
 
-	/* If we're in a mode, we're not focused. */
-	if (wp->screen != &wp->base)
-		goto not_focused;
-
 	/*
 	 * If our window is the current window in any focused clients with an
 	 * attached session, we're focused.
-- 
cgit