diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-01-16 00:36:54 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-01-16 00:36:54 +0000 |
| commit | 135ad3eec8cab875f71767eea3f05a5750b12f26 (patch) | |
| tree | c7e8fdcce66930d60e3714a8ec5ad73926a4dce3 /usr.bin/tmux/alerts.c | |
| parent | 5c772c77d737945634dcc977fa0ad5245c75a44c (diff) | |
Add hooks for alerts (bell, silence, activity), from Thomas Adam.
Diffstat (limited to 'usr.bin/tmux/alerts.c')
| -rw-r--r-- | usr.bin/tmux/alerts.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/usr.bin/tmux/alerts.c b/usr.bin/tmux/alerts.c index d98aef8b5a9..1d01ed8d9a8 100644 --- a/usr.bin/tmux/alerts.c +++ b/usr.bin/tmux/alerts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alerts.c,v 1.8 2015/12/07 09:47:41 nicm Exp $ */ +/* $OpenBSD: alerts.c,v 1.9 2016/01/16 00:36:53 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@users.sourceforge.net> @@ -29,6 +29,7 @@ int alerts_enabled(struct window *, int); void alerts_callback(int, short, void *); void alerts_reset(struct window *); +void alerts_run_hook(struct session *, struct winlink *, int); int alerts_check_all(struct session *, struct winlink *); int alerts_check_bell(struct session *, struct winlink *); int alerts_check_activity(struct session *, struct winlink *); @@ -55,8 +56,6 @@ alerts_callback(__unused int fd, __unused short events, __unused void *arg) RB_FOREACH(w, windows, &windows) { RB_FOREACH(s, sessions, &sessions) { - if (s->flags & SESSION_UNATTACHED) - continue; RB_FOREACH(wl, winlinks, &s->windows) { if (wl->window != w) continue; @@ -73,6 +72,22 @@ alerts_callback(__unused int fd, __unused short events, __unused void *arg) alerts_fired = 0; } +void +alerts_run_hook(struct session *s, struct winlink *wl, int flags) +{ + struct cmd_find_state fs; + + if (cmd_find_from_winlink(&fs, s, wl) != 0) + return; + + if (flags & WINDOW_BELL) + hooks_run(s->hooks, NULL, &fs, "alert-bell"); + if (flags & WINDOW_SILENCE) + hooks_run(s->hooks, NULL, &fs, "alert-silence"); + if (flags & WINDOW_ACTIVITY) + hooks_run(s->hooks, NULL, &fs, "alert-activity"); +} + int alerts_check_all(struct session *s, struct winlink *wl) { @@ -81,8 +96,10 @@ alerts_check_all(struct session *s, struct winlink *wl) alerts = alerts_check_bell(s, wl); alerts |= alerts_check_activity(s, wl); alerts |= alerts_check_silence(s, wl); - if (alerts != 0) + if (alerts != 0) { + alerts_run_hook(s, wl, alerts); server_status_session(s); + } return (alerts); } |