[PATCH v2] Move pane-{active, }-border-{style, fg, bg} options to window

Nicholas Marriott

2015-02-06 15:09:58 UTC

Applied now thanks

Post by Marc Finet
It is useful to configure pane border style per window,
especially to reflect a setting linked to a window such as pane
synchronization.
---
v2: re-submit with re-ordered entries.
options-table.c | 68 ++++++++++++++++++++++++++++-----------------------------
screen-redraw.c | 2 +-
tmux.1 | 34 +++++++++++++++--------------
3 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/options-table.c b/options-table.c
index 2b12324..e7bd285 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',
@@ -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
diff --git a/screen-redraw.c b/screen-redraw.c
index ef9e539..c2b2ece 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;
diff --git a/tmux.1 b/tmux.1
index 1346076..b694df5 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2437,22 +2437,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
@@ -2891,11 +2875,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
--
2.1.4
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
tmux-users mailing list
https://lists.sourceforge.net/lists/listinfo/tmux-users