diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2012-11-22 16:48:50 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2012-11-22 16:48:50 +0000 |
| commit | 63f451965cf26bf6baadc374bd0dcadc8ca66308 (patch) | |
| tree | ac3b5f838273eed3271e04b4132fb22807705c42 /window-copy.c | |
| parent | 60808bbdede5c489a1faa6671999a92a67b28024 (diff) | |
| parent | c04aa9020782fe0a944db2adf5a03e9f52618bea (diff) | |
| download | rtmux-63f451965cf26bf6baadc374bd0dcadc8ca66308.tar.gz rtmux-63f451965cf26bf6baadc374bd0dcadc8ca66308.tar.bz2 rtmux-63f451965cf26bf6baadc374bd0dcadc8ca66308.zip | |
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/window-copy.c b/window-copy.c index 1284913b..480fdc70 100644 --- a/window-copy.c +++ b/window-copy.c @@ -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; |