aboutsummaryrefslogtreecommitdiffstats
path: root/calmwm.h
diff options
context:
space:
mode:
Diffstat (limited to 'calmwm.h')
-rw-r--r--calmwm.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/calmwm.h b/calmwm.h
index 68fd1ef..3ea6169 100644
--- a/calmwm.h
+++ b/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.182 2013/01/02 16:26:34 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.183 2013/01/04 16:23:04 okan Exp $
*/
#ifndef _CALMWM_H_
@@ -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];