remove redundant drw_scm_create, && move Col{Float,Master} to the enum with Col{Fg,Bg,Border}

3 files changed, 2 insertions, 5 deletions

diff --git a/config.h b/config.h
index a66f122..ef5ee66 100644
--- a/config.h
+++ b/config.h
@@ -13,7 +13,7 @@ static const int mouse_default      = 0;        /* 1 means enable mouse by defau
 static const char col_gray1[]       = "#000000";
 static const char col_gray2[]       = "#bbbbbb";
 static const char col_float[]       = "#770000";
-static const char col_master[]      = "#FF9F1C";
+static const char col_master[]      = "#FF8700";
 static const char *colors[][5]      = {
 	/*               fg         bg          border      float      master */
 	[SchemeNorm] = { col_gray2, col_gray1,  col_gray1,  col_gray1, col_gray1   },
diff --git a/drw.h b/drw.h
index 7719776..5a54185 100644
--- a/drw.h
+++ b/drw.h
@@ -12,7 +12,7 @@ typedef struct Fnt {
 	struct Fnt *next;
 } Fnt;
 
-enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
+enum { ColFg, ColBg, ColBorder, ColFloat, ColMaster }; /* Clr scheme index */
 typedef XftColor Clr;
 
 typedef struct {
diff --git a/dwm.c b/dwm.c
index fc390c2..a54fa92 100644
--- a/dwm.c
+++ b/dwm.c
@@ -60,8 +60,6 @@
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
-#define ColFloat                3
-#define ColMaster               4
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@@ -1669,7 +1667,6 @@ setup(void)
 	/* init appearance */
 	scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
 	for (i = 0; i < LENGTH(colors); i++) {
-		scheme[i] = drw_scm_create(drw, colors[i], 4);
 		scheme[i] = drw_scm_create(drw, colors[i], 5);
     }