diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-07-26 18:01:16 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-07-26 18:01:16 +0100 |
| commit | 58744de3eb7269d5d8eb778f67812f3f5670536d (patch) | |
| tree | 7ecc736fa8776a06da9ed99fc07ae66dea84a933 /options-table.c | |
| parent | 06a2644ab2479370eec4bd44975e5508f6407d30 (diff) | |
| parent | b1bd0c7fc16e896e7432beb56075d501f90ed6b8 (diff) | |
| download | rtmux-58744de3eb7269d5d8eb778f67812f3f5670536d.tar.gz rtmux-58744de3eb7269d5d8eb778f67812f3f5670536d.tar.bz2 rtmux-58744de3eb7269d5d8eb778f67812f3f5670536d.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/options-table.c b/options-table.c index 0c0039fd..705e11c6 100644 --- a/options-table.c +++ b/options-table.c @@ -50,6 +50,9 @@ static const char *options_table_status_position_list[] = { static const char *options_table_bell_action_list[] = { "none", "any", "current", "other", NULL }; +static const char *options_table_visual_bell_list[] = { + "off", "on", "both", NULL +}; static const char *options_table_pane_status_list[] = { "off", "top", "bottom", NULL }; @@ -142,6 +145,13 @@ const struct options_table_entry options_table[] = { .separator = "," }, + { .name = "activity-action", + .type = OPTIONS_TABLE_CHOICE, + .scope = OPTIONS_TABLE_SESSION, + .choices = options_table_bell_action_list, + .default_num = BELL_OTHER + }, + { .name = "assume-paste-time", .type = OPTIONS_TABLE_NUMBER, .scope = OPTIONS_TABLE_SESSION, @@ -165,12 +175,6 @@ const struct options_table_entry options_table[] = { .default_num = BELL_ANY }, - { .name = "bell-on-alert", - .type = OPTIONS_TABLE_FLAG, - .scope = OPTIONS_TABLE_SESSION, - .default_num = 0 - }, - { .name = "default-command", .type = OPTIONS_TABLE_STRING, .scope = OPTIONS_TABLE_SESSION, @@ -349,6 +353,13 @@ const struct options_table_entry options_table[] = { .default_str = "#S:#I:#W - \"#T\" #{session_alerts}" }, + { .name = "silence-action", + .type = OPTIONS_TABLE_CHOICE, + .scope = OPTIONS_TABLE_SESSION, + .choices = options_table_bell_action_list, + .default_num = BELL_OTHER + }, + { .name = "status", .type = OPTIONS_TABLE_FLAG, .scope = OPTIONS_TABLE_SESSION, @@ -501,21 +512,24 @@ const struct options_table_entry options_table[] = { }, { .name = "visual-activity", - .type = OPTIONS_TABLE_FLAG, + .type = OPTIONS_TABLE_CHOICE, .scope = OPTIONS_TABLE_SESSION, - .default_num = 0 + .choices = options_table_visual_bell_list, + .default_num = VISUAL_OFF }, { .name = "visual-bell", - .type = OPTIONS_TABLE_FLAG, + .type = OPTIONS_TABLE_CHOICE, .scope = OPTIONS_TABLE_SESSION, - .default_num = 0 + .choices = options_table_visual_bell_list, + .default_num = VISUAL_OFF }, { .name = "visual-silence", - .type = OPTIONS_TABLE_FLAG, + .type = OPTIONS_TABLE_CHOICE, .scope = OPTIONS_TABLE_SESSION, - .default_num = 0 + .choices = options_table_visual_bell_list, + .default_num = VISUAL_OFF }, { .name = "word-separators", |