circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 01:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 146:

Browse Source 
New options, window-status-current-{fg,bg,attr}, to set the fg, bg and
attributes with which the current window is shown in the status line. From
Johan Friis, thanks.
This commit is contained in:
Tiago Cunha 2009-07-20 15:57:05 +00:00
parent 62017452e9
commit e8957009c7
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd-set-window-option.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-set-window-option.c,v 1.33 2009-07-15 17:44:47 nicm Exp $ */
/* $Id: cmd-set-window-option.c,v 1.34 2009-07-20 15:57:05 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -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 }

14
status.c
View File

@ -1,4 +1,4 @@
/* $Id: status.c,v 1.98 2009-07-17 18:32:54 tcunha Exp $ */
/* $Id: status.c,v 1.99 2009-07-20 15:57:05 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -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 = '#';

8
tmux.1
View File

@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.125 2009-07-20 15:46:55 tcunha Exp $
.\" $Id: tmux.1,v 1.126 2009-07-20 15:57:05 tcunha Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@ -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

5
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.144 2009-07-19 14:35:56 tcunha Exp $ */
/* $Id: tmux.c,v 1.145 2009-07-20 15:57:05 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -347,6 +347,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);