X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=bdbe85aebad6b8c9ad4f54053edb567ecc6e1a04;hb=d7413ffd2d9a84fc3140b28b26f8cb6bb80164e4;hp=4c47c1a8c4c0501b9b542f633301c3715d06de94;hpb=dba23062bad40afb1a90f60b6897cf9e1ca5035b;p=dwm.git

diff --git a/draw.c b/draw.c
index 4c47c1a..bdbe85a 100644
--- a/draw.c
+++ b/draw.c
@@ -2,94 +2,37 @@
  * (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 */
 
-void
-drawall()
+static unsigned int
+textnw(const char *text, unsigned int len)
 {
-	Client *c;
-
-	for(c = clients; c; c = getnext(c->next))
-		drawtitle(c);
-	drawstatus();
-}
-
-void
-drawstatus()
-{
-	int i;
-	Bool istile = arrange == dotile;
-
-	dc.x = dc.y = 0;
-	dc.w = bw;
-	drawtext(NULL, !istile, False);
-
-	dc.w = 0;
-	for(i = 0; i < TLast; i++) {
-		dc.x += dc.w;
-		dc.w = textw(tags[i]);
-		if(istile)
-			drawtext(tags[i], (i == tsel), True);
-		else
-			drawtext(tags[i], (i != tsel), True);
-	}
-	if(sel) {
-		dc.x += dc.w;
-		dc.w = textw(sel->name);
-		drawtext(sel->name, istile, True);
-	}
-	dc.w = textw(stext);
-	dc.x = bx + bw - dc.w;
-	drawtext(stext, !istile, False);
-
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
-	XFlush(dpy);
-}
-
-void
-drawtitle(Client *c)
-{
-	int i;
-	Bool istile = arrange == dotile;
-
-	if(c == sel) {
-		drawstatus();
-		XUnmapWindow(dpy, c->title);
-		XSetWindowBorder(dpy, c->win, dc.fg);
-		return;
-	}
-
-	XSetWindowBorder(dpy, c->win, dc.bg);
-	XMapWindow(dpy, c->title);
-
-	dc.x = dc.y = 0;
+	XRectangle r;
 
-	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);
-		}
+	if(dc.font.set) {
+		XmbTextExtents(dc.font.set, text, len, NULL, &r);
+		return r.width;
 	}
-	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);
-	XFlush(dpy);
+	return XTextWidth(dc.font.xfont, text, len);
 }
 
 static void
-drawborder(void)
+drawtext(const char *text, Bool invert)
 {
+	int x, y, w, h;
+	static char buf[256];
+	unsigned int len;
+	XGCValues gcv;
 	XPoint points[5];
+	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);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	XSetForeground(dpy, dc.gc, dc.border);
 	points[0].x = dc.x;
@@ -103,27 +46,11 @@ drawborder(void)
 	points[4].x = 0;
 	points[4].y = -(dc.h - 1);
 	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
-void
-drawtext(const char *text, Bool invert, Bool border)
-{
-	int x, y, w, h;
-	unsigned int len;
-	static char buf[256];
-	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();
 
 	if(!text)
 		return;
 
+	w = 0;
 	len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
@@ -155,31 +82,90 @@ drawtext(const char *text, Bool invert, Bool border)
 	}
 }
 
-unsigned long
-getcolor(const char *colstr)
+/* extern */
+
+void
+drawall()
 {
-	XColor color;
-	Colormap cmap = DefaultColormap(dpy, screen);
+	Client *c;
 
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
+	for(c = clients; c; c = getnext(c->next))
+		drawtitle(c);
+	drawstatus();
 }
 
-unsigned int
-textnw(char *text, unsigned int len)
+void
+drawstatus()
 {
-	XRectangle r;
-	if(dc.font.set) {
-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-		return r.width;
+	int i, x;
+	Bool istile = arrange == dotile;
+
+	dc.x = dc.y = 0;
+	dc.w = bw;
+	drawtext(NULL, !istile);
+
+	dc.w = 0;
+	for(i = 0; i < ntags; i++) {
+		dc.x += dc.w;
+		dc.w = textw(tags[i]);
+		if(istile)
+			drawtext(tags[i], tsel[i]);
+		else
+			drawtext(tags[i], !tsel[i]);
 	}
-	return XTextWidth(dc.font.xfont, text, len);
+	x = dc.x + dc.w;
+	dc.w = textw(stext);
+	dc.x = bx + bw - dc.w;
+	drawtext(stext, !istile);
+	if(sel && ((dc.w = dc.x - x) >= bh)) {
+		dc.x = x;
+		drawtext(sel->name, istile);
+	}
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+	XSync(dpy, False);
 }
 
-unsigned int
-textw(char *text)
+void
+drawtitle(Client *c)
 {
-	return textnw(text, strlen(text)) + dc.font.height;
+	int i;
+	Bool istile = arrange == dotile;
+
+	if(c == sel && issel) {
+		drawstatus();
+		XUnmapWindow(dpy, c->title);
+		XSetWindowBorder(dpy, c->win, dc.fg);
+		return;
+	}
+
+	XSetWindowBorder(dpy, c->win, dc.bg);
+	XMapWindow(dpy, c->title);
+
+	dc.x = dc.y = 0;
+
+	dc.w = 0;
+	for(i = 0; i < ntags; i++) {
+		if(c->tags[i]) {
+			dc.x += dc.w;
+			dc.w = textw(tags[i]);
+			drawtext(tags[i], !istile);
+		}
+	}
+	dc.x += dc.w;
+	dc.w = textw(c->name);
+	drawtext(c->name, !istile);
+	XCopyArea(dpy, dc.drawable, c->title, 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;
+
+	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+	return color.pixel;
 }
 
 void
@@ -232,3 +218,9 @@ setfont(const char *fontstr)
 	}
 	dc.font.height = dc.font.ascent + dc.font.descent;
 }
+
+unsigned int
+textw(const char *text)
+{
+	return textnw(text, strlen(text)) + dc.font.height;
+}