summaryrefslogtreecommitdiff
path: root/usr.bin/tmux
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2011-04-18 20:57:17 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2011-04-18 20:57:17 +0000
commitd1d8eb6defadb700d55d423de71fc68e597f34d3 (patch)
treece1cf102effbd9779cf8eca1b92b7ff1e60a588b /usr.bin/tmux
parent37b176fc2f4fd2089482744ef2efdca8ebf1c06e (diff)
The mouse should only work in copy mode if mode-mouse is set, not just
mouse-select-pane.
Diffstat (limited to 'usr.bin/tmux')
-rw-r--r--usr.bin/tmux/window.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c
index 4bc7b9db100..c448a50ffd6 100644
--- a/usr.bin/tmux/window.c
+++ b/usr.bin/tmux/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.64 2011/03/27 20:27:27 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.65 2011/04/18 20:57:16 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -884,7 +884,8 @@ window_pane_mouse(
m->y -= wp->yoff;
if (wp->mode != NULL) {
- if (wp->mode->mouse != NULL)
+ if (wp->mode->mouse != NULL &&
+ options_get_number(&wp->window->options, "mode-mouse"))
wp->mode->mouse(wp, sess, m);
} else if (wp->fd != -1)
input_mouse(wp, m);