get rid of struct color

This commit is contained in:
okan
2013-01-04 16:23:04 +00:00
parent c139df129c
commit 698530155d
4 changed files with 23 additions and 28 deletions

View File

@ -97,11 +97,6 @@ enum cwmcolor {
CWM_COLOR_MAX
};
struct color {
char *name;
unsigned long pixel;
};
struct geom {
int x;
int y;
@ -211,7 +206,7 @@ struct screen_ctx {
Colormap colormap;
Window rootwin;
Window menuwin;
struct color color[CWM_COLOR_MAX];
unsigned long color[CWM_COLOR_MAX];
int cycling;
struct geom view; /* viewable area */
struct geom work; /* workable area, gap-applied */
@ -291,7 +286,7 @@ struct conf {
#define CONF_SNAPDIST 0
int snapdist;
struct gap gap;
struct color color[CWM_COLOR_MAX];
char *color[CWM_COLOR_MAX];
char *menucolor[CWM_COLOR_MENU_MAX];
char termpath[MAXPATHLEN];
char lockpath[MAXPATHLEN];