X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=draw.c;h=9142905b8ecd20cf1a12f3321fe2552dabb50a95;hb=723361fa124aa666d637e3fc9f5df1210a9e02b4;hp=d74762911f054d907a5a63c718268c6826690b92;hpb=7817523a685f0dbba2e074a448099558a54b1b9c;p=dmenu.git

diff --git a/draw.c b/draw.c
index d747629..9142905 100644
--- a/draw.c
+++ b/draw.c
@@ -1,171 +1,136 @@
-/*
- * (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 <ctype.h>
+#include <locale.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <strings.h>
+#include <X11/Xlib.h>
+#include "draw.h"
 
-#include "dmenu.h"
-
-static void
-drawborder(Display *dpy, Brush *b)
-{
-	XPoint points[5];
-	XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
-	XSetForeground(dpy, b->gc, b->border);
-	points[0].x = b->x;
-	points[0].y = b->y;
-	points[1].x = b->w - 1;
-	points[1].y = 0;
-	points[2].x = 0;
-	points[2].y = b->h - 1;
-	points[3].x = -(b->w - 1);
-	points[3].y = 0;
-	points[4].x = 0;
-	points[4].y = -(b->h - 1);
-	XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
-}
+/* macros */
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
+#define MAX(a, b)               ((a) > (b) ? (a) : (b))
+
+/* variables */
+const char *progname;
 
 void
-draw(Display *dpy, Brush *b, Bool border, const char *text)
-{
-	unsigned int x, y, w, h, len;
-	static char buf[256];
-	XGCValues gcv;
-	XRectangle r = { b->x, b->y, b->w, b->h };
+cleanupdraw(DC *dc) {
+	if(dc->font.set)
+		XFreeFontSet(dc->dpy, dc->font.set);
+	else
+		XFreeFont(dc->dpy, dc->font.xfont);
+	XFreePixmap(dc->dpy, dc->drawable);
+	XFreeGC(dc->dpy, dc->gc);
+}
 
-	XSetForeground(dpy, b->gc, b->bg);
-	XFillRectangles(dpy, b->drawable, b->gc, &r, 1);
+void
+setupdraw(DC *dc, Window w) {
+	XWindowAttributes wa;
+
+	XGetWindowAttributes(dc->dpy, w, &wa);
+	dc->drawable = XCreatePixmap(dc->dpy, w, wa.width, wa.height,
+		DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
+	dc->gc = XCreateGC(dc->dpy, w, 0, NULL);
+	XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
+	if(!dc->font.set)
+		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
+}
 
-	w = 0;
-	if(border)
-		drawborder(dpy, b);
+void
+drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
+	char buf[256];
+	int i, x, y, h, len, olen;
+	XRectangle r = { dc->x, dc->y, dc->w, dc->h };
 
+	XSetForeground(dc->dpy, dc->gc, col[ColBG]);
+	XFillRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
 	if(!text)
 		return;
-
-	len = strlen(text);
-	if(len >= sizeof(buf))
-		len = sizeof(buf) - 1;
-	memcpy(buf, text, len);
-	buf[len] = 0;
-
-	h = b->font.ascent + b->font.descent;
-	y = b->y + (b->h / 2) - (h / 2) + b->font.ascent;
-	x = b->x + (h / 2);
-
+	olen = strlen(text);
+	h = dc->font.height;
+	y = dc->y + ((h+2) / 2) - (h / 2) + dc->font.ascent;
+	x = dc->x + (h / 2);
 	/* shorten text if necessary */
-	while(len && (w = textnw(&b->font, buf, len)) > b->w - h)
-		buf[--len] = 0;
-
-	if(w > b->w)
-		return; /* too long */
-
-	gcv.foreground = b->fg;
-	gcv.background = b->bg;
-	if(b->font.set) {
-		XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc,
-				x, y, buf, len);
-	}
-	else {
-		gcv.font = b->font.xfont->fid;
-		XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv);
-		XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len);
-	}
-}
-
-static unsigned long
-xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
-{
-	XColor color;
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
+	for(len = MIN(olen, sizeof buf); len && textnw(dc, text, len) > dc->w - h; len--);
+	if(!len)
+		return;
+	memcpy(buf, text, len);
+	if(len < olen)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
+	XSetForeground(dc->dpy, dc->gc, col[ColFG]);
+	if(dc->font.set)
+		XmbDrawString(dc->dpy, dc->drawable, dc->font.set, dc->gc, x, y, buf, len);
+	else
+		XDrawString(dc->dpy, dc->drawable, dc->gc, x, y, buf, len);
 }
 
 void
-loadcolors(Display *dpy, int screen, Brush *b,
-		const char *bg, const char *fg, const char *border)
-{
-	Colormap cmap = DefaultColormap(dpy, screen);
-	b->bg = xloadcolors(dpy, cmap, bg);
-	b->fg = xloadcolors(dpy, cmap, fg);
-	b->border = xloadcolors(dpy, cmap, border);
-}
-
-unsigned int
-textnw(Fnt *font, char *text, unsigned int len)
-{
-	XRectangle r;
-	if(font->set) {
-		XmbTextExtents(font->set, text, len, NULL, &r);
-		return r.width;
-	}
-	return XTextWidth(font->xfont, text, len);
+eprint(const char *fmt, ...) {
+	va_list ap;
+
+	fprintf(stderr, "%s: ", progname);
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
 }
 
-unsigned int
-textw(Fnt *font, char *text)
-{
-	return textnw(font, text, strlen(text));
-}
+unsigned long
+getcolor(DC *dc, const char *colstr) {
+	Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
+	XColor color;
 
-unsigned int
-texth(Fnt *font)
-{
-	return font->height + 4;
+	if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
+		eprint("cannot allocate color '%s'\n", colstr);
+	return color.pixel;
 }
 
 void
-loadfont(Display *dpy, Fnt *font, const char *fontstr)
-{
-	char **missing, *def;
-	int n;
-
-	missing = NULL;
-	def = "?";
-	setlocale(LC_ALL, "");
-	if(font->set)
-		XFreeFontSet(dpy, font->set);
-	font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing) {
-		while(n--)
-			fprintf(stderr, "missing fontset: %s\n", missing[n]);
+initfont(DC *dc, const char *fontstr) {
+	char *def, **missing = NULL;
+	int i, n;
+
+	if(!fontstr || !*fontstr)
+		eprint("cannot load null font\n");
+	dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def);
+	if(missing)
 		XFreeStringList(missing);
-		if(font->set) {
-			XFreeFontSet(dpy, font->set);
-			font->set = NULL;
-		}
-	}
-	if(font->set) {
-		XFontSetExtents *font_extents;
+	if(dc->font.set) {
 		XFontStruct **xfonts;
 		char **font_names;
-		unsigned int i;
-
-		font->ascent = font->descent = 0;
-		font_extents = XExtentsOfFontSet(font->set);
-		n = XFontsOfFontSet(font->set, &xfonts, &font_names);
-		for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) {
-			if(font->ascent < (*xfonts)->ascent)
-				font->ascent = (*xfonts)->ascent;
-			if(font->descent < (*xfonts)->descent)
-				font->descent = (*xfonts)->descent;
+		dc->font.ascent = dc->font.descent = 0;
+		n = XFontsOfFontSet(dc->font.set, &xfonts, &font_names);
+		for(i = 0; i < n; i++) {
+			dc->font.ascent = MAX(dc->font.ascent, (*xfonts)->ascent);
+			dc->font.descent = MAX(dc->font.descent, (*xfonts)->descent);
 			xfonts++;
 		}
 	}
 	else {
-		if(font->xfont)
-			XFreeFont(dpy, font->xfont);
-		font->xfont = NULL;
-		font->xfont = XLoadQueryFont(dpy, fontstr);
-		if (!font->xfont)
-			font->xfont = XLoadQueryFont(dpy, "fixed");
-		if (!font->xfont)
-			eprint("error, cannot load 'fixed' font\n");
-		font->ascent = font->xfont->ascent;
-		font->descent = font->xfont->descent;
+		if(!(dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))
+		&& !(dc->font.xfont = XLoadQueryFont(dc->dpy, "fixed")))
+			eprint("cannot load font '%s'\n", fontstr);
+		dc->font.ascent = dc->font.xfont->ascent;
+		dc->font.descent = dc->font.xfont->descent;
 	}
-	font->height = font->ascent + font->descent;
+	dc->font.height = dc->font.ascent + dc->font.descent;
+}
+
+int
+textnw(DC *dc, 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);
+}
+
+int
+textw(DC *dc, const char *text) {
+	return textnw(dc, text, strlen(text)) + dc->font.height;
 }