3->4 colors

diff --git a/config.arg.h b/config.arg.h
index 170c91c..6f51e50 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -8,9 +8,10 @@ const char *tags[] = { "work", "net", "fnord", NULL };
 
 #define DEFMODE                        dotile /* dofloat */
 #define FONT                   "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
 
 #define DEFMODE                        dotile /* dofloat */
 #define FONT                   "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"

-#define BGCOLOR                        "#666699"
-#define FGCOLOR                        "#eeeeee"
-#define BORDERCOLOR            "#9999CC"
+#define NORMBGCOLOR            "#666699"
+#define NORMFGCOLOR            "#eeeeee"
+#define SELBGCOLOR             "#eeeeee"
+#define SELFGCOLOR             "#000088"

 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */
 
 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */
 

diff --git a/config.default.h b/config.default.h
index c0102b0..74e5b20 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -8,9 +8,10 @@ const char *tags[] = { "1", "2", "3", "4", "5", NULL };
 
 #define DEFMODE                        dotile /* dofloat */
 #define FONT                   "fixed"
 
 #define DEFMODE                        dotile /* dofloat */
 #define FONT                   "fixed"

-#define BGCOLOR                        "#666699"
-#define FGCOLOR                        "#eeeeee"
-#define BORDERCOLOR            "#9999CC"
+#define NORMBGCOLOR            "#666699"
+#define NORMFGCOLOR            "#eeeeee"
+#define SELBGCOLOR             "#eeeeee"
+#define SELFGCOLOR             "#666699"

 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */
 
 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */
 

diff --git a/config.mk b/config.mk
index 04e2a82..690d48f 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
 # dwm version

-VERSION = 1.0
+VERSION = 1.1

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 

diff --git a/draw.c b/draw.c
index f73a7bd..614d6d1 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -22,16 +22,15 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, Bool invert, Bool highlight)
+drawtext(const char *text, unsigned int colidx, Bool highlight)

 {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
 {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;

-       XGCValues gcv;

        XPoint points[5];
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XPoint points[5];
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 

-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, dc.bg[colidx]);

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        points[0].x = dc.x;
        points[0].y = dc.y;
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        points[0].x = dc.x;
        points[0].y = dc.y;


@@ -43,7 +42,7 @@ drawtext(const char *text, Bool invert, Bool highlight)
        points[3].y = 0;
        points[4].x = 0;
        points[4].y = -(dc.h - 1);
        points[3].y = 0;
        points[4].x = 0;
        points[4].y = -(dc.h - 1);

-       XSetForeground(dpy, dc.gc, dc.border);
+       XSetForeground(dpy, dc.gc, dc.fg[colidx]);

        XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 
        if(!text)
        XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 
        if(!text)


@@ -74,15 +73,10 @@ drawtext(const char *text, Bool invert, Bool highlight)
 
        if(w > dc.w)
                return; /* too long */
 
        if(w > dc.w)
                return; /* too long */

-       gcv.foreground = invert ? dc.bg : dc.fg;
-       gcv.background = invert ? dc.fg : dc.bg;
-       if(dc.font.set) {
-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+       if(dc.font.set)

                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);

-       }

        else {
        else {

-               gcv.font = dc.font.xfont->fid;
-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);

                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        if(highlight) {
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        if(highlight) {


@@ -157,11 +151,11 @@ drawtitle(Client *c)
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);

-               XSetWindowBorder(dpy, c->win, dc.fg);
+               XSetWindowBorder(dpy, c->win, dc.fg[1]);

                return;
        }
 
                return;
        }
 

-       XSetWindowBorder(dpy, c->win, dc.bg);
+       XSetWindowBorder(dpy, c->win, dc.bg[0]);

        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;

diff --git a/dwm.h b/dwm.h
index 9d2d959..7db0f54 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -36,9 +36,8 @@ typedef struct {
 
 typedef struct { /* draw context */
        int x, y, w, h;
 
 typedef struct { /* draw context */
        int x, y, w, h;

-       unsigned long bg;
-       unsigned long fg;
-       unsigned long border;
+       unsigned long bg[2];
+       unsigned long fg[2];

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

diff --git a/main.c b/main.c
index 5b00d0c..8eafc11 100644 (file)
--- a/main.c
+++ b/main.c
@@ -121,9 +121,10 @@ setup()
        seltag[0] = True;
 
        /* style */
        seltag[0] = True;
 
        /* style */

-       dc.bg = getcolor(BGCOLOR);
-       dc.fg = getcolor(FGCOLOR);
-       dc.border = getcolor(BORDERCOLOR);
+       dc.bg[0] = getcolor(NORMBGCOLOR);
+       dc.fg[0] = getcolor(NORMFGCOLOR);
+       dc.bg[1] = getcolor(SELBGCOLOR);
+       dc.fg[1] = getcolor(SELFGCOLOR);

        setfont(FONT);
 
        sx = sy = 0;
        setfont(FONT);
 
        sx = sy = 0;