reusing drawsquare for client title, empty square before title means versatile window, filled square before title means versatile maximized window.
authorAnselm R. Garbe <arg@suckless.org>
Thu, 22 Feb 2007 10:57:19 +0100
changeset 818 013954d9fe7a
parent 817 90435b444620
child 819 21562c2567a6
reusing drawsquare for client title, empty square before title means versatile window, filled square before title means versatile maximized window.
draw.c
dwm.1
--- a/draw.c	Thu Feb 22 10:52:57 2007 +0100
+++ b/draw.c	Thu Feb 22 10:57:19 2007 +0100
@@ -7,24 +7,6 @@
 /* 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 +81,7 @@
 		dc.x = x;
 		if(sel) {
 			drawtext(sel->name, dc.sel);
-			if(sel->isversatile)
-				drawcaret(dc.sel);
+			drawsquare(sel->ismax, sel->isversatile, dc.sel);
 		}
 		else
 			drawtext(NULL, dc.norm);
--- a/dwm.1	Thu Feb 22 10:52:57 2007 +0100
+++ b/dwm.1	Thu Feb 22 10:57:19 2007 +0100
@@ -19,10 +19,11 @@
 tags. Selecting certain tags displays all windows with these tags.
 .P
 dwm contains a small status bar which displays all available tags, the layout,
-the title of the focused window, and the text read from standard input. If
-the focused window is in versatile state, a small caret is printed before
-its title. The selected tags are indicated with a different color. The tags
-of the focused window are indicated with a filled square in the top left
+the title of the focused window, and the text read from standard input. A
+versatile window is indicated with an empty square and a maximized
+versatile window is indicated with a filled square before the windows
+title.  The selected tags are indicated with a different color. The tags of
+the focused window are indicated with a filled square in the top left
 corner.  The tags which are applied to one or more windows are indicated
 with an empty square in the top left corner.
 .P