1.1 --- a/dwm.h	Mon Jul 17 08:37:37 2006 +0200
     1.2 +++ b/dwm.h	Mon Jul 17 09:12:29 2006 +0200
     1.3 @@ -37,28 +37,28 @@
     1.4  };
     1.5  
     1.6  /* atoms */
     1.7 +enum { NetSupported, NetWMName, NetLast };
     1.8  enum { WMProtocols, WMDelete, WMLast };
     1.9 -enum { NetSupported, NetWMName, NetLast };
    1.10  
    1.11  /* cursor */
    1.12 -enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
    1.13 +enum { CurNormal, CurResize, CurMove, CurLast };
    1.14  
    1.15  struct Fnt {
    1.16 -	XFontStruct *xfont;
    1.17 -	XFontSet set;
    1.18  	int ascent;
    1.19  	int descent;
    1.20  	int height;
    1.21 +	XFontSet set;
    1.22 +	XFontStruct *xfont;
    1.23  };
    1.24  
    1.25  struct DC { /* draw context */
    1.26 -	GC gc;
    1.27 -	Drawable drawable;
    1.28  	int x, y, w, h;
    1.29 -	Fnt font;
    1.30  	unsigned long bg;
    1.31  	unsigned long fg;
    1.32  	unsigned long border;
    1.33 +	Drawable drawable;
    1.34 +	Fnt font;
    1.35 +	GC gc;
    1.36  };
    1.37  
    1.38  struct Client {
    1.39 @@ -72,10 +72,10 @@
    1.40  	unsigned int border;
    1.41  	long flags; 
    1.42  	Bool isfloat;
    1.43 +	Client *next;
    1.44 +	Client *revert;
    1.45  	Window win;
    1.46  	Window title;
    1.47 -	Client *next;
    1.48 -	Client *revert;
    1.49  };
    1.50  
    1.51  struct Rule {
    1.52 @@ -92,20 +92,18 @@
    1.53  	Arg arg;
    1.54  };
    1.55  
    1.56 -extern Display *dpy;
    1.57 -extern Window root, barwin;
    1.58 -extern Atom wmatom[WMLast], netatom[NetLast];
    1.59 -extern Cursor cursor[CurLast];
    1.60 -extern Bool running, issel;
    1.61 +extern char *tags[TLast], stext[1024];
    1.62 +extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
    1.63  extern void (*handler[LASTEvent])(XEvent *);
    1.64  extern void (*arrange)(Arg *);
    1.65 +extern Atom wmatom[WMLast], netatom[NetLast];
    1.66 +extern Bool running, issel;
    1.67 +extern Client *clients, *sel;
    1.68 +extern Cursor cursor[CurLast];
    1.69 +extern DC dc;
    1.70 +extern Display *dpy;
    1.71  extern Key key[];
    1.72 -
    1.73 -extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
    1.74 -extern char *tags[TLast], stext[1024];
    1.75 -
    1.76 -extern DC dc;
    1.77 -extern Client *clients, *sel;
    1.78 +extern Window root, barwin;
    1.79  
    1.80  /* client.c */
    1.81  extern void ban(Client *c);