X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/857d825eeb9f0d91a3d8a2507e8955196646f9a1..f21d46ea7def76221c4173f644eb2188ae9edbb1:/draw.c

diff --git a/draw.c b/draw.c
index e4b2b88..e88a70c 100644
--- a/draw.c
+++ b/draw.c
@@ -1,218 +1,155 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-#include "dwm.h"
+/* See LICENSE file for copyright and license details. */
 #include <stdio.h>
-#include <string.h>
-#include <X11/Xlocale.h>
-
-/* static */
-
-static Bool
-isoccupied(unsigned int t)
-{
-	Client *c;
-	for(c = clients; c; c = c->next)
-		if(c->tags[t])
-			return True;
-	return False;
+#include <stdlib.h>
+#include <X11/Xlib.h>
+
+#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;
 }
 
-static unsigned int
-textnw(const char *text, unsigned int len) {
-	XRectangle r;
+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));
+}
 
-	if(dc.font.set) {
-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-		return r.width;
-	}
-	return XTextWidth(dc.font.xfont, text, len);
+void
+draw_free(Draw *draw) {
+	XFreePixmap(draw->dpy, draw->drawable);
+	XFreeGC(draw->dpy, draw->gc);
+	free(draw);
 }
 
-static void
-drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) {
-	int x, y, w, h;
-	static char buf[256];
-	unsigned int len, olen;
-	XGCValues gcv;
-	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-	XPoint pt[5];
-
-	XSetForeground(dpy, dc.gc, col[ColBG]);
-	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-	if(!text)
-		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);
-	/* 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] = '.';
+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);
 	}
-	if(w > dc.w)
-		return; /* too long */
-	gcv.foreground = col[ColFG];
-	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+	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 {
-		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
-		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-	}
-	x = (h + 2) / 4;
-	if(filledsquare) {
-		r.x = dc.x + 1;
-		r.y = dc.y + 1;
-		r.width = r.height = x + 1;
-		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-	}
-	else if(emptysquare) {
-		pt[0].x = dc.x + 1;
-		pt[0].y = dc.y + 1;
-		pt[1].x = x;
-		pt[1].y = 0;
-		pt[2].x = 0;
-		pt[2].y = x;
-		pt[3].x = -x;
-		pt[3].y = 0;
-		pt[4].x = 0;
-		pt[4].y = -x;
-		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
+		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;
 }
 
-/* extern */
+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);
+}
+
+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;
+}
 
 void
-drawall(void) {
-	Client *c;
+draw_col_free(Draw *draw, Col *col) {
+	if(!col)
+		return;
+	free(col);
+}
 
-	for(c = clients; c; c = getnext(c->next))
-		drawtitle(c);
-	drawstatus();
+void
+draw_setfont(Draw *draw, Fnt *font) {
+	if(!draw || !font)
+		return;
+	draw->font = font;
 }
 
 void
-drawstatus(void) {
-	int i, x;
-
-	dc.x = dc.y = 0;
-	for(i = 0; i < ntags; i++) {
-		dc.w = textw(tags[i]);
-		if(seltag[i])
-			drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));
-		else
-			drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));
-		dc.x += dc.w;
-	}
-	dc.w = bmw;
-	drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
-	x = dc.x + dc.w;
-	dc.w = textw(stext);
-	dc.x = bw - dc.w;
-	if(dc.x < x) {
-		dc.x = x;
-		dc.w = bw - x;
-	}
-	drawtext(stext, dc.status, False, False);
-	if((dc.w = dc.x - x) > bh) {
-		dc.x = x;
-		drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
-	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
-	XSync(dpy, False);
+draw_setfg(Draw *draw, Col *col) {
+	if(!draw || !col) 
+		return;
+	draw->fg = col;
 }
 
 void
-drawtitle(Client *c) {
-	if(c == sel && issel) {
-		drawstatus();
-		XUnmapWindow(dpy, c->twin);
-		XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+draw_setbg(Draw *draw, Col *col) {
+	if(!draw || !col)
 		return;
-	}
-	XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
-	XMapWindow(dpy, c->twin);
-	dc.x = dc.y = 0;
-	dc.w = c->tw;
-	drawtext(c->name, dc.norm, False,False);
-	XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
-	XSync(dpy, False);
+	draw->bg = col;
 }
 
-unsigned long
-getcolor(const char *colstr) {
-	Colormap cmap = DefaultColormap(dpy, screen);
-	XColor color;
+void
+draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+	if(!draw)
+		return;
+	/* TODO: draw the rectangle */
+}
 
-	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-		eprint("error, cannot allocate color '%s'\n", colstr);
-	return color.pixel;
+void
+draw_text(Draw *draw, int x, int y, const char *text) {
+	if(!draw)
+		return;
+	/* TODO: draw the text */
 }
 
 void
-setfont(const char *fontstr) {
-	char *def, *lc, **missing;
-	int i, n;
-
-	lc = setlocale(LC_CTYPE, NULL);
-	setlocale(LC_CTYPE, "UTF-8");
-	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	setlocale(LC_CTYPE, lc);
-	if(missing) {
-		while(n--)
-			fprintf(stderr, "missing fontset: %s\n", missing[n]);
-		XFreeStringList(missing);
-	}
-	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;
-	}
-	dc.font.height = dc.font.ascent + dc.font.descent;
+draw_map(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+	if(!draw)
+		return;
+	/* TODO: map the draw contents in the region */
 }
 
-unsigned int
-textw(const char *text) {
-	return textnw(text, strlen(text)) + dc.font.height;
+void
+draw_getextents(Draw *draw, const char *text, TextExtents *extents) {
+	if(!draw || !extents)
+		return;
+	/* TODO: get extents */
 }