X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/e7508783e85aba0ce4ab09b0dd76c40342113aed..1a25414ace62ff2cd616b8465af4bbe531b3697b:/draw.c?ds=sidebyside

diff --git a/draw.c b/draw.c
index 25b08c6..f049b45 100644
--- a/draw.c
+++ b/draw.c
@@ -6,15 +6,22 @@
 
 /* static */
 
-static unsigned int
-textnw(const char *text, unsigned int len) {
-	XRectangle r;
+static void
+drawcaret(unsigned long col[ColLast]) {
+	int x;
+	XGCValues gcv;
+	XPoint pt[3];
 
-	if(dc.font.set) {
-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-		return r.width;
-	}
-	return XTextWidth(dc.font.xfont, text, len);
+	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
@@ -48,6 +55,17 @@ isoccupied(unsigned int t) {
 	return False;
 }
 
+static unsigned int
+textnw(const char *text, unsigned int len) {
+	XRectangle r;
+
+	if(dc.font.set) {
+		XmbTextExtents(dc.font.set, text, len, NULL, &r);
+		return r.width;
+	}
+	return XTextWidth(dc.font.xfont, text, len);
+}
+
 /* extern */
 
 void
@@ -79,7 +97,13 @@ drawstatus(void) {
 	drawtext(stext, dc.norm);
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm);
+		if(sel) {
+			drawtext(sel->name, dc.sel);
+			if(sel->isversatile)
+				drawcaret(dc.sel);
+		}
+		else
+			drawtext(NULL, dc.norm);
 	}
 	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
 	XSync(dpy, False);