diff options
| author | nicm <nicm> | 2014-11-05 23:25:02 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2014-11-05 23:25:02 +0000 |
| commit | 79f52825b58e89404b43cb8d466d04a520de4511 (patch) | |
| tree | af7f729fc90600eb98bd18011ceb4112ed7c077b /input-keys.c | |
| parent | d24c9d7d3efc3be0d4ba28616c3d5e3ef494258a (diff) | |
Tidy up mode-mouse check.
Diffstat (limited to 'input-keys.c')
| -rw-r--r-- | input-keys.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/input-keys.c b/input-keys.c index 7ce71931..040a0605 100644 --- a/input-keys.c +++ b/input-keys.c @@ -205,6 +205,7 @@ input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m) char buf[40]; size_t len; struct paste_buffer *pb; + int event; if (wp->screen->mode & ALL_MOUSE_MODES) { /* @@ -238,19 +239,16 @@ input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m) return; } - if (m->button == 1 && (m->event & MOUSE_EVENT_CLICK) && - options_get_number(&wp->window->options, "mode-mouse") == 1) { + if (options_get_number(&wp->window->options, "mode-mouse") != 1) + return; + event = m->event & (MOUSE_EVENT_CLICK|MOUSE_EVENT_WHEEL); + if (wp->mode == NULL && m->button == 1 && event == MOUSE_EVENT_CLICK) { pb = paste_get_top(); - if (pb != NULL) { - paste_send_pane(pb, wp, "\r", - wp->screen->mode & MODE_BRACKETPASTE); - } - } else if (m->button != 1 && - options_get_number(&wp->window->options, "mode-mouse") == 1) { - if (window_pane_set_mode(wp, &window_copy_mode) == 0) { - window_copy_init_from_pane(wp); - if (wp->mode->mouse != NULL) - wp->mode->mouse(wp, s, m); - } + if (pb != NULL) + paste_send_pane(pb, wp, "\r", 1); + } else if (window_pane_set_mode(wp, &window_copy_mode) == 0) { + window_copy_init_from_pane(wp); + if (wp->mode->mouse != NULL) + wp->mode->mouse(wp, s, m); } } |