aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-10-30 10:01:22 +0000
committerThomas Adam <thomas@xteddy.org>2020-10-30 10:01:22 +0000
commit970e8f734c996e6a1402be1181c48abd14b6404a (patch)
treead8797fa0e081a6f46b7e9ee7a162b9144fe7361 /server-client.c
parentce2b6ff40e13fd25f359cfe3faad49b094aad115 (diff)
parent910457f68dfc04c491f31d773788c61300f3f8c7 (diff)
downloadrtmux-970e8f734c996e6a1402be1181c48abd14b6404a.tar.gz
rtmux-970e8f734c996e6a1402be1181c48abd14b6404a.tar.bz2
rtmux-970e8f734c996e6a1402be1181c48abd14b6404a.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/server-client.c b/server-client.c
index d6777113..8ec932f7 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1588,10 +1588,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.
@@ -1691,8 +1687,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;