--- a/wm.h	Mon Jul 10 19:47:35 2006 +0200
+++ b/wm.h	Mon Jul 10 22:16:48 2006 +0200
@@ -9,16 +9,14 @@
 
 #include <X11/Xutil.h>
 
-/* WM atoms */
+/* atoms */
 enum { WMState, WMProtocols, WMDelete, WMLast };
-
-/* NET atoms */
 enum { NetSupported, NetWMName, NetLast };
 
-/* Cursor */
+/* cursor */
 enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
 
-/* Rects */
+/* rects */
 enum { RFloat, RGrid, RLast };
 
 typedef struct Client Client;
@@ -28,35 +26,45 @@
 	Tag *tag;
 	char name[256];
 	int proto;
+	unsigned int border;
+	Bool fixedsize;
 	Window win;
 	Window trans;
 	Window title;
-	GC gc;
 	XSizeHints size;
 	XRectangle r[RLast];
 	Client *next;
-	Client *tnext;
-	Client *tprev;
+	Client *snext;
 };
 
 struct Tag {
 	char name[256];
-	Client *clients;
-	Client *sel;
+	Client *stack;
 	XRectangle r;
+	Tag *next;
+	Tag *cnext;
 };
 
 extern Display *dpy;
-extern Window root;
-extern XRectangle rect;
-extern Atom wm_atom[WMLast];
-extern Atom net_atom[NetLast];
+extern Window root, barwin;
+extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
-extern Pixmap pmap;
+extern XRectangle rect, barrect;
+extern Bool running;
+extern void (*handler[LASTEvent]) (XEvent *);
 
 extern int screen, sel_screen;
-extern unsigned int kmask, numlock_mask;
+extern unsigned int lock_mask, numlock_mask;
+extern char *bartext, *shell;
 
 extern Brush brush;
 
+/* bar.c */
+extern void draw_bar();
+
+/* client.c */
+extern Client *create_client(Window w, XWindowAttributes *wa);
+extern void manage(Client *c);
+
 /* wm.c */
+extern int win_proto(Window w);