diff options
| -rw-r--r-- | app/cwm/calmwm.h | 10 | ||||
| -rw-r--r-- | app/cwm/conf.c | 8 | ||||
| -rw-r--r-- | app/cwm/parse.y | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index 3ea61698a..1897351d6 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.183 2013/01/04 16:23:04 okan Exp $ + * $OpenBSD: calmwm.h,v 1.184 2013/01/04 16:27:58 okan Exp $ */ #ifndef _CALMWM_H_ @@ -89,12 +89,12 @@ enum menucolor { CWM_COLOR_MENU_MAX }; -enum cwmcolor { +enum bordercolor { CWM_COLOR_BORDER_ACTIVE, CWM_COLOR_BORDER_INACTIVE, CWM_COLOR_BORDER_GROUP, CWM_COLOR_BORDER_UNGROUP, - CWM_COLOR_MAX + CWM_COLOR_BORDER_MAX }; struct geom { @@ -206,7 +206,7 @@ struct screen_ctx { Colormap colormap; Window rootwin; Window menuwin; - unsigned long color[CWM_COLOR_MAX]; + unsigned long color[CWM_COLOR_BORDER_MAX]; int cycling; struct geom view; /* viewable area */ struct geom work; /* workable area, gap-applied */ @@ -286,7 +286,7 @@ struct conf { #define CONF_SNAPDIST 0 int snapdist; struct gap gap; - char *color[CWM_COLOR_MAX]; + char *color[CWM_COLOR_BORDER_MAX]; char *menucolor[CWM_COLOR_MENU_MAX]; char termpath[MAXPATHLEN]; char lockpath[MAXPATHLEN]; diff --git a/app/cwm/conf.c b/app/cwm/conf.c index 5709fbf06..8c45f39c1 100644 --- a/app/cwm/conf.c +++ b/app/cwm/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.119 2013/01/04 16:23:51 okan Exp $ + * $OpenBSD: conf.c,v 1.120 2013/01/04 16:27:58 okan Exp $ */ #include <sys/param.h> @@ -71,7 +71,7 @@ static char *menu_color_binds[CWM_COLOR_MENU_MAX] = { "", /* CWM_COLOR_MENU_FONT_SEL */ }; -static char *color_binds[CWM_COLOR_MAX] = { +static char *color_binds[CWM_COLOR_BORDER_MAX] = { "#CCCCCC", /* CWM_COLOR_BORDER_ACTIVE */ "#666666", /* CWM_COLOR_BORDER_INACTIVE */ "blue", /* CWM_COLOR_BORDER_GROUP */ @@ -83,7 +83,7 @@ conf_color(struct conf *c, struct screen_ctx *sc) { int i; - for (i = 0; i < CWM_COLOR_MAX; i++) + for (i = 0; i < CWM_COLOR_BORDER_MAX; i++) sc->color[i] = xu_getcolor(sc, c->color[i]); } @@ -236,7 +236,7 @@ conf_clear(struct conf *c) free(mb); } - for (i = 0; i < CWM_COLOR_MAX; i++) + for (i = 0; i < CWM_COLOR_BORDER_MAX; i++) free(c->color[i]); free(c->font); diff --git a/app/cwm/parse.y b/app/cwm/parse.y index 4c094b1cb..d93d0803a 100644 --- a/app/cwm/parse.y +++ b/app/cwm/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.38 2013/01/04 16:23:04 okan Exp $ */ +/* $OpenBSD: parse.y,v 1.39 2013/01/04 16:27:58 okan Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -578,7 +578,7 @@ parse_config(const char *filename, struct conf *xconf) (void)strlcpy(xconf->lockpath, conf->lockpath, sizeof(xconf->lockpath)); - for (i = 0; i < CWM_COLOR_MAX; i++) + for (i = 0; i < CWM_COLOR_BORDER_MAX; i++) xconf->color[i] = conf->color[i]; for (i = 0; i < CWM_COLOR_MENU_MAX; i++) |