summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-04-01 09:23:31 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-04-01 09:23:31 +0000
commitc11da7ca88b3553cd6e9ecf09843e815fab43d73 (patch)
treee34a08c55340eb4bd8b50754b6c9c4df787a83f9
parentcd8e536c430d8a605d5452f03674b7bdfd0b5fa7 (diff)
Only exit mouse mode on scroll wheel when actually reaching the end of
the history, from James Nylen.
-rw-r--r--window-copy.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/window-copy.c b/window-copy.c
index 2f1c353c..517f4d49 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -822,7 +822,7 @@ window_copy_mouse(
{
struct window_copy_mode_data *data = wp->modedata;
struct screen *s = &data->screen;
- u_int i, old_cy;
+ u_int i;
if (m->x >= screen_size_x(s))
return;
@@ -835,10 +835,9 @@ 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)
+ if (data->oy == 0)
goto reset_mode;
}
return;