circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 10:08:47 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1137:

Browse Source 
Tidy up bell code, from Thomas Adam.
This commit is contained in:
Tiago Cunha 2012-06-18 15:17:55 +00:00
parent fce30422f3
commit a401420273
1 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server-window.c
View File

@ -76,13 +76,11 @@ server_window_check_bell(struct session *s, struct winlink *wl)
return (0); return (0);
if (s->curw != wl || s->flags & SESSION_UNATTACHED) if (s->curw != wl || s->flags & SESSION_UNATTACHED)
wl->flags |= WINLINK_BELL; wl->flags |= WINLINK_BELL;
action = options_get_number(&s->options, "bell-action");
switch (action) {
case BELL_ANY:
if (s->flags & SESSION_UNATTACHED) if (s->flags & SESSION_UNATTACHED)
break; return (1);
visual = options_get_number(&s->options, "visual-bell"); visual = options_get_number(&s->options, "visual-bell");
action = options_get_number(&s->options, "bell-action");
for (i = 0; i < ARRAY_LENGTH(&clients); i++) { for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i); c = ARRAY_ITEM(&clients, i);
if (c == NULL || c->session != s) if (c == NULL || c->session != s)
@ -91,31 +89,12 @@ server_window_check_bell(struct session *s, struct winlink *wl)
tty_bell(&c->tty); tty_bell(&c->tty);
continue; continue;
} }
if (c->session->curw->window == w) { if (c->session->curw->window == w)
status_message_set(c, "Bell in current window"); status_message_set(c, "Bell in current window");
continue; else if (action == BELL_ANY) {
}
status_message_set(c, "Bell in window %u", status_message_set(c, "Bell in window %u",
winlink_find_by_window(&s->windows, w)->idx); winlink_find_by_window(&s->windows, w)->idx);
} }
break;
case BELL_CURRENT:
if (s->flags & SESSION_UNATTACHED)
break;
visual = options_get_number(&s->options, "visual-bell");
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c == NULL || c->session != s)
continue;
if (c->session->curw->window != w)
continue;
if (!visual) {
tty_bell(&c->tty);
continue;
}
status_message_set(c, "Bell in current window");
}
break;
} }
return (1); return (1);