diff options
| author | Josh Rahm <rahm@google.com> | 2023-01-27 23:04:47 +0000 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2023-01-27 23:04:47 +0000 |
| commit | e64dc03ff7b867826c7fc76d6fff210ad3382e33 (patch) | |
| tree | 9cf71b02a7ee8f6d39ae1207201dc0745bdb8be5 /options-table.c | |
| parent | fb15fd116097b98c1b839cfdc76a7d84e206e6d5 (diff) | |
| parent | f5af3cfb211c12897b15e3b5a3b29c4bbb0493a8 (diff) | |
| download | rtmux-e64dc03ff7b867826c7fc76d6fff210ad3382e33.tar.gz rtmux-e64dc03ff7b867826c7fc76d6fff210ad3382e33.tar.bz2 rtmux-e64dc03ff7b867826c7fc76d6fff210ad3382e33.zip | |
Merge remote-tracking branch 'upstream/master' into rahm
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/options-table.c b/options-table.c index b442d65e..d4e7b204 100644 --- a/options-table.c +++ b/options-table.c @@ -41,6 +41,9 @@ static const char *options_table_clock_mode_style_list[] = { static const char *options_table_status_list[] = { "off", "on", "2", "3", "4", "5", NULL }; +static const char *options_table_message_line_list[] = { + "0", "1", "2", "3", "4", NULL +}; static const char *options_table_status_keys_list[] = { "emacs", "vi", NULL }; @@ -87,6 +90,9 @@ static const char *options_table_detach_on_destroy_list[] = { static const char *options_table_extended_keys_list[] = { "off", "on", "always", NULL }; +static const char *options_table_allow_passthrough_list[] = { + "off", "on", "all", NULL +}; /* Status line format. */ #define OPTIONS_TABLE_STATUS_FORMAT1 \ @@ -538,13 +544,21 @@ const struct options_table_entry options_table[] = { "'mode-keys' is set to 'vi'." }, + { .name = "message-line", + .type = OPTIONS_TABLE_CHOICE, + .scope = OPTIONS_TABLE_SESSION, + .choices = options_table_message_line_list, + .default_num = 0, + .text = "Position (line) of messages and the command prompt." + }, + { .name = "message-style", .type = OPTIONS_TABLE_STRING, .scope = OPTIONS_TABLE_SESSION, .default_str = "bg=yellow,fg=black", .flags = OPTIONS_TABLE_IS_STYLE, .separator = ",", - .text = "Style of the command prompt." + .text = "Style of messages and the command prompt." }, { .name = "mouse", @@ -803,11 +817,14 @@ const struct options_table_entry options_table[] = { }, { .name = "allow-passthrough", - .type = OPTIONS_TABLE_FLAG, + .type = OPTIONS_TABLE_CHOICE, .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE, + .choices = options_table_allow_passthrough_list, .default_num = 0, .text = "Whether applications are allowed to use the escape sequence " - "to bypass tmux." + "to bypass tmux. Can be 'off' (disallowed), 'on' (allowed " + "if the pane is visible), or 'all' (allowed even if the pane " + "is invisible)." }, { .name = "allow-rename", |