summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/alerts.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2017-08-16 11:46:09 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2017-08-16 11:46:09 +0000
commit9916072baf00d9870c823fbafab9325948ce140f (patch)
treef818f5681d3bd6569cb1b8bb4a8a1252437c9461 /usr.bin/tmux/alerts.c
parentde96f794c42af966655bbd2b3c280f7675ec7290 (diff)
Rename BELL_* values to ALERT_* now they are used by more than bells,
based on a diff from Brad Town.
Diffstat (limited to 'usr.bin/tmux/alerts.c')
-rw-r--r--usr.bin/tmux/alerts.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/tmux/alerts.c b/usr.bin/tmux/alerts.c
index 06d5df8af05..2513966e570 100644
--- a/usr.bin/tmux/alerts.c
+++ b/usr.bin/tmux/alerts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alerts.c,v 1.22 2017/07/26 16:16:25 nicm Exp $ */
+/* $OpenBSD: alerts.c,v 1.23 2017/08/16 11:46:08 nicm Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -267,11 +267,11 @@ alerts_set_message(struct session *s, struct window *w, struct winlink *wl,
int flag;
/*
- * We have found an alert (bell, activity or silence), so we need
- * to notify the user. For each client attached to this session,
+ * We have found an alert (bell, activity or silence), so we need to
+ * pass it on to the user. For each client attached to this session,
* decide whether a bell (or visual message) is needed.
*
- * {bell,activity,silence}-action determines when we notify: none means
+ * {bell,activity,silence}-action determines when we alert: none means
* nothing happens, current means we only do something for the current
* window and other means only for windows other than the current.
*
@@ -280,17 +280,17 @@ alerts_set_message(struct session *s, struct window *w, struct winlink *wl,
* mean both a bell and visual message is sent.
*/
- if (action == BELL_NONE)
+ if (action == ALERT_NONE)
return;
TAILQ_FOREACH(c, &clients, entry) {
if (c->session != s || c->flags & CLIENT_CONTROL)
continue;
flag = 0;
- if (action == BELL_ANY)
+ if (action == ALERT_ANY)
flag = 1;
- else if (action == BELL_CURRENT)
+ else if (action == ALERT_CURRENT)
flag = (c->session->curw->window == w);
- else if (action == BELL_OTHER)
+ else if (action == ALERT_OTHER)
flag = (c->session->curw->window != w);
if (!flag)
continue;