X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/67649463c802d68fa2c5c9dbece8aba3a2ca9d9a..b661ca75deda910fbbba38970b58a867c13a59a0:/draw.c

diff --git a/draw.c b/draw.c
index 383e130..68b8cb7 100644
--- a/draw.c
+++ b/draw.c
@@ -10,8 +10,7 @@
 /* static */
 
 static unsigned int
-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -24,39 +23,21 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, Bool invert, Bool border)
-{
+drawtext(const char *text, unsigned long col[ColLast]) {
 	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);
+	XSetForeground(dpy, dc.gc, col[ColBG]);
 	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);
+	w = 0;
+	olen = len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
 	memcpy(buf, text, len);
@@ -69,37 +50,43 @@ drawtext(const char *text, Bool invert, Bool border)
 	/* 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 */
 
-	gcv.foreground = invert ? dc.bg : dc.fg;
-	gcv.background = invert ? dc.fg : dc.bg;
+	gcv.foreground = col[ColFG];
 	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+		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 | GCBackground | GCFont, &gcv);
-		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
 }
 
 unsigned long
-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+		eprint("error, cannot allocate color '%s'\n", colstr);
 	return color.pixel;
 }
 
 void
-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {
 	char **missing, *def;
 	int i, n;
 
@@ -147,7 +134,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(const char *text)
-{
+textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }