summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--cwmrc.58
-rw-r--r--parse.y11
2 files changed, 18 insertions, 1 deletions
diff --git a/cwmrc.5 b/cwmrc.5
index 86aa0d8..3f9a09c 100644
--- a/cwmrc.5
+++ b/cwmrc.5
@@ -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: June 25 2011 $
+.Dd $Mdocdate: September 3 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
diff --git a/parse.y b/parse.y
index 1b291ca..43c687e 100644
--- a/parse.y
+++ b/parse.y
@@ -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},