diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-11-27 14:22:44 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-11-27 14:22:44 +0000 |
| commit | b97280b3b7195db1b2543666a7c6444960f54721 (patch) | |
| tree | 49cec3406b40cda98434fbaa35da74a23422862f /usr.bin/tmux | |
| parent | 5b34aecd1c8bddda6ebe6f9c1b95510ed3f9a254 (diff) | |
If the application inside tmux has requested any mouse modes itself, do
not let mode-mouse take any effect. From Sergey Naumov.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/input-keys.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/tmux/input-keys.c b/usr.bin/tmux/input-keys.c index 2ff1ecae3cc..92d7bd777f4 100644 --- a/usr.bin/tmux/input-keys.c +++ b/usr.bin/tmux/input-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input-keys.c,v 1.27 2012/10/26 14:35:42 nicm Exp $ */ +/* $OpenBSD: input-keys.c,v 1.28 2012/11/27 14:22:43 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -224,7 +224,8 @@ input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m) } if ((m->xb & 3) != 1 && - options_get_number(&wp->window->options, "mode-mouse") == 1) { + options_get_number(&wp->window->options, "mode-mouse") == 1 && + (wp->base.mode & ALL_MOUSE_MODES) == 0) { if (window_pane_set_mode(wp, &window_copy_mode) == 0) { window_copy_init_from_pane(wp); if (wp->mode->mouse != NULL) |