X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=bar.c;h=d9d81718086f407bf1588b183531372c530763db;hp=1f125122695214639acb1dfcaf171d681496926b;hb=da2bbd371c522d63d737d43a127601a3fdbcb9d8;hpb=896f08d7d553f7def3877648c113cf03e6ca546a

diff --git a/bar.c b/bar.c
index 1f12512..d9d8171 100644
--- a/bar.c
+++ b/bar.c
@@ -8,23 +8,34 @@
 void
 draw_bar()
 {
-	brush.rect = barrect;
-	brush.rect.x = brush.rect.y = 0;
+	int i;
+	brush.x = brush.y = 0;
+	brush.w = bw;
+	brush.h = bh;
 	draw(dpy, &brush, False, NULL);
 
+	brush.w = 0;
+	for(i = 0; i < TLast; i++) {
+		brush.x += brush.w;
+		brush.w = textw(&brush.font, tags[i]) + bh;
+		if(i == tsel) {
+			swap((void **)&brush.fg, (void **)&brush.bg);
+			draw(dpy, &brush, True, tags[i]);
+			swap((void **)&brush.fg, (void **)&brush.bg);
+		}
+		else
+			draw(dpy, &brush, True, tags[i]);
+	}
 	if(stack) {
-		brush.rect.width = textwidth(&brush.font, stack->name) + labelheight(&brush.font);
 		swap((void **)&brush.fg, (void **)&brush.bg);
+		brush.x += brush.w;
+		brush.w = textw(&brush.font, stack->name) + bh;
 		draw(dpy, &brush, True, stack->name);
 		swap((void **)&brush.fg, (void **)&brush.bg);
-		brush.rect.x += brush.rect.width;
 	}
-
-	brush.rect.width = textwidth(&brush.font, statustext) + labelheight(&brush.font);
-	brush.rect.x = barrect.x + barrect.width - brush.rect.width;
-	draw(dpy, &brush, False, statustext);
-
-	XCopyArea(dpy, brush.drawable, barwin, brush.gc, 0, 0, barrect.width,
-			barrect.height, 0, 0);
+	brush.w = textw(&brush.font, stext) + bh;
+	brush.x = bx + bw - brush.w;
+	draw(dpy, &brush, False, stext);
+	XCopyArea(dpy, brush.drawable, barwin, brush.gc, 0, 0, bw, bh, 0, 0);
 	XFlush(dpy);
 }