removed a bottleneck

[dwm.git] / bar.c

diff --git a/bar.c b/bar.c
index 17db8cd..ea4b946 100644 (file)
--- a/bar.c
+++ b/bar.c
@@ -3,26 +3,52 @@
  * See LICENSE file for license details.
  */
 
-#include "wm.h"
+#include "dwm.h"
 
-static const char *status[] = {
-       "sh", "-c", "echo -n `date` `uptime | sed 's/.*://; s/,//g'`"
-               " `acpi | awk '{print $4}' | sed 's/,//'`", 0 \
-};
+void
+barclick(XButtonPressedEvent *e)
+{
+       int x = 0;
+       Arg a;
+       for(a.i = 0; a.i < TLast; a.i++) {
+               x += textw(tags[a.i]) + dc.font.height;
+               if(e->x < x) {
+                       view(&a);
+                       return;
+               }
+       }
+}
 
 void
 draw_bar()
 {
-       static char buf[1024];
-
-       buf[0] = 0;
-       pipe_spawn(buf, sizeof(buf), dpy, (char **)status);
-
-       brush.rect = barrect;
-       brush.rect.x = brush.rect.y = 0;
-       draw(dpy, &brush, False, buf);
+       int i;
+       dc.x = dc.y = 0;
+       dc.w = bw;
+       drawtext(NULL, False);
 
-       XCopyArea(dpy, brush.drawable, barwin, brush.gc, 0, 0, barrect.width,
-                       barrect.height, 0, 0);
+       dc.w = 0;
+       for(i = 0; i < TLast; i++) {
+               dc.x += dc.w;
+               dc.w = textw(tags[i]) + dc.font.height;
+               if(i == tsel) {
+                       swap((void **)&dc.fg, (void **)&dc.bg);
+                       drawtext(tags[i], True);
+                       swap((void **)&dc.fg, (void **)&dc.bg);
+               }
+               else
+                       drawtext(tags[i], True);
+       }
+       if(sel) {
+               swap((void **)&dc.fg, (void **)&dc.bg);
+               dc.x += dc.w;
+               dc.w = textw(sel->name) + dc.font.height;
+               drawtext(sel->name, True);
+               swap((void **)&dc.fg, (void **)&dc.bg);
+       }
+       dc.w = textw(stext) + dc.font.height;
+       dc.x = bx + bw - dc.w;
+       drawtext(stext, False);
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XFlush(dpy);
 }