diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2011-04-19 21:31:33 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2011-04-19 21:31:33 +0000 |
| commit | 8738141913517ae50d71b17ec531ce9f85dceb4d (patch) | |
| tree | 39260de50a4aa580a043ed1534c70969f59aecff /window-copy.c | |
| parent | 3970853febf1a371d68d27c331e81a2afe1a63bb (diff) | |
| download | rtmux-8738141913517ae50d71b17ec531ce9f85dceb4d.tar.gz rtmux-8738141913517ae50d71b17ec531ce9f85dceb4d.tar.bz2 rtmux-8738141913517ae50d71b17ec531ce9f85dceb4d.zip | |
When mode-mouse is on (it is off by default), automatically enter copy
mode when the mouse is dragged or the mouse wheel is used. Also exit
copy mode when the mouse wheel is scrolled off the bottom. Discussed
with and written by hsim at gmx dot li.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/window-copy.c b/window-copy.c index d21e4124..b3879f62 100644 --- a/window-copy.c +++ b/window-copy.c @@ -760,11 +760,11 @@ window_copy_key_numeric_prefix(struct window_pane *wp, int key) /* ARGSUSED */ void window_copy_mouse( - struct window_pane *wp, unused struct session *sess, struct mouse_event *m) + struct window_pane *wp, struct session *sess, struct mouse_event *m) { struct window_copy_mode_data *data = wp->modedata; struct screen *s = &data->screen; - u_int i; + u_int i, old_cy; if (m->x >= screen_size_x(s)) return; @@ -777,8 +777,11 @@ window_copy_mouse( for (i = 0; i < 5; i++) window_copy_cursor_up(wp, 0); } else if ((m->b & MOUSE_BUTTON) == MOUSE_2) { + old_cy = data->cy; for (i = 0; i < 5; i++) window_copy_cursor_down(wp, 0); + if (old_cy == data->cy) + goto reset_mode; } return; } @@ -792,15 +795,9 @@ window_copy_mouse( window_copy_update_cursor(wp, m->x, m->y); if (window_copy_update_selection(wp)) window_copy_redraw_screen(wp); - } else { - s->mode &= ~MODE_MOUSE_ANY; - s->mode |= MODE_MOUSE_STANDARD; - if (sess != NULL) { - window_copy_copy_selection(wp); - window_pane_reset_mode(wp); - } + return; } - return; + goto reset_mode; } /* Otherwise if other buttons pressed, start selection and motion. */ @@ -812,6 +809,16 @@ window_copy_mouse( window_copy_start_selection(wp); window_copy_redraw_screen(wp); } + + return; + +reset_mode: + s->mode &= ~MODE_MOUSE_ANY; + s->mode |= MODE_MOUSE_STANDARD; + if (sess != NULL) { + window_copy_copy_selection(wp); + window_pane_reset_mode(wp); + } } void |