simplify color initialization.

ok oga@

1 files changed, 2 insertions, 8 deletions

diff --git a/calmwm.h b/calmwm.h
index 5156fa7..86bab28 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.137 2011/09/03 09:20:58 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.138 2011/09/03 09:25:39 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -90,8 +90,8 @@ enum cwmcolor {
 };
 
 struct color {
-	unsigned long	 pixel;
 	char		*name;
+	unsigned long	 pixel;
 };
 
 struct gap {
@@ -277,12 +277,6 @@ struct conf {
 #define	CONF_SNAPDIST			0
 	int			 snapdist;
 	struct gap		 gap;
-#define CONF_COLOR_ACTIVEBORDER		"#CCCCCC"
-#define CONF_COLOR_INACTIVEBORDER	"#666666"
-#define CONF_COLOR_GROUPBORDER		"blue"
-#define CONF_COLOR_UNGROUPBORDER	"red"
-#define CONF_COLOR_MENUFG		"black"
-#define CONF_COLOR_MENUBG		"white"
 	struct color		 color[CWM_COLOR_MAX];
 	char			 termpath[MAXPATHLEN];
 	char			 lockpath[MAXPATHLEN];