From 51a0dbb172b5a051711213232a7a963524cf7eb5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 20 Apr 2017 15:16:20 +0000
Subject: [PATCH] Only set up a current target for mouse key bindings. Fixes:

	bind q select-pane -U \; resize-pane -Z

(There is still some possible weirdness with the way we do current
targets, it should probably be done in a different way at some point.)
---
 server-client.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/server-client.c b/server-client.c
index ca1d1508..41135c00 100644
--- a/server-client.c
+++ b/server-client.c
@@ -940,8 +940,8 @@ retry:
 		server_status_client(c);
 
 		/* Find default state if the pane is known. */
-		cmd_find_clear_state(&fs, NULL, 0);
-		if (wp != NULL) {
+		if (KEYC_IS_MOUSE(key) && m->valid && wp != NULL) {
+			cmd_find_clear_state(&fs, NULL, 0);
 			fs.s = s;
 			fs.wl = fs.s->curw;
 			fs.w = fs.wl->window;
@@ -950,10 +950,9 @@ retry:
 
 			if (!cmd_find_valid_state(&fs))
 				fatalx("invalid key state");
-		}
-
-		/* Dispatch the key binding. */
-		key_bindings_dispatch(bd, c, m, &fs);
+			key_bindings_dispatch(bd, c, m, &fs);
+		} else
+			key_bindings_dispatch(bd, c, m, NULL);
 		key_bindings_unref_table(table);
 		return;
 	}