#include "wm.h"
-static const char *status[] = {
- "sh", "-c", "echo -n `date` `uptime | sed 's/.*://; s/,//g'`"
- " `acpi | awk '{print $4}' | sed 's/,//'`", 0 \
-};
-
void
draw_bar()
{
- static char buf[1024];
-
- buf[0] = 0;
- pipe_spawn(buf, sizeof(buf), dpy, (char **)status);
+ brush.x = brush.y = 0;
+ brush.w = bw;
+ brush.h = bh;
+ draw(dpy, &brush, False, NULL);
- brush.rect = barrect;
- brush.rect.x = brush.rect.y = 0;
- draw(dpy, &brush, False, buf);
+ if(stack) {
+ brush.w = textw(&brush.font, stack->name) + bh;
+ swap((void **)&brush.fg, (void **)&brush.bg);
+ draw(dpy, &brush, True, stack->name);
+ swap((void **)&brush.fg, (void **)&brush.bg);
+ brush.x += brush.w;
+ }
- XCopyArea(dpy, brush.drawable, barwin, brush.gc, 0, 0, barrect.width,
- barrect.height, 0, 0);
+ brush.w = textw(&brush.font, statustext) + bh;
+ brush.x = bx + bw - brush.w;
+ draw(dpy, &brush, False, statustext);
+ XCopyArea(dpy, brush.drawable, barwin, brush.gc, 0, 0, bw, bh, 0, 0);
XFlush(dpy);
}