summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2012-04-01 09:23:31 +0000
committernicm <nicm@openbsd.org>2012-04-01 09:23:31 +0000
commit2f8a8549c2745354cf9da0587a70eb644cf8775c (patch)
treeae06d34bdceda291173450dc355b772b3d23cce2
parentOnly find each window once no matter how many panes, from Jonathan (diff)
downloadwireguard-openbsd-2f8a8549c2745354cf9da0587a70eb644cf8775c.tar.xz
wireguard-openbsd-2f8a8549c2745354cf9da0587a70eb644cf8775c.zip
Only exit mouse mode on scroll wheel when actually reaching the end of
the history, from James Nylen.
-rw-r--r--usr.bin/tmux/window-copy.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c
index bfec3fdbd8e..78788b7a549 100644
--- a/usr.bin/tmux/window-copy.c
+++ b/usr.bin/tmux/window-copy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.78 2012/03/17 21:40:53 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.79 2012/04/01 09:23:31 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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;