summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/server-window.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2013-03-21 18:47:01 +0000
committernicm <nicm@openbsd.org>2013-03-21 18:47:01 +0000
commit721350bc845417cf2d339086a6f2b8fcb59e5551 (patch)
tree1cb8041444d1597675eaf4c7ad23e66b588e33eb /usr.bin/tmux/server-window.c
parentDo not include status line in size calculations in control mode. (diff)
downloadwireguard-openbsd-721350bc845417cf2d339086a6f2b8fcb59e5551.tar.xz
wireguard-openbsd-721350bc845417cf2d339086a6f2b8fcb59e5551.zip
Add various checks to turn off bits that can't work in control mode
(such as lock).
Diffstat (limited to 'usr.bin/tmux/server-window.c')
-rw-r--r--usr.bin/tmux/server-window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/server-window.c b/usr.bin/tmux/server-window.c
index eb54a0f73b8..d7278987c9f 100644
--- a/usr.bin/tmux/server-window.c
+++ b/usr.bin/tmux/server-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-window.c,v 1.27 2012/10/25 11:16:53 nicm Exp $ */
+/* $OpenBSD: server-window.c,v 1.28 2013/03/21 18:47:01 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -85,7 +85,7 @@ server_window_check_bell(struct session *s, struct winlink *wl)
return (0);
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
- if (c == NULL || c->session != s)
+ if (c == NULL || c->session != s || (c->flags & CLIENT_CONTROL))
continue;
if (!visual) {
tty_bell(&c->tty);
@@ -242,7 +242,7 @@ ring_bell(struct session *s)
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
- if (c != NULL && c->session == s)
+ if (c != NULL && c->session == s && !(c->flags & CLIENT_CONTROL))
tty_bell(&c->tty);
}
}