4 files changed, 23 insertions, 1 deletions
diff --git a/cmd-set-window-option.c b/cmd-set-window-option.c
index 9499b46a..8c0faa0d 100644
--- a/cmd-set-window-option.c
+++ b/cmd-set-window-option.c
@@ -68,6 +68,9 @@ const struct set_option_entry set_window_option_table[] = {
 	{ "utf8", SET_OPTION_FLAG, 0, 0, NULL },
 	{ "window-status-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
 	{ "window-status-bg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "window-status-current-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
+	{ "window-status-current-bg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "window-status-current-fg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "window-status-fg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "xterm-keys", SET_OPTION_FLAG, 0, 0, NULL },
 	{ NULL, 0, 0, 0, NULL }
diff --git a/status.c b/status.c
index c5190b54..61f5e22c 100644
--- a/status.c
+++ b/status.c
@@ -460,8 +460,18 @@ status_print(struct session *s, struct winlink *wl, struct grid_cell *gc)
 	flag = ' ';
  	if (wl == SLIST_FIRST(&s->lastw))
 		flag = '-';
-	if (wl == s->curw)
+	if (wl == s->curw) {
+		fg = options_get_number(&wl->window->options, "window-status-current-fg");
+		if (fg != 8)
+			gc->fg = fg;
+		bg = options_get_number(&wl->window->options, "window-status-current-bg");
+		if (bg != 8)
+			gc->bg = bg;
+		attr = options_get_number(&wl->window->options, "window-status-current-attr");
+		if (attr != 0)
+			gc->attr = attr;
 		flag = '*';
+	}
 
 	if (session_alert_has(s, wl, WINDOW_ACTIVITY)) {
 		flag = '#';
diff --git a/tmux.1 b/tmux.1
index d621c8d0..c4841b8c 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1489,6 +1489,12 @@ Set status line attributes for a single window.
 Set status line background colour for a single window.
 .It Ic window-status-fg Ar colour
 Set status line foreground colour for a single window.
+.It Ic window-status-current-attr Ar attributes
+Set status line attributes for the currently active window.
+.It Ic window-status-current-bg Ar colour
+Set status line background colour for the currently active window.
+.It Ic window-status-current-fg Ar colour
+Set status line foreground colour for the currently active window.
 .It Xo Ic xterm-keys
 .Op Ic on | Ic off
 .Xc
diff --git a/tmux.c b/tmux.c
index 5cca15f6..915bb432 100644
--- a/tmux.c
+++ b/tmux.c
@@ -338,6 +338,9 @@ main(int argc, char **argv)
 	options_set_number(&global_w_options, "window-status-attr", 0);
 	options_set_number(&global_w_options, "window-status-bg", 8);
 	options_set_number(&global_w_options, "window-status-fg", 8);
+	options_set_number(&global_w_options, "window-status-current-attr", 0);
+	options_set_number(&global_w_options, "window-status-current-bg", 8);
+	options_set_number(&global_w_options, "window-status-current-fg", 8);
 	options_set_number(&global_w_options, "xterm-keys", 0);
  	options_set_number(&global_w_options, "remain-on-exit", 0);