X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/d7e17087ed2fc5eed57efa03e81460e3e41f7238..03128f78df1fbe1b90eb9b7bcb1953050e8bccea:/draw.c

diff --git a/draw.c b/draw.c
index 1046322..3ddc522 100644
--- a/draw.c
+++ b/draw.c
@@ -2,171 +2,214 @@
  * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-
+#include "dwm.h"
 #include <stdio.h>
 #include <string.h>
-
 #include <X11/Xlocale.h>
 
-#include "wm.h"
+/* static */
 
-static void
-drawborder(Brush *b)
+static unsigned int
+textnw(const char *text, unsigned int len)
 {
-	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);
+	XRectangle r;
+
+	if(dc.font.set) {
+		XmbTextExtents(dc.font.set, text, len, NULL, &r);
+		return r.width;
+	}
+	return XTextWidth(dc.font.xfont, text, len);
 }
 
-void
-draw(Brush *b, Bool border, const char *text)
+static void
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
 {
 	int x, y, w, h;
-	unsigned int len;
 	static char buf[256];
+	unsigned int len, olen;
 	XGCValues gcv;
-	XRectangle r = { b->x, b->y, b->w, b->h };
+	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	XSetForeground(dpy, b->gc, b->bg);
-	XFillRectangles(dpy, b->drawable, b->gc, &r, 1);
-
-	w = 0;
-	if(border)
-		drawborder(b);
+	XSetForeground(dpy, dc.gc, col[ColBG]);
+	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
 	if(!text)
 		return;
 
-	len = strlen(text);
+	w = 0;
+	olen = 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);
+	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(&b->font, buf, len)) > b->w - h)
+	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 > b->w)
+	if(w > dc.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);
+	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);
 	}
 	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);
+		gcv.font = dc.font.xfont->fid;
+		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+	}
+	if(highlight) {
+		r.x = dc.x + 2;
+		r.y = dc.y + 2;
+		r.width = r.height = 3;
+		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 }
 
-static unsigned long
-xloadcolors(Colormap cmap, const char *colstr)
-{
-	XColor color;
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
-}
+/* extern */
 
 void
-loadcolors(int scr, Brush *b,
-		const char *bg, const char *fg, const char *border)
+drawall()
 {
-	Colormap cmap = DefaultColormap(dpy, scr);
-	b->bg = xloadcolors(cmap, bg);
-	b->fg = xloadcolors(cmap, fg);
-	b->border = xloadcolors(cmap, border);
+	Client *c;
+
+	for(c = clients; c; c = getnext(c->next))
+		drawtitle(c);
+	drawstatus();
 }
 
-unsigned int
-textnw(Fnt *font, char *text, unsigned int len)
+void
+drawstatus()
 {
-	XRectangle r;
-	if(font->set) {
-		XmbTextExtents(font->set, text, len, NULL, &r);
-		return r.width;
+	int i, x;
+
+	dc.x = dc.y = 0;
+	dc.w = bw;
+
+	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
+	dc.w = modew;
+	for(i = 0; i < ntags; i++) {
+		dc.x += dc.w;
+		dc.w = textw(tags[i]);
+		if(seltag[i])
+			drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+		else
+			drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+	}
+	x = dc.x + dc.w + 1;
+	dc.w = textw(stext);
+	dc.x = bx + bw - dc.w;
+	if(dc.x < x) {
+		dc.x = x;
+		dc.w = bw - x;
+	}
+	drawtext(stext, dc.status, False);
+
+	if(sel && ((dc.w = dc.x - x) > bh)) {
+		dc.x = x;
+		drawtext(sel->name, dc.sel, False);
 	}
-	return XTextWidth(font->xfont, text, len);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+	XSync(dpy, False);
 }
 
-unsigned int
-textw(Fnt *font, char *text)
+void
+drawtitle(Client *c)
 {
-	return textnw(font, text, strlen(text));
+	int i;
+
+	if(c == sel && issel) {
+		drawstatus();
+		XUnmapWindow(dpy, c->twin);
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+		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);
+	XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+	XSync(dpy, False);
 }
 
-unsigned int
-texth(Fnt *font)
+unsigned long
+getcolor(const char *colstr)
 {
-	return font->height + 4;
+	Colormap cmap = DefaultColormap(dpy, screen);
+	XColor color;
+
+	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+	return color.pixel;
 }
 
 void
-loadfont(Fnt *font, const char *fontstr)
+setfont(const char *fontstr)
 {
 	char **missing, *def;
 	int i, n;
 
 	missing = NULL;
 	setlocale(LC_ALL, "");
-	if(font->set)
-		XFreeFontSet(dpy, font->set);
-	font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+	if(dc.font.set)
+		XFreeFontSet(dpy, dc.font.set);
+	dc.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 = NULL;
+		if(dc.font.set) {
+			XFreeFontSet(dpy, dc.font.set);
+			dc.font.set = NULL;
 		}
 	}
-	if(font->set) {
+	if(dc.font.set) {
 		XFontSetExtents *font_extents;
 		XFontStruct **xfonts;
 		char **font_names;
 
-		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;
+		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(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)
-			error("error, cannot load 'fixed' font\n");
-		font->ascent = font->xfont->ascent;
-		font->descent = font->xfont->descent;
+		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;
 	}
-	font->height = font->ascent + font->descent;
+	dc.font.height = dc.font.ascent + dc.font.descent;
+}
+
+unsigned int
+textw(const char *text)
+{
+	return textnw(text, strlen(text)) + dc.font.height;
 }