1.1 --- a/wm.h	Mon Jul 10 19:47:35 2006 +0200
     1.2 +++ b/wm.h	Mon Jul 10 22:16:48 2006 +0200
     1.3 @@ -9,16 +9,14 @@
     1.4  
     1.5  #include <X11/Xutil.h>
     1.6  
     1.7 -/* WM atoms */
     1.8 +/* atoms */
     1.9  enum { WMState, WMProtocols, WMDelete, WMLast };
    1.10 -
    1.11 -/* NET atoms */
    1.12  enum { NetSupported, NetWMName, NetLast };
    1.13  
    1.14 -/* Cursor */
    1.15 +/* cursor */
    1.16  enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
    1.17  
    1.18 -/* Rects */
    1.19 +/* rects */
    1.20  enum { RFloat, RGrid, RLast };
    1.21  
    1.22  typedef struct Client Client;
    1.23 @@ -28,35 +26,45 @@
    1.24  	Tag *tag;
    1.25  	char name[256];
    1.26  	int proto;
    1.27 +	unsigned int border;
    1.28 +	Bool fixedsize;
    1.29  	Window win;
    1.30  	Window trans;
    1.31  	Window title;
    1.32 -	GC gc;
    1.33  	XSizeHints size;
    1.34  	XRectangle r[RLast];
    1.35  	Client *next;
    1.36 -	Client *tnext;
    1.37 -	Client *tprev;
    1.38 +	Client *snext;
    1.39  };
    1.40  
    1.41  struct Tag {
    1.42  	char name[256];
    1.43 -	Client *clients;
    1.44 -	Client *sel;
    1.45 +	Client *stack;
    1.46  	XRectangle r;
    1.47 +	Tag *next;
    1.48 +	Tag *cnext;
    1.49  };
    1.50  
    1.51  extern Display *dpy;
    1.52 -extern Window root;
    1.53 -extern XRectangle rect;
    1.54 -extern Atom wm_atom[WMLast];
    1.55 -extern Atom net_atom[NetLast];
    1.56 +extern Window root, barwin;
    1.57 +extern Atom wm_atom[WMLast], net_atom[NetLast];
    1.58  extern Cursor cursor[CurLast];
    1.59 -extern Pixmap pmap;
    1.60 +extern XRectangle rect, barrect;
    1.61 +extern Bool running;
    1.62 +extern void (*handler[LASTEvent]) (XEvent *);
    1.63  
    1.64  extern int screen, sel_screen;
    1.65 -extern unsigned int kmask, numlock_mask;
    1.66 +extern unsigned int lock_mask, numlock_mask;
    1.67 +extern char *bartext, *shell;
    1.68  
    1.69  extern Brush brush;
    1.70  
    1.71 +/* bar.c */
    1.72 +extern void draw_bar();
    1.73 +
    1.74 +/* client.c */
    1.75 +extern Client *create_client(Window w, XWindowAttributes *wa);
    1.76 +extern void manage(Client *c);
    1.77 +
    1.78  /* wm.c */
    1.79 +extern int win_proto(Window w);