05-dwm-6.0-occupiedcol.diff

--- dwm.c.orig	2012-08-23 12:17:08.540556832 +0200
+++ b/dwm-6.0/dwm.c	2012-08-23 12:28:41.207211846 +0200
@@ -214,7 +214,6 @@
 static void drawbar(Monitor *m);
 static void drawbars(void);
 static void drawcoloredtext(char *text);
-static void drawsquare(Bool filled, Bool empty, XftColor col[ColLast]);
 static void drawtext(const char *text, XftColor col[ColLast], Bool pad);
 static void enternotify(XEvent *e);
 static void expose(XEvent *e);
@@ -843,9 +842,8 @@
 	dc.x = 0;
 	for(i = 0; i < LENGTH(tags); i++) {
         dc.w = TEXTW(tags[i].name);
-		col = dc.colors[ (m->tagset[m->seltags] & 1 << i) ? 1 : (urg & 1 << i ? 2:0) ];
+		col = dc.colors[ (m->tagset[m->seltags] & 1 << i) ? 1 : (urg & 1 << i ? 2:(occ & 1 << i ? 3:0)) ];
         drawtext(tags[i].name, col, True);
-		drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i, occ & 1 << i, col);
 		dc.x += dc.w;
 	}
 	dc.w = blw = TEXTW(m->ltsymbol);
@@ -871,7 +869,6 @@
 		if(m->sel) {
 			col = dc.colors[ m == selmon ? 1 : 0 ];
 			drawtext(m->sel->name, col, True);
-			drawsquare(m->sel->isfixed, m->sel->isfloating, col);
 		}
 		else
 			drawtext(NULL, dc.colors[0], False);
@@ -914,18 +911,6 @@
 }
 
 void
-drawsquare(Bool filled, Bool empty, XftColor col[ColLast]) {
-	int x;
-
-	XSetForeground(dpy, dc.gc, col[ColFG].pixel);
-	x = (dc.font.ascent + dc.font.descent + 2) / 4;
-	if(filled)
-		XFillRectangle(dpy, dc.drawable, dc.gc, dc.x+1, dc.y+1, x+1, x+1);
-	else if(empty)
-		XDrawRectangle(dpy, dc.drawable, dc.gc, dc.x+1, dc.y+1, x, x);
-}
-
-void
 drawtext(const char *text, XftColor col[ColLast], Bool pad) {
 	char buf[256];
 	int i, x, y, h, len, olen;