diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-10-03 17:02:38 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-10-03 17:02:38 +0100 |
| commit | c44bb2df1769bf0cd334ef117a86db6e3748a33e (patch) | |
| tree | 2a809dc1a8a60485f08d2ac96f9ddc21cbfa1f21 | |
| parent | 5a7cf897f266345635c6adeca20c9bb90dbe1e2f (diff) | |
| parent | f7c85f3ed8f151501fb72a1c18a48d126d89c83c (diff) | |
| download | rtmux-c44bb2df1769bf0cd334ef117a86db6e3748a33e.tar.gz rtmux-c44bb2df1769bf0cd334ef117a86db6e3748a33e.tar.bz2 rtmux-c44bb2df1769bf0cd334ef117a86db6e3748a33e.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | tmux.h | 2 | ||||
| -rw-r--r-- | window-copy.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -945,7 +945,7 @@ RB_HEAD(sessions, session); /* Mouse wheel states. */ #define MOUSE_WHEEL_UP 0 -#define MOUSE_WHEEL_DOWN 64 +#define MOUSE_WHEEL_DOWN 1 /* Mouse helpers. */ #define MOUSE_BUTTONS(b) ((b) & MOUSE_MASK_BUTTONS) diff --git a/window-copy.c b/window-copy.c index 78667b1e..e35e6070 100644 --- a/window-copy.c +++ b/window-copy.c @@ -529,7 +529,7 @@ window_copy_command(struct window_pane *wp, struct client *c, struct session *s, return; command = args->argv[0]; - if (m != NULL && m->valid) + if (m != NULL && m->valid && !MOUSE_WHEEL(m->b)) window_copy_move_mouse(m); if (args->argc == 1) { |