X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=cbf65020f1a90956b449d421b7d0ec38f5447e08;hb=7e597ae204ce94398f8c722e335f20d5a4a30c8a;hp=b5d8bd2eed8bfb99af76dc480401129c556bfe81;hpb=dc5d967ee61046f899b3b49daeb9268c8161844a;p=dwm.git

diff --git a/draw.c b/draw.c
index b5d8bd2..cbf6502 100644
--- a/draw.c
+++ b/draw.c
@@ -3,20 +3,28 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
 
 /* static */
 
+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);
+}
+
 static void
-drawborder(void)
+drawborder()
 {
 	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;
@@ -30,38 +38,27 @@ drawborder(void)
 	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 }
 
-static 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;
-	}
-	return XTextWidth(dc.font.xfont, text, len);
-}
-
 static void
-drawtext(const char *text, Bool invert, Bool border)
+drawtext(const char *text, Bool invert, Bool highlight)
 {
 	int x, y, w, h;
 	static char buf[256];
-	unsigned int len;
+	unsigned int len, olen;
+	DC tmp;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
-	w = 0;
-	if(border)
-		drawborder();
+	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+	XSetForeground(dpy, dc.gc, dc.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);
@@ -74,21 +71,36 @@ 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;
 	if(dc.font.set) {
 		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
-				x, y, buf, len);
+		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);
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+	}
+	if(highlight) {
+		tmp = dc;
+		dc.x += 2;
+		dc.y += 2;
+		dc.w -= 4;
+		dc.h -= 4;
+		drawborder();
+		dc = tmp;
 	}
 }
 
@@ -99,7 +111,7 @@ drawall()
 {
 	Client *c;
 
-	for(c = clients; c; c = getnext(c->next, tsel))
+	for(c = clients; c; c = getnext(c->next))
 		drawtitle(c);
 	drawstatus();
 }
@@ -107,7 +119,7 @@ drawall()
 void
 drawstatus()
 {
-	int i;
+	int i, x;
 	Bool istile = arrange == dotile;
 
 	dc.x = dc.y = 0;
@@ -115,23 +127,27 @@ drawstatus()
 	drawtext(NULL, !istile, False);
 
 	dc.w = 0;
-	for(i = 0; i < TLast; i++) {
+	for(i = 0; i < ntags; i++) {
 		dc.x += dc.w;
 		dc.w = textw(tags[i]);
 		if(istile)
-			drawtext(tags[i], (i == tsel), True);
+			drawtext(tags[i], seltag[i], sel && sel->tags[i]);
 		else
-			drawtext(tags[i], (i != tsel), True);
-	}
-	if(sel) {
-		dc.x += dc.w;
-		dc.w = textw(sel->name);
-		drawtext(sel->name, istile, True);
+			drawtext(tags[i], !seltag[i], sel && sel->tags[i]);
 	}
+	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, !istile, False);
 
+	if(sel && ((dc.w = dc.x - x) > bh)) {
+		dc.x = x;
+		drawtext(sel->name, istile, False);
+	}
 	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
 }
@@ -142,30 +158,19 @@ drawtitle(Client *c)
 	int i;
 	Bool istile = arrange == dotile;
 
-	if(c == sel) {
+	if(c == sel && issel) {
 		drawstatus();
-		XUnmapWindow(dpy, c->title);
+		XUnmapWindow(dpy, c->twin);
 		XSetWindowBorder(dpy, c->win, dc.fg);
 		return;
 	}
 
 	XSetWindowBorder(dpy, c->win, dc.bg);
-	XMapWindow(dpy, c->title);
-
+	XMapWindow(dpy, c->twin);
 	dc.x = dc.y = 0;
-
-	dc.w = 0;
-	for(i = 0; i < TLast; i++) {
-		if(c->tags[i]) {
-			dc.x += dc.w;
-			dc.w = textw(c->tags[i]);
-			drawtext(c->tags[i], !istile, True);
-		}
-	}
-	dc.x += dc.w;
-	dc.w = textw(c->name);
-	drawtext(c->name, !istile, True);
-	XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+	dc.w = c->tw;
+	drawtext(c->name, !istile, False);
+	XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
 	XSync(dpy, False);
 }
 
@@ -231,7 +236,7 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(char *text)
+textw(const char *text)
 {
 	return textnw(text, strlen(text)) + dc.font.height;
 }