diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
| commit | c01251d02388efceca515c47c257e2b5342e3716 (patch) | |
| tree | ca89407cb43bd2caa40a6854ba49ce1720e892ce /options-table.c | |
| parent | 5c275c2a1a963876d4ac392067e42120417dbf43 (diff) | |
| parent | 1466b570eedda0423d5a386d2b16b7ff0c0e477c (diff) | |
| download | rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.gz rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.bz2 rtmux-c01251d02388efceca515c47c257e2b5342e3716.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/options-table.c b/options-table.c index 873f8d67..a6f07cf9 100644 --- a/options-table.c +++ b/options-table.c @@ -68,6 +68,12 @@ static const char *options_table_set_clipboard_list[] = { static const char *options_table_window_size_list[] = { "largest", "smallest", "manual", "latest", NULL }; +static const char *options_table_remain_on_exit_list[] = { + "off", "on", "failed", NULL +}; +static const char *options_table_detach_on_destroy_list[] = { + "off", "on", "no-detached", NULL +}; /* Status line format. */ #define OPTIONS_TABLE_STATUS_FORMAT1 \ @@ -401,8 +407,9 @@ const struct options_table_entry options_table[] = { }, { .name = "detach-on-destroy", - .type = OPTIONS_TABLE_FLAG, + .type = OPTIONS_TABLE_CHOICE, .scope = OPTIONS_TABLE_SESSION, + .choices = options_table_detach_on_destroy_list, .default_num = 1, .text = "Whether to detach when a session is destroyed, or switch " "the client to another session if any exist." @@ -948,16 +955,17 @@ const struct options_table_entry options_table[] = { }, { .name = "remain-on-exit", - .type = OPTIONS_TABLE_FLAG, + .type = OPTIONS_TABLE_CHOICE, .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE, + .choices = options_table_remain_on_exit_list, .default_num = 0, .text = "Whether panes should remain ('on') or be automatically " - "killed ('off') when the program inside exits." + "killed ('off' or 'failed') when the program inside exits." }, { .name = "synchronize-panes", .type = OPTIONS_TABLE_FLAG, - .scope = OPTIONS_TABLE_WINDOW, + .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE, .default_num = 0, .text = "Whether typing should be sent to all panes simultaneously." }, |