diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2011-07-04 08:23:39 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2011-07-04 08:23:39 +0000 |
| commit | 8144e5cb7e0d7eff1b33c273d6ae1da11c0ae758 (patch) | |
| tree | c0cb407ef517ff06052be84cbf50f26b3e51ef07 | |
| parent | fce026eb32292f412d4fda8cfc495da7b655e99d (diff) | |
| download | rtmux-8144e5cb7e0d7eff1b33c273d6ae1da11c0ae758.tar.gz rtmux-8144e5cb7e0d7eff1b33c273d6ae1da11c0ae758.tar.bz2 rtmux-8144e5cb7e0d7eff1b33c273d6ae1da11c0ae758.zip | |
Sync OpenBSD patchset 929:
Add an option to trigger the terminal bell when there is an alert, from
Marco Beck.
| -rw-r--r-- | options-table.c | 7 | ||||
| -rw-r--r-- | server-window.c | 24 | ||||
| -rw-r--r-- | tmux.1 | 5 |
3 files changed, 34 insertions, 2 deletions
diff --git a/options-table.c b/options-table.c index e69b32ae..daeade54 100644 --- a/options-table.c +++ b/options-table.c @@ -1,4 +1,4 @@ -/* $Id: options-table.c,v 1.12 2011-05-22 16:26:09 tcunha Exp $ */ +/* $Id$ */ /* * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net> @@ -97,6 +97,11 @@ const struct options_table_entry session_options_table[] = { .default_num = BELL_ANY }, + { .name = "bell-on-alert", + .type = OPTIONS_TABLE_FLAG, + .default_num = 0 + }, + { .name = "default-command", .type = OPTIONS_TABLE_STRING, .default_str = "" diff --git a/server-window.c b/server-window.c index 79f30e42..d3735a76 100644 --- a/server-window.c +++ b/server-window.c @@ -1,4 +1,4 @@ -/* $Id: server-window.c,v 1.20 2011-02-15 15:20:38 tcunha Exp $ */ +/* $Id$ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -28,6 +28,7 @@ int server_window_check_activity(struct session *, struct winlink *); int server_window_check_silence(struct session *, struct winlink *); int server_window_check_content( struct session *, struct winlink *, struct window_pane *); +void ring_bell(struct session *); /* Window functions that need to happen every loop. */ void @@ -134,6 +135,8 @@ server_window_check_activity(struct session *s, struct winlink *wl) if (!options_get_number(&w->options, "monitor-activity")) return (0); + if (options_get_number(&s->options, "bell-on-alert")) + ring_bell(s); wl->flags |= WINLINK_ACTIVITY; if (options_get_number(&s->options, "visual-activity")) { @@ -183,6 +186,9 @@ server_window_check_silence(struct session *s, struct winlink *wl) timer_difference = timer.tv_sec - w->silence_timer.tv_sec; if (timer_difference <= silence_interval) return (0); + + if (options_get_number(&s->options, "bell-on-alert")) + ring_bell(s); wl->flags |= WINLINK_SILENCE; if (options_get_number(&s->options, "visual-silence")) { @@ -221,6 +227,8 @@ server_window_check_content( return (0); xfree(found); + if (options_get_number(&s->options, "bell-on-alert")) + ring_bell(s); wl->flags |= WINLINK_CONTENT; if (options_get_number(&s->options, "visual-content")) { @@ -235,3 +243,17 @@ server_window_check_content( return (1); } + +/* Ring terminal bell. */ +void +ring_bell(struct session *s) +{ + struct client *c; + u_int i; + + for (i = 0; i < ARRAY_LENGTH(&clients); i++) { + c = ARRAY_ITEM(&clients, i); + if (c != NULL && c->session == s) + tty_putcode(&c->tty, TTYC_BEL); + } +} @@ -1783,6 +1783,11 @@ window of that session, means all bells are ignored and .Ic current means only bell in windows other than the current window are ignored. +.It Xo Ic bell-on-alert +.Op Ic on | off +.Xc +If on, ring the terminal bell when an activity, content or silence alert +occurs. .It Ic default-command Ar shell-command Set the command used for new windows (if not specified when the window is created) to |