dwm

Index Commits Files Refs README LICENSE

commit 0045ad87dfb32f35fc17b5b8942049cfe84d623c
parent ceea528eff5ccd1bbd11696209fdc60a5383cc41
Author: Anselm R. Garbe <arg@suckless.org>
Date:   Sun, 14 Jan 2007 22:37:34 +0100

implemented new color scheme accordingly to Sanders proposal
Diffstat:
M
config.arg.h
 | 
4
++--
M
config.default.h
 | 
4
++--
M
draw.c
 | 
8
++++----
M
dwm.h
 | 
3
+--
M
main.c
 | 
4
++--

5 files changed, 11 insertions(+), 12 deletions(-)
diff --git 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 NORMBORDERCOLOR        "#333"
 #define NORMBGCOLOR        "#222"
 #define NORMFGCOLOR        "#ccc"
+#define SELBORDERCOLOR        "#9cf"
 #define SELBGCOLOR        "#444"
 #define SELFGCOLOR        "#fff"
-#define STATUSBGCOLOR        "#333"
-#define STATUSFGCOLOR        "#9cf"
 
 #define MASTER            600        /* per thousand */
 #define MODKEY            Mod1Mask
diff --git 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 NORMBORDERCOLOR        "#dddddd"
 #define NORMBGCOLOR        "#333366"
 #define NORMFGCOLOR        "#cccccc"
+#define SELBORDERCOLOR        "#222222"
 #define SELBGCOLOR        "#666699"
 #define SELFGCOLOR        "#eeeeee"
-#define STATUSBGCOLOR        "#dddddd"
-#define STATUSFGCOLOR        "#222222"
 
 #define MASTER            600        /* per thousand */
 #define MODKEY            Mod1Mask
diff --git a/draw.c b/draw.c
@@ -120,7 +120,7 @@ drawstatus(void) {
         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;
@@ -128,7 +128,7 @@ drawstatus(void) {
         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);
@@ -141,10 +141,10 @@ void
 drawclient(Client *c) {
     if(c == sel && issel) {
         drawstatus();
-        XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+        XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
         return;
     }
-    XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
+    XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
     XSync(dpy, False);
 }
 
diff --git 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 { ColFG, ColBG, ColLast };                /* color */
+enum { ColBorder, ColFG, ColBG, ColLast };        /* color */
 
 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];
-    unsigned long status[ColLast];
     Drawable drawable;
     Fnt font;
     GC gc;
diff --git a/main.c b/main.c
@@ -121,12 +121,12 @@ setup(void) {
     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.sel[ColBorder] = getcolor(SELBORDERCOLOR);
     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;