Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2013-03-25 14:59:29 +00:00
111 changed files with 4151 additions and 2409 deletions

View File

@@ -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);
}
}