From a384245c5aa1b1be2a73d9b3318a4c0d5bfc5391 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 8 May 2019 18:05:03 +0000
Subject: [PATCH] Adjust how mouse targets are found so they always have a
 session, window and pane.

---
 cmd-find.c |  8 ++++++--
 cmd.c      | 17 +++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/cmd-find.c b/cmd-find.c
index 2fa53b9c..e5ef8b99 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -1040,12 +1040,16 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
 		switch (type) {
 		case CMD_FIND_PANE:
 			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
-			if (fs->wp != NULL)
+			if (fs->wp != NULL) {
 				fs->w = fs->wl->window;
-			break;
+				break;
+			}
+			/* FALLTHROUGH */
 		case CMD_FIND_WINDOW:
 		case CMD_FIND_SESSION:
 			fs->wl = cmd_mouse_window(m, &fs->s);
+			if (fs->wl == NULL && fs->s != NULL)
+				fs->wl = fs->s->curw;
 			if (fs->wl != NULL) {
 				fs->w = fs->wl->window;
 				fs->wp = fs->w->active;
diff --git a/cmd.c b/cmd.c
index a0ec6aa6..c81ed12d 100644
--- a/cmd.c
+++ b/cmd.c
@@ -510,17 +510,22 @@ cmd_mouse_window(struct mouse_event *m, struct session **sp)
 {
 	struct session	*s;
 	struct window	*w;
+	struct winlink	*wl;
 
-	if (!m->valid || m->s == -1 || m->w == -1)
+	if (!m->valid)
 		return (NULL);
-	if ((s = session_find_by_id(m->s)) == NULL)
+	if (m->s == -1 || (s = session_find_by_id(m->s)) == NULL)
 		return (NULL);
-	if ((w = window_find_by_id(m->w)) == NULL)
-		return (NULL);
-
+	if (m->w == -1)
+		wl = s->curw;
+	else {
+		if ((w = window_find_by_id(m->w)) == NULL)
+			return (NULL);
+		wl = winlink_find_by_window(&s->windows, w);
+	}
 	if (sp != NULL)
 		*sp = s;
-	return (winlink_find_by_window(&s->windows, w));
+	return (wl);
 }
 
 /* Get current mouse pane if any. */