X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=draw.c;h=72439c5e14593e93dc05ad81d6c9621edda1662a;hb=b97783b07feae30f9df12c1a720d17a2dc877018;hp=dddede040c6158215e825fd8573dfe23f566592c;hpb=6a26e97f741d732a68a978bbcde4331a6a1610c2;p=dmenu.git

diff --git a/draw.c b/draw.c
index dddede0..72439c5 100644
--- a/draw.c
+++ b/draw.c
@@ -1,71 +1,29 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dmenu.h"
-#include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
-
-/* static */
-
-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
-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, 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;
-
+	w = 0;
 	olen = len = strlen(text);
-	if(len >= sizeof(buf))
-		len = sizeof(buf) - 1;
+	if(len >= sizeof buf)
+		len = sizeof buf - 1;
 	memcpy(buf, text, len);
 	buf[len] = 0;
-
 	h = dc.font.ascent + dc.font.descent;
 	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
 	x = dc.x + (h / 2);
-
 	/* shorten text if necessary */
 	while(len && (w = textnw(buf, len)) > dc.w - h)
 		buf[--len] = 0;
@@ -77,85 +35,27 @@ drawtext(const char *text, Bool invert, Bool border)
 		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;
-	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(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);
-	}
+	XSetForeground(dpy, dc.gc, col[ColFG]);
+	if(dc.font.set)
+		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+	else
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-unsigned long
-getcolor(const char *colstr)
-{
-	Colormap cmap = DefaultColormap(dpy, screen);
-	XColor color;
-
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
+unsigned int
+textw(const char *text) {
+	return textnw(text, strlen(text)) + dc.font.height;
 }
 
-void
-setfont(const char *fontstr)
-{
-	char **missing, *def;
-	int i, n;
+unsigned int
+textnw(const char *text, unsigned int len) {
+	XRectangle r;
 
-	missing = NULL;
-	setlocale(LC_ALL, "");
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing) {
-		XFreeStringList(missing);
-		if(dc.font.set) {
-			XFreeFontSet(dpy, dc.font.set);
-			dc.font.set = NULL;
-		}
-	}
 	if(dc.font.set) {
-		XFontSetExtents *font_extents;
-		XFontStruct **xfonts;
-		char **font_names;
-
-		dc.font.ascent = dc.font.descent = 0;
-		font_extents = XExtentsOfFontSet(dc.font.set);
-		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-			if(dc.font.ascent < (*xfonts)->ascent)
-				dc.font.ascent = (*xfonts)->ascent;
-			if(dc.font.descent < (*xfonts)->descent)
-				dc.font.descent = (*xfonts)->descent;
-			xfonts++;
-		}
-	}
-	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
-		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-		if (!dc.font.xfont)
-			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-		if (!dc.font.xfont)
-			eprint("error, cannot init 'fixed' font\n");
-		dc.font.ascent = dc.font.xfont->ascent;
-		dc.font.descent = dc.font.xfont->descent;
+		XmbTextExtents(dc.font.set, text, len, NULL, &r);
+		return r.width;
 	}
-	dc.font.height = dc.font.ascent + dc.font.descent;
-}
-
-unsigned int
-textw(const char *text)
-{
-	return textnw(text, strlen(text)) + dc.font.height;
+	return XTextWidth(dc.font.xfont, text, len);
 }