Adds a border around the menu window. I think it looks nicer with
border.
diff --git a/menu.c b/menu.c
index 13d097c..6f46ee9 100644
--- a/menu.c
+++ b/menu.c
@@ -76,8 +76,8 @@ menu_init(struct screen_ctx *sc)
{
XGCValues gv;
- sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1, 0,
- sc->color[CWM_COLOR_BG_MENU].pixel,
+ sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1,
Conf.bwidth,
+ sc->color[CWM_COLOR_BORDOR_ACTIVE].pixel,
sc->color[CWM_COLOR_BG_MENU].pixel);
gv.foreground =
While here I found "BORDOR_ACTIVE":
diff --git a/calmwm.h b/calmwm.h
index 7f25c61..39badfa 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -79,7 +79,7 @@ union arg {
};
enum cwmcolor {
- CWM_COLOR_BORDOR_ACTIVE,
+ CWM_COLOR_BORDER_ACTIVE,
CWM_COLOR_BORDER_INACTIVE,
CWM_COLOR_BORDER_GROUP,
CWM_COLOR_BORDER_UNGROUP,
diff --git a/client.c b/client.c
index 523a3b6..53e9155 100644
--- a/client.c
+++ b/client.c
@@ -489,7 +489,7 @@ client_draw_border(struct client_ctx *cc)
pixel = sc->color[CWM_COLOR_BORDER_UNGROUP].pixel;
break;
default:
- pixel = sc->color[CWM_COLOR_BORDOR_ACTIVE].pixel;
+ pixel = sc->color[CWM_COLOR_BORDER_ACTIVE].pixel;
break;
}
else
diff --git a/conf.c b/conf.c
index 975732c..fce83a7 100644
--- a/conf.c
+++ b/conf.c
@@ -202,7 +202,7 @@ conf_init(struct conf *c)
strlcpy(c->termpath, "xterm", sizeof(c->termpath));
strlcpy(c->lockpath, "xlock", sizeof(c->lockpath));
- c->color[CWM_COLOR_BORDOR_ACTIVE].name =
+ c->color[CWM_COLOR_BORDER_ACTIVE].name =
xstrdup(CONF_COLOR_ACTIVEBORDER);
c->color[CWM_COLOR_BORDER_INACTIVE].name =
xstrdup(CONF_COLOR_INACTIVEBORDER);
diff --git a/menu.c b/menu.c
index 6f46ee9..04fd1b3 100644
--- a/menu.c
+++ b/menu.c
@@ -77,7 +77,7 @@ menu_init(struct screen_ctx *sc)
XGCValues gv;
sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1,
Conf.bwidth,
- sc->color[CWM_COLOR_BORDOR_ACTIVE].pixel,
+ sc->color[CWM_COLOR_BORDER_ACTIVE].pixel,
sc->color[CWM_COLOR_BG_MENU].pixel);
gv.foreground =
diff --git a/parse.y b/parse.y
index a6ba528..75f8a9c 100644
--- a/parse.y
+++ b/parse.y
@@ -169,8 +169,8 @@ color : COLOR colors
;
colors : ACTIVEBORDER STRING {
- free(conf->color[CWM_COLOR_BORDOR_ACTIVE].name);
- conf->color[CWM_COLOR_BORDOR_ACTIVE].name = $2;
+ free(conf->color[CWM_COLOR_BORDER_ACTIVE].name);
+ conf->color[CWM_COLOR_BORDER_ACTIVE].name = $2;
}
| INACTIVEBORDER STRING {
free(conf->color[CWM_COLOR_BORDER_INACTIVE].name);
--
Alexander Polakov | plhk.ru
