aboutsummaryrefslogtreecommitdiff
path: root/window-copy.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-04-10 09:45:41 +0000
committerTiago Cunha <tcunha@gmx.com>2012-04-10 09:45:41 +0000
commit2c4e8b92ab584633ecfeaf6b96972950a0bacab6 (patch)
tree86cc034aefd95d8bee2c0eff73c175c4c8d53261 /window-copy.c
parent86c13354526348512259d5f196f7450a7fb9a9b9 (diff)
downloadrtmux-2c4e8b92ab584633ecfeaf6b96972950a0bacab6.tar.gz
rtmux-2c4e8b92ab584633ecfeaf6b96972950a0bacab6.tar.bz2
rtmux-2c4e8b92ab584633ecfeaf6b96972950a0bacab6.zip
Sync OpenBSD patchset 1082:
Only exit mouse mode on scroll wheel when actually reaching the end of the history, from James Nylen.
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/window-copy.c b/window-copy.c
index 68e260dc..636bee06 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;