X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/39677ec76616fe4165ef92afb14db2bef2488e30..8fda28be3576c9702c0323a5240bbc44c970f24e:/draw.c

diff --git a/draw.c b/draw.c
index cf7f14e..16bf805 100644
--- a/draw.c
+++ b/draw.c
@@ -1,164 +1,134 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#include <stdio.h>
+/* See LICENSE file for copyright and license details. */
+#include "dwm.h"
 #include <string.h>
 
-#include "draw.h"
-#include "util.h"
+/* static */
 
 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->rect.x;
-	points[0].y = b->rect.y;
-	points[1].x = b->rect.width - 1;
-	points[1].y = 0;
-	points[2].x = 0;
-	points[2].y = b->rect.height - 1;
-	points[3].x = -(b->rect.width - 1);
-	points[3].y = 0;
-	points[4].x = 0;
-	points[4].y = -(b->rect.height - 1);
-	XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
-}
-
-void
-draw(Display *dpy, Brush *b, Bool border, const char *text)
-{
-	unsigned int x, y, w, h, len;
-	static char buf[256];
+drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+	int x;
 	XGCValues gcv;
-
-	XSetForeground(dpy, b->gc, b->bg);
-	XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1);
-
-	if(border)
-		drawborder(dpy, b);
-
-	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->rect.y + (b->rect.height / 2) - (h / 2) + b->font.ascent;
-	x = b->rect.x + (h / 2);
-
-	/* shorten text if necessary */
-	while(len && (w = textwidth_l(&b->font, buf, len)) > b->rect.width - h)
-		buf[--len] = 0;
-
-	if(w > b->rect.width)
-		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);
+	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);
 	}
-	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);
+	else if(empty) {
+		r.width = r.height = x;
+		XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 }
 
-static unsigned long
-xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
-{
-	XColor color;
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
-}
+static Bool
+isoccupied(unsigned int t) {
+	Client *c;
 
-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);
+	for(c = clients; c; c = c->next)
+		if(c->tags[t])
+			return True;
+	return False;
 }
 
-unsigned int
-textwidth_l(Fnt *font, char *text, unsigned int len)
-{
-	if(font->set) {
-		XRectangle r;
-		XmbTextExtents(font->set, text, len, 0, &r);
+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(font->xfont, text, len);
+	return XTextWidth(dc.font.xfont, text, len);
 }
 
-unsigned int
-textwidth(Fnt *font, char *text)
-{
-	return textwidth_l(font, text, strlen(text));
-}
+/* extern */
 
 void
-loadfont(Display *dpy, Fnt *font, const char *fontstr)
-{
-	char **missing, *def;
-	int n;
-
-	missing = 0;
-	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]);
-		XFreeStringList(missing);
-		if(font->set) {
-			XFreeFontSet(dpy, font->set);
-			font->set = 0;
+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);
+			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;
 	}
-	if(font->set) {
-		XFontSetExtents *font_extents;
-		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;
-			xfonts++;
+	dc.w = blw;
+	drawtext(lt->symbol, 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);
 	}
-	else {
-		if(font->xfont)
-			XFreeFont(dpy, font->xfont);
-		font->xfont = 0;
-		font->xfont = XLoadQueryFont(dpy, fontstr);
-		if (!font->xfont)
-			font->xfont = XLoadQueryFont(dpy, "fixed");
-		if (!font->xfont)
-			error("error, cannot load 'fixed' font\n");
-		font->ascent = font->xfont->ascent;
-		font->descent = font->xfont->descent;
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
+	XSync(dpy, False);
+}
+
+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)
+		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] = '.';
 	}
-	font->height = font->ascent + font->descent;
+	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);
+	else
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+}
+
+unsigned int
+textw(const char *text) {
+	return textnw(text, strlen(text)) + dc.font.height;
 }