qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

really these are just border colors, so adjust the define

Browse Source
This commit is contained in:
okan 2013-01-04 16:27:58 +00:00
parent 41fd96bb01
commit 8ca4aa87e7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/cwm/calmwm.h
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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_ #ifndef _CALMWM_H_
@ -89,12 +89,12 @@ enum menucolor {
CWM_COLOR_MENU_MAX CWM_COLOR_MENU_MAX
}; };
enum cwmcolor { enum bordercolor {
CWM_COLOR_BORDER_ACTIVE, CWM_COLOR_BORDER_ACTIVE,
CWM_COLOR_BORDER_INACTIVE, CWM_COLOR_BORDER_INACTIVE,
CWM_COLOR_BORDER_GROUP, CWM_COLOR_BORDER_GROUP,
CWM_COLOR_BORDER_UNGROUP, CWM_COLOR_BORDER_UNGROUP,
CWM_COLOR_MAX CWM_COLOR_BORDER_MAX
}; };
struct geom { struct geom {
@ -206,7 +206,7 @@ struct screen_ctx {
Colormap colormap; Colormap colormap;
Window rootwin; Window rootwin;
Window menuwin; Window menuwin;
unsigned long color[CWM_COLOR_MAX]; unsigned long color[CWM_COLOR_BORDER_MAX];
int cycling; int cycling;
struct geom view; /* viewable area */ struct geom view; /* viewable area */
struct geom work; /* workable area, gap-applied */ struct geom work; /* workable area, gap-applied */
@ -286,7 +286,7 @@ struct conf {
#define CONF_SNAPDIST 0 #define CONF_SNAPDIST 0
int snapdist; int snapdist;
struct gap gap; struct gap gap;
char *color[CWM_COLOR_MAX]; char *color[CWM_COLOR_BORDER_MAX];
char *menucolor[CWM_COLOR_MENU_MAX]; char *menucolor[CWM_COLOR_MENU_MAX];
char termpath[MAXPATHLEN]; char termpath[MAXPATHLEN];
char lockpath[MAXPATHLEN]; char lockpath[MAXPATHLEN];

8
app/cwm/conf.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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> #include <sys/param.h>
@ -71,7 +71,7 @@ static char *menu_color_binds[CWM_COLOR_MENU_MAX] = {
"", /* CWM_COLOR_MENU_FONT_SEL */ "", /* 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 */ "#CCCCCC", /* CWM_COLOR_BORDER_ACTIVE */
"#666666", /* CWM_COLOR_BORDER_INACTIVE */ "#666666", /* CWM_COLOR_BORDER_INACTIVE */
"blue", /* CWM_COLOR_BORDER_GROUP */ "blue", /* CWM_COLOR_BORDER_GROUP */
@ -83,7 +83,7 @@ conf_color(struct conf *c, struct screen_ctx *sc)
{ {
int i; 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]); sc->color[i] = xu_getcolor(sc, c->color[i]);
} }
@ -236,7 +236,7 @@ conf_clear(struct conf *c)
free(mb); 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->color[i]);
free(c->font); free(c->font);

4
app/cwm/parse.y
View File

@ -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> * 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, (void)strlcpy(xconf->lockpath, conf->lockpath,
sizeof(xconf->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]; xconf->color[i] = conf->color[i];
for (i = 0; i < CWM_COLOR_MENU_MAX; i++) for (i = 0; i < CWM_COLOR_MENU_MAX; i++)