X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=draw.c;h=dddede040c6158215e825fd8573dfe23f566592c;hb=86512ce930b1171145b069569079d47477054dea;hp=4e079e50dd2ad7d25e6d1024ccdf0f3207da0948;hpb=4318bf2905a8da290ec83cb67f26bd06ba2e4dc9;p=dmenu.git

diff --git a/draw.c b/draw.c
index 4e079e5..dddede0 100644
--- a/draw.c
+++ b/draw.c
@@ -24,22 +24,39 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, Bool invert)
+drawtext(const char *text, Bool invert, Bool border)
 {
 	int x, y, w, h;
 	static char buf[256];
-	unsigned int len;
+	unsigned int len, olen;
 	XGCValues gcv;
+	XPoint points[5];
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+
 	w = 0;
+	if(border) {
+		XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+		XSetForeground(dpy, dc.gc, dc.border);
+		points[0].x = dc.x;
+		points[0].y = dc.y;
+		points[1].x = dc.w - 1;
+		points[1].y = 0;
+		points[2].x = 0;
+		points[2].y = dc.h - 1;
+		points[3].x = -(dc.w - 1);
+		points[3].y = 0;
+		points[4].x = 0;
+		points[4].y = -(dc.h - 1);
+		XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
+	}
 
 	if(!text)
 		return;
 
-	len = strlen(text);
+	olen = len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
 	memcpy(buf, text, len);
@@ -52,6 +69,14 @@ drawtext(const char *text, Bool invert)
 	/* shorten text if necessary */
 	while(len && (w = textnw(buf, len)) > dc.w - h)
 		buf[--len] = 0;
+	if(len < olen) {
+		if(len > 1)
+			buf[len - 1] = '.';
+		if(len > 2)
+			buf[len - 2] = '.';
+		if(len > 3)
+			buf[len - 3] = '.';
+	}
 
 	if(w > dc.w)
 		return; /* too long */