diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-02-06 19:05:56 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-02-06 19:07:43 +0000 |
| commit | 833fe5bdee449b04afe8844774be66374e1baf9c (patch) | |
| tree | 11b21f479421b08f67776c832543becaa0b12fb8 /options-table.c | |
| parent | 93c3fb78a3593afd23e85352213236131dd5958f (diff) | |
| parent | 313f2263f8bb3336893527f65789f820ba7eaf0f (diff) | |
| download | rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.tar.gz rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.tar.bz2 rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.zip | |
Merge branch 'obsd-master'
Conflicts:
cmd-pipe-pane.c
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/options-table.c b/options-table.c index 2b123248..2bcf29b4 100644 --- a/options-table.c +++ b/options-table.c @@ -274,40 +274,6 @@ const struct options_table_entry session_options_table[] = { .default_num = 0 }, - { .name = "pane-active-border-bg", - .type = OPTIONS_TABLE_COLOUR, - .default_num = 8, - .style = "pane-active-border-style" - }, - - { .name = "pane-active-border-fg", - .type = OPTIONS_TABLE_COLOUR, - .default_num = 2, - .style = "pane-active-border-style" - }, - - { .name = "pane-active-border-style", - .type = OPTIONS_TABLE_STYLE, - .default_str = "fg=green" - }, - - { .name = "pane-border-bg", - .type = OPTIONS_TABLE_COLOUR, - .default_num = 8, - .style = "pane-border-style" - }, - - { .name = "pane-border-fg", - .type = OPTIONS_TABLE_COLOUR, - .default_num = 8, - .style = "pane-border-style" - }, - - { .name = "pane-border-style", - .type = OPTIONS_TABLE_STYLE, - .default_str = "default" - }, - { .name = "prefix", .type = OPTIONS_TABLE_KEY, .default_num = '\002', @@ -430,7 +396,7 @@ const struct options_table_entry session_options_table[] = { { .name = "status-right", .type = OPTIONS_TABLE_STRING, - .default_str = " \"#{=22:pane_title}\" %H:%M %d-%b-%y" + .default_str = " \"#{=21:pane_title}\" %H:%M %d-%b-%y" }, { .name = "status-right-attr", @@ -645,6 +611,23 @@ const struct options_table_entry window_options_table[] = { .default_num = 0 }, + { .name = "pane-active-border-bg", + .type = OPTIONS_TABLE_COLOUR, + .default_num = 8, + .style = "pane-active-border-style" + }, + + { .name = "pane-active-border-fg", + .type = OPTIONS_TABLE_COLOUR, + .default_num = 2, + .style = "pane-active-border-style" + }, + + { .name = "pane-active-border-style", + .type = OPTIONS_TABLE_STYLE, + .default_str = "fg=green" + }, + { .name = "pane-base-index", .type = OPTIONS_TABLE_NUMBER, .minimum = 0, @@ -652,6 +635,23 @@ const struct options_table_entry window_options_table[] = { .default_num = 0 }, + { .name = "pane-border-bg", + .type = OPTIONS_TABLE_COLOUR, + .default_num = 8, + .style = "pane-border-style" + }, + + { .name = "pane-border-fg", + .type = OPTIONS_TABLE_COLOUR, + .default_num = 8, + .style = "pane-border-style" + }, + + { .name = "pane-border-style", + .type = OPTIONS_TABLE_STYLE, + .default_str = "default" + }, + { .name = "remain-on-exit", .type = OPTIONS_TABLE_FLAG, .default_num = 0 |