circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Rename BELL_* values to ALERT_* now they are used by more than bells,

Browse Source 
based on a diff from Brad Town.
This commit is contained in:
nicm
2017-08-16 11:46:08 +00:00
parent ac2ba0961b
commit c1ec28a34b
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
alerts.c
View File

@ -267,11 +267,11 @@ alerts_set_message(struct session *s, struct window *w, struct winlink *wl,
int flag; int flag;
/* /*
* We have found an alert (bell, activity or silence), so we need * We have found an alert (bell, activity or silence), so we need to
* to notify the user. For each client attached to this session, * pass it on to the user. For each client attached to this session,
* decide whether a bell (or visual message) is needed. * 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 * nothing happens, current means we only do something for the current
* window and other means only for windows other than 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. * mean both a bell and visual message is sent.
*/ */
if (action == BELL_NONE) if (action == ALERT_NONE)
return; return;
TAILQ_FOREACH(c, &clients, entry) { TAILQ_FOREACH(c, &clients, entry) {
if (c->session != s || c->flags & CLIENT_CONTROL) if (c->session != s || c->flags & CLIENT_CONTROL)
continue; continue;
flag = 0; flag = 0;
if (action == BELL_ANY) if (action == ALERT_ANY)
flag = 1; flag = 1;
else if (action == BELL_CURRENT) else if (action == ALERT_CURRENT)
flag = (c->session->curw->window == w); flag = (c->session->curw->window == w);
else if (action == BELL_OTHER) else if (action == ALERT_OTHER)
flag = (c->session->curw->window != w); flag = (c->session->curw->window != w);
if (!flag) if (!flag)
continue; continue;

6
options-table.c
View File

@ -150,7 +150,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_CHOICE, .type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SESSION, .scope = OPTIONS_TABLE_SESSION,
.choices = options_table_bell_action_list, .choices = options_table_bell_action_list,
.default_num = BELL_OTHER .default_num = ALERT_OTHER
}, },
{ .name = "assume-paste-time", { .name = "assume-paste-time",
@ -173,7 +173,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_CHOICE, .type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SESSION, .scope = OPTIONS_TABLE_SESSION,
.choices = options_table_bell_action_list, .choices = options_table_bell_action_list,
.default_num = BELL_ANY .default_num = ALERT_ANY
}, },
{ .name = "default-command", { .name = "default-command",
@ -358,7 +358,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_CHOICE, .type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SESSION, .scope = OPTIONS_TABLE_SESSION,
.choices = options_table_bell_action_list, .choices = options_table_bell_action_list,
.default_num = BELL_OTHER .default_num = ALERT_OTHER
}, },
{ .name = "status", { .name = "status",

10
tmux.h
View File

@ -77,11 +77,11 @@ struct tmuxproc;
#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0])) #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
#endif #endif
/* Bell option values. */ /* Alert option values. */
#define BELL_NONE 0 #define ALERT_NONE 0
#define BELL_ANY 1 #define ALERT_ANY 1
#define BELL_CURRENT 2 #define ALERT_CURRENT 2
#define BELL_OTHER 3 #define ALERT_OTHER 3
/* Visual option values. */ /* Visual option values. */
#define VISUAL_OFF 0 #define VISUAL_OFF 0