implemented bar for dwm (I miss status text), I plan that status text is read from...

[dwm.git] / bar.c

diff --git a/bar.c b/bar.c
index f3a11b8..9914e56 100644 (file)
--- a/bar.c
+++ b/bar.c
@@ -3,28 +3,38 @@
  * See LICENSE file for license details.
  */
 
-#include "wm.h"
+#include "dwm.h"
 
 void
 draw_bar()
 {
-       brush.rect = barrect;
-       brush.rect.x = brush.rect.y = 0;
-       draw(dpy, &brush, False, NULL);
+       int i;
+       dc.x = dc.y = 0;
+       dc.w = bw;
+       drawtext(NULL, False);
 
-       if(stack) {
-               brush.rect.width = textwidth(&brush.font, stack->name) + labelheight(&brush.font);
-               swap((void **)&brush.fg, (void **)&brush.bg);
-               draw(dpy, &brush, False, stack->name);
-               swap((void **)&brush.fg, (void **)&brush.bg);
-               brush.rect.x += brush.rect.width;
+       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);
        }
-
-       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);
+       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);
 }