X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=06acc74c0495c20aa574271026ff05c658e510c2;hp=f049b45b3e789b5e730cbadeba24a879306c78a5;hb=d934296476be7345842fec1a2630d1752c704078;hpb=1a25414ace62ff2cd616b8465af4bbe531b3697b

diff --git a/draw.c b/draw.c
index f049b45..06acc74 100644
--- a/draw.c
+++ b/draw.c
@@ -1,30 +1,15 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+ * © 2007 Premysl Hruby <dfenze at gmail dot com>
+ * © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <string.h>
 
 /* static */
 
 static void
-drawcaret(unsigned long col[ColLast]) {
-	int x;
-	XGCValues gcv;
-	XPoint pt[3];
-
-	gcv.foreground = col[ColFG];
-	XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-	x = (dc.font.ascent + dc.font.descent) / 2;
-	pt[0].x = dc.x + 1;
-	pt[0].y = dc.y + 1 + x;
-	pt[1].x = 0;
-	pt[1].y = -x;
-	pt[2].x = x;
-	pt[2].y = 0;
-	XDrawLines(dpy, dc.drawable, dc.gc, pt, 3, CoordModePrevious);
-}
-
-static void
 drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 	int x;
 	XGCValues gcv;
@@ -99,8 +84,7 @@ drawstatus(void) {
 		dc.x = x;
 		if(sel) {
 			drawtext(sel->name, dc.sel);
-			if(sel->isversatile)
-				drawcaret(dc.sel);
+			drawsquare(sel->ismax, sel->isfloating, dc.sel);
 		}
 		else
 			drawtext(NULL, dc.norm);
@@ -114,7 +98,6 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
-	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
@@ -143,16 +126,11 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 	}
 	if(w > dc.w)
 		return; /* too long */
-	gcv.foreground = col[ColFG];
-	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+	XSetForeground(dpy, dc.gc, col[ColFG]);
+	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-	}
-	else {
-		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+	else
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-	}
 }
 
 unsigned int