X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=fa340ffbe9bf2895549d1a0e377527ce1037862b;hp=eaad7fc4748f9cba3e169d248e221af733576466;hb=aafeaf731701e528f4ae9d7c7432b3e92fee4392;hpb=9800518ae3505e54c0e52ea3d40050f279e722d6

diff --git a/draw.c b/draw.c
index eaad7fc..fa340ff 100644
--- a/draw.c
+++ b/draw.c
@@ -1,134 +1,202 @@
 /* See LICENSE file for copyright and license details. */
-#include "dwm.h"
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <X11/Xlib.h>
 
-/* static */
-
-static void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
-	int x;
-	XGCValues gcv;
-	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-	gcv.foreground = col[ColFG];
-	XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-	x = (dc.font.ascent + dc.font.descent + 2) / 4;
-	r.x = dc.x + 1;
-	r.y = dc.y + 1;
-	if(filled) {
-		r.width = r.height = x + 1;
-		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+#include "draw.h"
+#include "util.h"
+
+Draw *
+draw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h) {
+	Draw *draw = (Draw *)calloc(1, sizeof(Draw));
+	draw->dpy = dpy;
+	draw->screen = screen;
+	draw->win = win;
+	draw->w = w;
+	draw->h = h;
+	draw->drawable = XCreatePixmap(dpy, win, w, h, DefaultDepth(dpy, screen));
+	draw->gc = XCreateGC(dpy, win, 0, NULL);
+	XSetLineAttributes(dpy, draw->gc, 1, LineSolid, CapButt, JoinMiter);
+	return draw;
+}
+
+void
+draw_resize(Draw *draw, unsigned int w, unsigned int h) {
+	if(!draw)
+		return;
+	draw->w = w;
+	draw->h = h;
+	XFreePixmap(draw->dpy, draw->drawable);
+	draw->drawable = XCreatePixmap(draw->dpy, draw->win, w, h, DefaultDepth(draw->dpy, draw->screen));
+}
+
+void
+draw_free(Draw *draw) {
+	XFreePixmap(draw->dpy, draw->drawable);
+	XFreeGC(draw->dpy, draw->gc);
+	free(draw);
+}
+
+Fnt *
+draw_font_create(Draw *draw, const char *fontname) {
+	Fnt *font;
+	char *def, **missing;
+	int n;
+
+	if(!draw)
+		return NULL;
+	font = (Fnt *)calloc(1, sizeof(Fnt));
+	font->set = XCreateFontSet(draw->dpy, fontname, &missing, &n, &def);
+	if(missing) {
+		while(n--)
+			fprintf(stderr, "draw: missing fontset: %s\n", missing[n]);
+		XFreeStringList(missing);
 	}
-	else if(empty) {
-		r.width = r.height = x;
-		XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	if(font->set) {
+		XFontStruct **xfonts;
+		char **font_names;
+		XExtentsOfFontSet(font->set);
+		n = XFontsOfFontSet(font->set, &xfonts, &font_names);
+		while(n--) {
+			font->ascent = MAX(font->ascent, (*xfonts)->ascent);
+			font->descent = MAX(font->descent,(*xfonts)->descent);
+			xfonts++;
+		}
 	}
+	else {
+		if(!(font->xfont = XLoadQueryFont(draw->dpy, fontname))
+		&& !(font->xfont = XLoadQueryFont(draw->dpy, "fixed")))
+			die("error, cannot load font: '%s'\n", fontname);
+		font->ascent = font->xfont->ascent;
+		font->descent = font->xfont->descent;
+	}
+	font->h = font->ascent + font->descent;
+	return font;
 }
 
-static Bool
-isoccupied(unsigned int t) {
-	Client *c;
+void
+draw_font_free(Draw *draw, Fnt *font) {
+	if(!draw || !font)
+		return;
+	if(font->set)
+		XFreeFontSet(draw->dpy, font->set);
+	else
+		XFreeFont(draw->dpy, font->xfont);
+	free(font);
+}
 
-	for(c = clients; c; c = c->next)
-		if(c->tags[t])
-			return True;
-	return False;
+Col *
+draw_col_create(Draw *draw, const char *colname) {
+	Col *col = (Col *)calloc(1, sizeof(Col));
+	Colormap cmap = DefaultColormap(draw->dpy, draw->screen);
+	XColor color;
+
+	if(!XAllocNamedColor(draw->dpy, cmap, colname, &color, &color))
+		die("error, cannot allocate color '%s'\n", colname);
+	col->rgb = color.pixel;
+	return col;
 }
 
-static unsigned int
-textnw(const char *text, unsigned int len) {
-	XRectangle r;
+void
+draw_col_free(Draw *draw, Col *col) {
+	if(!col)
+		return;
+	free(col);
+}
 
-	if(dc.font.set) {
-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-		return r.width;
-	}
-	return XTextWidth(dc.font.xfont, text, len);
+void
+draw_setfont(Draw *draw, Fnt *font) {
+	if(!draw)
+		return;
+	draw->font = font;
 }
 
-/* extern */
+void
+draw_setfg(Draw *draw, Col *col) {
+	if(!draw) 
+		return;
+	draw->fg = col;
+}
 
 void
-drawbar(void) {
-	int i, x;
-
-	dc.x = dc.y = 0;
-	for(i = 0; i < ntags; i++) {
-		dc.w = textw(tags[i]);
-		if(seltags[i]) {
-			drawtext(tags[i], dc.sel);
-			drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
-		}
-		else {
-			drawtext(tags[i], dc.norm);
-			drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
-		}
-		dc.x += dc.w;
-	}
-	dc.w = blw;
-	drawtext(getsymbol(), dc.norm);
-	x = dc.x + dc.w;
-	dc.w = textw(stext);
-	dc.x = sw - dc.w;
-	if(dc.x < x) {
-		dc.x = x;
-		dc.w = sw - x;
-	}
-	drawtext(stext, dc.norm);
-	if((dc.w = dc.x - x) > bh) {
-		dc.x = x;
-		if(sel) {
-			drawtext(sel->name, dc.sel);
-			drawsquare(sel->ismax, sel->isfloating, dc.sel);
-		}
-		else
-			drawtext(NULL, dc.norm);
-	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
-	XSync(dpy, False);
+draw_setbg(Draw *draw, Col *col) {
+	if(!draw)
+		return;
+	draw->bg = col;
+}
+
+void
+draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h, Bool filled, Bool empty, Bool invert) {
+	int dx;
+
+	if(!draw || !draw->font || !draw->fg || !draw->bg)
+		return;
+	XSetForeground(draw->dpy, draw->gc, invert ? draw->bg->rgb : draw->fg->rgb);
+	dx = (draw->font->ascent + draw->font->descent + 2) / 4;
+	if(filled)
+		XFillRectangle(draw->dpy, draw->drawable, draw->gc, x+1, y+1, dx+1, dx+1);
+	else if(empty)
+		XDrawRectangle(draw->dpy, draw->drawable, draw->gc, x+1, y+1, dx, dx);
 }
 
 void
-drawtext(const char *text, unsigned long col[ColLast]) {
-	int x, y, w, h;
-	static char buf[256];
-	unsigned int len, olen;
-	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-	XSetForeground(dpy, dc.gc, col[ColBG]);
-	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-	if(!text)
+draw_text(Draw *draw, int x, int y, unsigned int w, unsigned int h, const char *text, Bool invert) {
+	char buf[256];
+	int i, tx, ty, len, olen;
+	TextExtents tex;
+
+	if(!draw || !draw->fg || !draw->bg)
 		return;
-	w = 0;
-	olen = len = strlen(text);
-	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);
+	XSetForeground(draw->dpy, draw->gc, invert ? draw->fg->rgb : draw->bg->rgb);
+	XFillRectangle(draw->dpy, draw->drawable, draw->gc, x, y, w, h);
+	if(!text || !draw->font)
+		return;
+	olen = strlen(text);
+	draw_getextents(draw, text, olen, &tex);
+	ty = y + (h / 2) - tex.yOff;
+	tx = x + tex.xOff;
 	/* 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 */
-	XSetForeground(dpy, dc.gc, col[ColFG]);
-	if(dc.font.set)
-		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+	for(len = MIN(olen, sizeof buf); len && tex.w > w - tex.h; len--)
+		draw_getextents(draw, text, len, &tex);
+	if(!len)
+		return;
+	memcpy(buf, text, len);
+	if(len < olen)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
+	XSetForeground(draw->dpy, draw->gc, invert ? draw->bg->rgb : draw->fg->rgb);
+	if(draw->font->set)
+		XmbDrawString(draw->dpy, draw->drawable, draw->font->set, draw->gc, tx, ty, buf, len);
 	else
-		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+		XDrawString(draw->dpy, draw->drawable, draw->gc, tx, ty, buf, len);
+}
+
+void
+draw_map(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+	if(!draw)
+		return;
+	XCopyArea(draw->dpy, draw->drawable, draw->win, draw->gc, x, y, w, h, x, y);
+	XSync(draw->dpy, False);
 }
 
-unsigned int
-textw(const char *text) {
-	return textnw(text, strlen(text)) + dc.font.height;
+
+void
+draw_getextents(Draw *draw, const char *text, unsigned int len, TextExtents *extents) {
+	XRectangle r;
+
+	if(!draw || !draw->font || !text)
+		return;
+	if(draw->font->set) {
+		XmbTextExtents(draw->font->set, text, len, NULL, &r);
+		extents->xOff = r.x;
+		extents->yOff = r.y;
+		extents->w = r.width;
+		extents->h = r.height;
+	}
+	else {
+		extents->h = draw->font->ascent + draw->font->descent;
+		extents->w = XTextWidth(draw->font->xfont, text, len);
+		extents->xOff = extents->h / 2;
+		extents->yOff = (extents->h / 2) + draw->font->ascent;
+	}
 }