diff options
| -rw-r--r-- | options-table.c | 68 | ||||
| -rw-r--r-- | screen-redraw.c | 2 | ||||
| -rw-r--r-- | tmux.1 | 34 |
3 files changed, 53 insertions, 51 deletions
diff --git a/options-table.c b/options-table.c index 7d8b2568..fb231f7d 100644 --- a/options-table.c +++ b/options-table.c @@ -275,40 +275,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', @@ -646,6 +612,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, @@ -653,6 +636,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 diff --git a/screen-redraw.c b/screen-redraw.c index ef9e539d..c2b2ece6 100644 --- a/screen-redraw.c +++ b/screen-redraw.c @@ -275,7 +275,7 @@ void screen_redraw_draw_borders(struct client *c, int status, u_int top) { struct window *w = c->session->curw->window; - struct options *oo = &c->session->options; + struct options *oo = &w->options; struct tty *tty = &c->tty; struct window_pane *wp; struct grid_cell active_gc, other_gc, msg_gc; @@ -2441,22 +2441,6 @@ window. .Op Ic on | off .Xc If enabled, request mouse input as UTF-8 on UTF-8 terminals. -.It Ic pane-active-border-style Ar style -Set the pane border style for the currently active pane. -For how to specify -.Ar style , -see the -.Ic message-command-style -option. -Attributes are ignored. -.It Ic pane-border-style Ar style -Set the pane border style for panes aside from the active pane. -For how to specify -.Ar style , -see the -.Ic message-command-style -option. -Attributes are ignored. .It Ic prefix Ar key Set the key accepted as a prefix key. .It Ic prefix2 Ar key @@ -2895,11 +2879,29 @@ but set the width of other panes in the .Ic main-vertical layout. .Pp +.It Ic pane-active-border-style Ar style +Set the pane border style for the currently active pane. +For how to specify +.Ar style , +see the +.Ic message-command-style +option. +Attributes are ignored. +.Pp .It Ic pane-base-index Ar index Like .Ic base-index , but set the starting index for pane numbers. .Pp +.It Ic pane-border-style Ar style +Set the pane border style for panes aside from the active pane. +For how to specify +.Ar style , +see the +.Ic message-command-style +option. +Attributes are ignored. +.Pp .It Xo Ic remain-on-exit .Op Ic on | off .Xc |