diff options
Diffstat (limited to 'usr.bin/tmux/window-copy.c')
| -rw-r--r-- | usr.bin/tmux/window-copy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index 3863799c440..0300d4f5307 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.83 2012/09/25 07:39:28 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.84 2012/10/26 14:35:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -829,11 +829,11 @@ window_copy_mouse( return; /* If mouse wheel (buttons 4 and 5), scroll. */ - if ((m->b & MOUSE_45)) { - if ((m->b & MOUSE_BUTTON) == MOUSE_1) { + if (m->event == MOUSE_EVENT_WHEEL) { + if (m->wheel == MOUSE_WHEEL_UP) { for (i = 0; i < 5; i++) window_copy_cursor_up(wp, 0); - } else if ((m->b & MOUSE_BUTTON) == MOUSE_2) { + } else if (m->wheel == MOUSE_WHEEL_DOWN) { for (i = 0; i < 5; i++) window_copy_cursor_down(wp, 0); if (data->oy == 0) @@ -847,7 +847,7 @@ window_copy_mouse( * pressed, or stop the selection on their release. */ if (s->mode & MODE_MOUSE_BUTTON) { - if ((m->b & MOUSE_BUTTON) != MOUSE_UP) { + if (~m->event & MOUSE_EVENT_UP) { window_copy_update_cursor(wp, m->x, m->y); if (window_copy_update_selection(wp)) window_copy_redraw_screen(wp); @@ -857,7 +857,7 @@ window_copy_mouse( } /* Otherwise if other buttons pressed, start selection and motion. */ - if ((m->b & MOUSE_BUTTON) != MOUSE_UP) { + if (~m->event & MOUSE_EVENT_UP) { s->mode &= ~MODE_MOUSE_STANDARD; s->mode |= MODE_MOUSE_BUTTON; |