diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-04-20 19:09:36 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-04-20 19:09:36 +0100 |
| commit | 4a2e75fc8c4a7d91f7c080605749e9dc564f2c2b (patch) | |
| tree | 6feed5010969fd0ee5f1bb3719ff779a341b30d8 /server-client.c | |
| parent | 9420758127dbcf4de83d3f4d9354e292c015f1ba (diff) | |
| parent | 69e0f2833328dbef6d2273cfce9436a573f22c3b (diff) | |
| download | rtmux-4a2e75fc8c4a7d91f7c080605749e9dc564f2c2b.tar.gz rtmux-4a2e75fc8c4a7d91f7c080605749e9dc564f2c2b.tar.bz2 rtmux-4a2e75fc8c4a7d91f7c080605749e9dc564f2c2b.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index e42ad8e0..3cabde71 100644 --- a/server-client.c +++ b/server-client.c @@ -938,8 +938,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; @@ -948,10 +948,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; } |