diff options
| author | nicm <nicm> | 2016-11-24 13:46:50 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2016-11-24 13:46:50 +0000 |
| commit | 0d1be2e32838cfb4f4b528fc3f94ef850b47eda7 (patch) | |
| tree | 637e662987cb95e2af0577c941f249813e10d50c /key-bindings.c | |
| parent | 7e6c2cb23868fbfec11adacdc5da7e670a9b8bdb (diff) | |
Fix so that we work out the right pane from mouse events - we were doing
so too early, before the mouse event was necessarily valid, so could end
up using the pane from the previous mouse event, or the active pane.
It is important that we use the right pane now that different panes can
have different key tables (for copy mode).
Fixes problem reported by Greg Hurrell.
Diffstat (limited to 'key-bindings.c')
| -rw-r--r-- | key-bindings.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/key-bindings.c b/key-bindings.c index 9bc61b62..e8eedca5 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -259,12 +259,13 @@ key_bindings_init(void) "bind -Tcopy-mode n send -X search-again", "bind -Tcopy-mode q send -X cancel", "bind -Tcopy-mode t command-prompt -1p'jump to forward' \"send -X jump-to-forward \\\"%%%\\\"\"", - "bind -Tcopy-mode MouseDrag1Pane send -X begin-selection", + "bind -Tcopy-mode MouseDown1Pane select-pane", + "bind -Tcopy-mode MouseDrag1Pane select-pane\\; send -X begin-selection", "bind -Tcopy-mode MouseDragEnd1Pane send -X copy-selection-and-cancel", - "bind -Tcopy-mode WheelUpPane send -N5 -X scroll-up", - "bind -Tcopy-mode WheelDownPane send -N5 -X scroll-down", - "bind -Tcopy-mode DoubleClick1Pane send -X select-word", - "bind -Tcopy-mode TripleClick1Pane send -X select-line", + "bind -Tcopy-mode WheelUpPane select-pane\\; send -N5 -X scroll-up", + "bind -Tcopy-mode WheelDownPane select-pane\\; send -N5 -X scroll-down", + "bind -Tcopy-mode DoubleClick1Pane select-pane\\; send -X select-word", + "bind -Tcopy-mode TripleClick1Pane select-pane\\; send -X select-line", "bind -Tcopy-mode NPage send -X page-down", "bind -Tcopy-mode PPage send -X page-up", "bind -Tcopy-mode Up send -X cursor-up", @@ -356,12 +357,13 @@ key_bindings_init(void) "bind -Tcopy-mode-vi w send -X next-word", "bind -Tcopy-mode-vi { send -X previous-paragraph", "bind -Tcopy-mode-vi } send -X next-paragraph", - "bind -Tcopy-mode-vi MouseDrag1Pane send -X begin-selection", + "bind -Tcopy-mode-vi MouseDown1Pane select-pane", + "bind -Tcopy-mode-vi MouseDrag1Pane select-pane\\; send -X begin-selection", "bind -Tcopy-mode-vi MouseDragEnd1Pane send -X copy-selection-and-cancel", - "bind -Tcopy-mode-vi WheelUpPane send -N5 -X scroll-up", - "bind -Tcopy-mode-vi WheelDownPane send -N5 -X scroll-down", - "bind -Tcopy-mode-vi DoubleClick1Pane send -X select-word", - "bind -Tcopy-mode-vi TripleClick1Pane send -X select-line", + "bind -Tcopy-mode-vi WheelUpPane select-pane\\; send -N5 -X scroll-up", + "bind -Tcopy-mode-vi WheelDownPane select-pane\\; send -N5 -X scroll-down", + "bind -Tcopy-mode-vi DoubleClick1Pane select-pane\\; send -X select-word", + "bind -Tcopy-mode-vi TripleClick1Pane select-pane\\; send -X select-line", "bind -Tcopy-mode-vi BSpace send -X cursor-left", "bind -Tcopy-mode-vi NPage send -X page-down", "bind -Tcopy-mode-vi PPage send -X page-up", |