allow menufg/menubg to be configurable; from Alexander Polakov.

ok oga@
This commit is contained in:
okan 2011-09-08 12:07:03 +00:00
parent 9ab59987f7
commit 107bc37429
2 changed files with 20 additions and 3 deletions

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: cwmrc.5,v 1.39 2011/09/03 09:20:58 okan Exp $
.\" $OpenBSD: cwmrc.5,v 1.40 2011/09/08 12:07:03 okan Exp $
.\"
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: September 3 2011 $
.Dd $Mdocdate: September 8 2011 $
.Dt CWMRC 5
.Os
.Sh NAME
@ -105,6 +105,12 @@ Set the color of the border while grouping a window.
.It Ic color inactiveborder Ar color
Set the color of the inactive border.
.Pp
.It Ic color menubg Ar color
Set menu background color.
.Pp
.It Ic color menufg Ar color
Set menu foreground color.
.Pp
.It Ic color ungroupborder Ar color
Set the color of the border while ungrouping a window.
.Pp

View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.31 2011/09/03 09:17:16 okan Exp $ */
/* $OpenBSD: parse.y,v 1.32 2011/09/08 12:07:03 okan Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -73,6 +73,7 @@ typedef struct {
%token COLOR SNAPDIST
%token ACTIVEBORDER INACTIVEBORDER
%token GROUPBORDER UNGROUPBORDER
%token MENUBG MENUFG
%token ERROR
%token <v.string> STRING
%token <v.number> NUMBER
@ -184,6 +185,14 @@ colors : ACTIVEBORDER STRING {
free(conf->color[CWM_COLOR_BORDER_UNGROUP].name);
conf->color[CWM_COLOR_BORDER_UNGROUP].name = $2;
}
| MENUBG STRING {
free(conf->color[CWM_COLOR_BG_MENU].name);
conf->color[CWM_COLOR_BG_MENU].name = $2;
}
| MENUFG STRING {
free(conf->color[CWM_COLOR_FG_MENU].name);
conf->color[CWM_COLOR_FG_MENU].name = $2;
}
;
%%
@ -228,6 +237,8 @@ lookup(char *s)
{ "groupborder", GROUPBORDER},
{ "ignore", IGNORE},
{ "inactiveborder", INACTIVEBORDER},
{ "menubg", MENUBG},
{ "menufg", MENUFG},
{ "mousebind", MOUSEBIND},
{ "moveamount", MOVEAMOUNT},
{ "no", NO},