circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 04:27:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-04-22 12:01:19 +01:00
parent b08e451c91 55cd4c7bc7
commit e802b683ea
55 changed files with 365 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server-client.c
View File

@ -854,10 +854,9 @@ server_client_handle_key(struct client *c, key_code key)
m->valid = 0;
/* Find affected pane. */
if (KEYC_IS_MOUSE(key) && m->valid)
wp = cmd_mouse_pane(m, NULL, NULL);
else
wp = w->active;
if (!KEYC_IS_MOUSE(key) || cmd_find_from_mouse(&fs, m) != 0)
cmd_find_from_session(&fs, s);
wp = fs.wp;
/* Forward mouse keys if disabled. */
if (KEYC_IS_MOUSE(key) && !options_get_number(s->options, "mouse"))
@ -944,13 +943,8 @@ retry:
}
server_status_client(c);
/* Find default state if the pane is known. */
if (KEYC_IS_MOUSE(key) && m->valid && wp != NULL) {
cmd_find_from_winlink_pane(&fs, s->curw, wp);
cmd_find_log_state(__func__, &fs);
key_bindings_dispatch(bd, c, m, &fs);
} else
key_bindings_dispatch(bd, c, m, NULL);
/* Execute the key binding. */
key_bindings_dispatch(bd, c, m, &fs);
key_bindings_unref_table(table);
return;
}