aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-09 16:01:45 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-09 16:01:45 +0100
commit52e3d960e7ebe2006509d48c427ffd8f25a0cf52 (patch)
tree8f6deb3d44616e92ff05735b4c587dfe3c5d8235 /server-client.c
parent916c3787d7464f66287f83814d563ff36ff3a96a (diff)
parent26f5dfbe46c75f8b907ee75daaadde9a310d8dfb (diff)
downloadrtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.tar.gz
rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.tar.bz2
rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c
index 355e4eca..76d20ddb 100644
--- a/server-client.c
+++ b/server-client.c
@@ -604,10 +604,9 @@ have_event:
wp = window_get_active_at(s->curw->window, px, py);
if (wp != NULL)
where = PANE;
+ else
+ return (KEYC_UNKNOWN);
}
-
- if (where == NOWHERE)
- return (KEYC_UNKNOWN);
if (where == PANE)
log_debug("mouse %u,%u on pane %%%u", x, y, wp->id);
else if (where == BORDER)
@@ -1541,7 +1540,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 = 0;
+ int mode, cursor;
u_int cx = 0, cy = 0, ox, oy, sx, sy;
if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))