X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=bbcfadb9e39ef2d4f1397a3ecbe57df94c826306;hp=3fbc85c7426b8e551d8a4f8b938b5701eeb51c24;hb=c8e57332d1a5167d213af0fc9438ff2b56c74fbb;hpb=e7fa504c3e095db65853afd39d2d1324d439dcf4

diff --git a/draw.c b/draw.c
index 3fbc85c..bbcfadb 100644
--- a/draw.c
+++ b/draw.c
@@ -2,53 +2,40 @@
  * (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 "dwm.h"
+/* static */
 
-static void
-drawborder(void)
-{
-	XPoint points[5];
-	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-	XSetForeground(dpy, dc.gc, dc.border);
-	points[0].x = dc.x;
-	points[0].y = dc.y;
-	points[1].x = dc.w - 1;
-	points[1].y = 0;
-	points[2].x = 0;
-	points[2].y = dc.h - 1;
-	points[3].x = -(dc.w - 1);
-	points[3].y = 0;
-	points[4].x = 0;
-	points[4].y = -(dc.h - 1);
-	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
+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(dc.font.xfont, text, len);
 }
 
-void
-drawtext(const char *text, Bool invert, Bool border)
-{
+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 = { dc.x, dc.y, dc.w, dc.h };
 
-	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
-	w = 0;
-	if(border)
-		drawborder();
-
 	if(!text)
 		return;
 
-	len = strlen(text);
+	w = 0;
+	olen = len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
 	memcpy(buf, text, len);
@@ -61,54 +48,116 @@ drawtext(const char *text, Bool invert, Bool border)
 	/* 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 */
-
-	gcv.foreground = invert ? dc.bg : dc.fg;
-	gcv.background = invert ? dc.fg : dc.bg;
+	gcv.foreground = col[ColFG];
 	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
-				x, y, buf, len);
+		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
 	}
 	else {
 		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
-		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+		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 = (h + 2) / 4;
+		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 }
 
-unsigned long
-initcolor(const char *colstr)
-{
-	XColor color;
-	Colormap cmap = DefaultColormap(dpy, screen);
+/* extern */
 
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
+void
+drawall(void) {
+	Client *c;
+
+	for(c = clients; c; c = getnext(c->next))
+		drawtitle(c);
+	drawstatus();
 }
 
-unsigned int
-textnw(char *text, unsigned int len)
-{
-	XRectangle r;
-	if(dc.font.set) {
-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-		return r.width;
+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]);
+		else
+			drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+		dc.x += dc.w;
 	}
-	return XTextWidth(dc.font.xfont, text, len);
+
+	dc.w = bmw;
+	drawtext(arrange == dofloat ?
+		FLOATSYMBOL : stackpos == StackBottom ?
+			BSTACKSYMBOL : VSTACKSYMBOL, dc.status, False);
+
+	x = dc.x + dc.w;
+	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((dc.w = dc.x - x) > bh) {
+		dc.x = x;
+		if(sel)
+			drawtext(sel->name, dc.sel, False);
+		else
+			drawtext(NULL, dc.norm, False);
+	}
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+	XSync(dpy, False);
 }
 
-unsigned int
-textw(char *text)
-{
-	return textnw(text, strlen(text));
+void
+drawtitle(Client *c) {
+	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 long
+getcolor(const char *colstr) {
+	Colormap cmap = DefaultColormap(dpy, screen);
+	XColor color;
+
+	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+		eprint("error, cannot allocate color '%s'\n", colstr);
+	return color.pixel;
 }
 
 void
-initfont(const char *fontstr)
-{
+setfont(const char *fontstr) {
 	char **missing, *def;
 	int i, n;
 
@@ -150,9 +199,14 @@ initfont(const char *fontstr)
 		if (!dc.font.xfont)
 			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
 		if (!dc.font.xfont)
-			error("error, cannot init 'fixed' font\n");
+			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;
 }
+
+unsigned int
+textw(const char *text) {
+	return textnw(text, strlen(text)) + dc.font.height;
+}