diff options
| -rw-r--r-- | usr.bin/tmux/server-client.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index a88c065e527..9fcf8d01fcc 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.220 2017/04/19 14:00:28 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.221 2017/04/20 15:16:20 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -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; } |