diff options
| author | Thomas Adam <thomas@xteddy.org> | 2012-10-26 20:28:58 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2012-10-26 20:28:58 +0100 |
| commit | 47fbf87185ff60c201bffa432092035cafcc220f (patch) | |
| tree | 00de0956f2c22759d4c865c0932594d0ce6dd9c4 /window-copy.c | |
| parent | 31f93d84458dca70b94f1b20fa67f64e08e05305 (diff) | |
| parent | d210d99ccecfaa2ef23a65609dc8cbb26bcfe236 (diff) | |
| download | rtmux-47fbf87185ff60c201bffa432092035cafcc220f.tar.gz rtmux-47fbf87185ff60c201bffa432092035cafcc220f.tar.bz2 rtmux-47fbf87185ff60c201bffa432092035cafcc220f.zip | |
Merge branch 'obsd-master'
Sync from OpenBSD.
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; |