Revision: 2663
http://tmux.svn.sourceforge.net/tmux/?rev=2663&view=rev
Author: tcunha
Date: 2012-01-20 21:20:35 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Sync OpenBSD patchset 1001:
Add some trivial additional status line attributes from jwcxz at users
dot sourceforge dot net.
Modified Paths:
--------------
trunk/options-table.c
trunk/status.c
trunk/tmux.1
Modified: trunk/options-table.c
===================================================================
--- trunk/options-table.c 2012-01-20 21:19:20 UTC (rev 2662)
+++ trunk/options-table.c 2012-01-20 21:20:35 UTC (rev 2663)
@@ -569,21 +569,51 @@
.default_num = 0 /* overridden in main() */
},
- { .name = "window-status-alert-attr",
+ { .name = "window-status-bell-attr",
.type = OPTIONS_TABLE_ATTRIBUTES,
.default_num = GRID_ATTR_REVERSE
},
- { .name = "window-status-alert-bg",
+ { .name = "window-status-bell-bg",
.type = OPTIONS_TABLE_COLOUR,
.default_num = 8
},
- { .name = "window-status-alert-fg",
+ { .name = "window-status-bell-fg",
.type = OPTIONS_TABLE_COLOUR,
.default_num = 8
},
+ { .name = "window-status-content-attr",
+ .type = OPTIONS_TABLE_ATTRIBUTES,
+ .default_num = GRID_ATTR_REVERSE
+ },
+
+ { .name = "window-status-content-bg",
+ .type = OPTIONS_TABLE_COLOUR,
+ .default_num = 8
+ },
+
+ { .name = "window-status-content-fg",
+ .type = OPTIONS_TABLE_COLOUR,
+ .default_num = 8
+ },
+
+ { .name = "window-status-activity-attr",
+ .type = OPTIONS_TABLE_ATTRIBUTES,
+ .default_num = GRID_ATTR_REVERSE
+ },
+
+ { .name = "window-status-activity-bg",
+ .type = OPTIONS_TABLE_COLOUR,
+ .default_num = 8
+ },
+
+ { .name = "window-status-activity-fg",
+ .type = OPTIONS_TABLE_COLOUR,
+ .default_num = 8
+ },
+
{ .name = "window-status-attr",
.type = OPTIONS_TABLE_ATTRIBUTES,
.default_num = 0
Modified: trunk/status.c
===================================================================
--- trunk/status.c 2012-01-20 21:19:20 UTC (rev 2662)
+++ trunk/status.c 2012-01-20 21:20:35 UTC (rev 2663)
@@ -684,16 +684,36 @@
fmt = options_get_string(oo, "window-status-current-format");
}
- if (wl->flags & WINLINK_ALERTFLAGS) {
- fg = options_get_number(oo, "window-status-alert-fg");
+ if (wl->flags & WINLINK_BELL) {
+ fg = options_get_number(oo, "window-status-bell-fg");
if (fg != 8)
colour_set_fg(gc, fg);
- bg = options_get_number(oo, "window-status-alert-bg");
+ bg = options_get_number(oo, "window-status-bell-bg");
if (bg != 8)
colour_set_bg(gc, bg);
- attr = options_get_number(oo, "window-status-alert-attr");
+ attr = options_get_number(oo, "window-status-bell-attr");
if (attr != 0)
gc->attr = attr;
+ } else if (wl->flags & WINLINK_CONTENT) {
+ fg = options_get_number(oo, "window-status-content-fg");
+ if (fg != 8)
+ colour_set_fg(gc, fg);
+ bg = options_get_number(oo, "window-status-content-bg");
+ if (bg != 8)
+ colour_set_bg(gc, bg);
+ attr = options_get_number(oo, "window-status-content-attr");
+ if (attr != 0)
+ gc->attr = attr;
+ } else if (wl->flags & (WINLINK_ACTIVITY|WINLINK_SILENCE)) {
+ fg = options_get_number(oo, "window-status-activity-fg");
+ if (fg != 8)
+ colour_set_fg(gc, fg);
+ bg = options_get_number(oo, "window-status-activity-bg");
+ if (bg != 8)
+ colour_set_bg(gc, bg);
+ attr = options_get_number(oo, "window-status-activity-attr");
+ if (attr != 0)
+ gc->attr = attr;
}
text = status_replace(c, NULL, wl, NULL, fmt, t, 1);
Modified: trunk/tmux.1
===================================================================
--- trunk/tmux.1 2012-01-20 21:19:20 UTC (rev 2662)
+++ trunk/tmux.1 2012-01-20 21:20:35 UTC (rev 2663)
@@ -2520,16 +2520,33 @@
.Nm
to expect UTF-8 sequences to appear in this window.
.Pp
-.It Ic window-status-alert-attr Ar attributes
-Set status line attributes for windows which have an alert (bell, activity
-or content).
+.It Ic window-status-bell-attr Ar attributes
+Set status line attributes for windows which have a bell alert.
.Pp
-.It Ic window-status-alert-bg Ar colour
-Set status line background colour for windows with an alert.
+.It Ic window-status-bell-bg Ar colour
+Set status line background colour for windows with a bell alert.
.Pp
-.It Ic window-status-alert-fg Ar colour
-Set status line foreground colour for windows with an alert.
+.It Ic window-status-bell-fg Ar colour
+Set status line foreground colour for windows with a bell alert.
.Pp
+.It Ic window-status-content-attr Ar attributes
+Set status line attributes for windows which have a content alert.
+.Pp
+.It Ic window-status-content-bg Ar colour
+Set status line background colour for windows with a content alert.
+.Pp
+.It Ic window-status-content-fg Ar colour
+Set status line foreground colour for windows with a content alert.
+.Pp
+.It Ic window-status-activity-attr Ar attributes
+Set status line attributes for windows which have an activity (or silence)
alert.
+.Pp
+.It Ic window-status-activity-bg Ar colour
+Set status line background colour for windows with an activity alert.
+.Pp
+.It Ic window-status-activity-fg Ar colour
+Set status line foreground colour for windows with an activity alert.
+.Pp
.It Ic window-status-attr Ar attributes
Set status line attributes for a single window.
.Pp
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
