diff -r b72b7086c385 -r f005d46462e8 dwm.h
--- a/dwm.h	Fri Jul 14 08:45:30 2006 +0200
+++ b/dwm.h	Fri Jul 14 10:07:38 2006 +0200
@@ -88,19 +88,22 @@
 };
 
 extern Display *dpy;
-extern Window root;
+extern Window root, barwin;
 extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
 extern Bool running, issel;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 
-extern int tsel, screen, sx, sy, sw, sh, mw, th;
-extern char *tags[TLast];
+extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern char *tags[TLast], stext[1024];
 
 extern DC dc;
 extern Client *clients, *sel;
 
+/* bar.c */
+extern void draw_bar();
+
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
 extern void unmanage(Client *c);
@@ -126,7 +129,7 @@
 extern void gravitate(Client *c, Bool invert);
 
 /* draw.c */
-extern void draw(Bool border, const char *text);
+extern void drawtext(const char *text, Bool border);
 extern unsigned long initcolor(const char *colstr);
 extern void initfont(const char *fontstr);
 extern unsigned int textnw(char *text, unsigned int len);