diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-04-20 18:01:12 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-04-20 18:01:12 +0100 |
| commit | 69e0f2833328dbef6d2273cfce9436a573f22c3b (patch) | |
| tree | 7b3423b6f4ddca43a09e896128ba58811fa0a9f9 | |
| parent | 7934e7a6b518ec96d95fc4e9303d6fdafcac54bc (diff) | |
| parent | 51a0dbb172b5a051711213232a7a963524cf7eb5 (diff) | |
Merge branch 'obsd-master'
| -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; } |