implemented new color scheme accordingly to Sanders proposal

diff --git a/config.arg.h b/config.arg.h
index 92f01b7..e65b989 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -10,12 +10,12 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define TILESYMBOL             "[]="
 
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
 #define TILESYMBOL             "[]="
 
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"

+#define NORMBORDERCOLOR                "#333"

 #define NORMBGCOLOR            "#222"
 #define NORMFGCOLOR            "#ccc"
 #define NORMBGCOLOR            "#222"
 #define NORMFGCOLOR            "#ccc"

+#define SELBORDERCOLOR         "#9cf"

 #define SELBGCOLOR             "#444"
 #define SELFGCOLOR             "#fff"
 #define SELBGCOLOR             "#444"
 #define SELFGCOLOR             "#fff"

-#define STATUSBGCOLOR          "#333"
-#define STATUSFGCOLOR          "#9cf"

 
 #define MASTER                 600             /* per thousand */
 #define MODKEY                 Mod1Mask
 
 #define MASTER                 600             /* per thousand */
 #define MODKEY                 Mod1Mask

diff --git a/config.default.h b/config.default.h
index afd8e85..98135b0 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -10,12 +10,12 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define TILESYMBOL             "[]="
 
 #define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #define TILESYMBOL             "[]="
 
 #define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"

+#define NORMBORDERCOLOR                "#dddddd"

 #define NORMBGCOLOR            "#333366"
 #define NORMFGCOLOR            "#cccccc"
 #define NORMBGCOLOR            "#333366"
 #define NORMFGCOLOR            "#cccccc"

+#define SELBORDERCOLOR         "#222222"

 #define SELBGCOLOR             "#666699"
 #define SELFGCOLOR             "#eeeeee"
 #define SELBGCOLOR             "#666699"
 #define SELFGCOLOR             "#eeeeee"

-#define STATUSBGCOLOR          "#dddddd"
-#define STATUSFGCOLOR          "#222222"

 
 #define MASTER                 600             /* per thousand */
 #define MODKEY                 Mod1Mask
 
 #define MASTER                 600             /* per thousand */
 #define MODKEY                 Mod1Mask

diff --git a/draw.c b/draw.c
index 8e3962c..19604f3 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -120,7 +120,7 @@ drawstatus(void) {
                dc.x += dc.w;
        }
        dc.w = bmw;
                dc.x += dc.w;
        }
        dc.w = bmw;

-       drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
+       drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);

        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bw - dc.w;
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bw - dc.w;


@@ -128,7 +128,7 @@ drawstatus(void) {
                dc.x = x;
                dc.w = bw - x;
        }
                dc.x = x;
                dc.w = bw - x;
        }

-       drawtext(stext, dc.status, False, False);
+       drawtext(stext, dc.norm, False, False);

        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);


@@ -141,10 +141,10 @@ void
 drawclient(Client *c) {
        if(c == sel && issel) {
                drawstatus();
 drawclient(Client *c) {
        if(c == sel && issel) {
                drawstatus();

-               XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);

                return;
        }
                return;
        }

-       XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);

        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

diff --git a/dwm.h b/dwm.h
index 1a95078..3789373 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -43,7 +43,7 @@
 enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMLast };                        /* default atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMLast };                        /* default atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */

-enum { ColFG, ColBG, ColLast };                                /* color */
+enum { ColBorder, ColFG, ColBG, ColLast };             /* color */

 
 typedef enum {
        TopLeft, TopRight, BotLeft, BotRight
 
 typedef enum {
        TopLeft, TopRight, BotLeft, BotRight


@@ -66,7 +66,6 @@ typedef struct {
        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];
        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];

-       unsigned long status[ColLast];

        Drawable drawable;
        Fnt font;
        GC gc;
        Drawable drawable;
        Fnt font;
        GC gc;

diff --git a/main.c b/main.c
index 645b2e4..ed055c2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -121,12 +121,12 @@ setup(void) {
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
        /* style */
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
        /* style */

+       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);

        dc.norm[ColBG] = getcolor(NORMBGCOLOR);
        dc.norm[ColFG] = getcolor(NORMFGCOLOR);
        dc.norm[ColBG] = getcolor(NORMBGCOLOR);
        dc.norm[ColFG] = getcolor(NORMFGCOLOR);

+       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);

        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);

-       dc.status[ColBG] = getcolor(STATUSBGCOLOR);
-       dc.status[ColFG] = getcolor(STATUSFGCOLOR);

        setfont(FONT);
        /* geometry */
        sx = sy = 0;
        setfont(FONT);
        /* geometry */
        sx = sy = 0;