summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2011-12-24 08:27:00 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2011-12-24 08:27:00 +0000
commita6e43824140cebc291b59e52fdd6b4371657e2a9 (patch)
tree3ae1d41151666330980c659555717c5f3e2854cd /usr.bin/tmux/server-client.c
parent232824c47bc9385e79b2d25ddb7fcfe108acd712 (diff)
Fix so that when mouse-select-pane and mouse-select-window are both
enabled, clicking on the status line does not change the current pane. From Romain Francoise.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
-rw-r--r--usr.bin/tmux/server-client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index e43a11db1e0..6e18cb6a533 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.61 2011/08/20 20:37:30 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.62 2011/12/24 08:26:59 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -320,6 +320,8 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data)
if (c->flags & CLIENT_READONLY)
return;
if (options_get_number(oo, "mouse-select-pane") &&
+ (!(options_get_number(oo, "status") &&
+ mouse->y + 1 == c->tty.sy)) &&
((!(mouse->b & MOUSE_DRAG) && mouse->b != MOUSE_UP) ||
wp->mode != &window_copy_mode)) {
/*