diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2018-10-03 15:27:56 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2018-10-03 15:27:56 +0000 |
| commit | 38b2b09d5f6907d19f28aec8950c097186cb0486 (patch) | |
| tree | aa0a2e412286bcda3796ff74f0f6763a9c83dd27 /usr.bin | |
| parent | 561ad8245cc6b26fb88f5dd937f9094b4eb4fb48 (diff) | |
Do not move the cursor when the mouse wheel is used, GitHub issue 1493.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/window-copy.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 3c348b1fb29..aca236f4e77 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.846 2018/09/25 14:27:20 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.847 2018/10/03 15:27:55 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -936,7 +936,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/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index 6b05f5896e3..d308944d5f4 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.201 2018/09/25 14:27:20 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.202 2018/10/03 15:27:55 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -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) { |