1.1 --- a/wm.h	Thu Jul 13 01:55:54 2006 +0200
     1.2 +++ b/wm.h	Thu Jul 13 09:32:22 2006 +0200
     1.3 @@ -19,7 +19,7 @@
     1.4  
     1.5  /********** CUSTOMIZE **********/
     1.6  
     1.7 -typedef struct Brush Brush;
     1.8 +typedef struct DC DC;
     1.9  typedef struct Client Client;
    1.10  typedef struct Fnt Fnt;
    1.11  typedef struct Key Key;
    1.12 @@ -39,7 +39,7 @@
    1.13  	int height;
    1.14  };
    1.15  
    1.16 -struct Brush {
    1.17 +struct DC { /* draw context */
    1.18  	GC gc;
    1.19  	Drawable drawable;
    1.20  	int x, y, w, h;
    1.21 @@ -79,12 +79,11 @@
    1.22  extern Cursor cursor[CurLast];
    1.23  extern Bool running, issel;
    1.24  extern void (*handler[LASTEvent]) (XEvent *);
    1.25 -extern void (*arrange)(void *aux);
    1.26  
    1.27  extern int tsel, screen, sx, sy, sw, sh, th;
    1.28  extern char stext[1024], *tags[TLast];
    1.29  
    1.30 -extern Brush brush;
    1.31 +extern DC dc;
    1.32  extern Client *clients, *stack;
    1.33  
    1.34  /* client.c */
    1.35 @@ -102,15 +101,13 @@
    1.36  extern void ckill(void *aux);
    1.37  extern void sel(void *aux);
    1.38  extern void max(void *aux);
    1.39 -extern void floating(void *aux);
    1.40 -extern void grid(void *aux);
    1.41 +extern void toggle(void *aux);
    1.42  extern void gravitate(Client *c, Bool invert);
    1.43  
    1.44  /* draw.c */
    1.45 -extern void draw(Brush *b, Bool border, const char *text);
    1.46 -extern void loadcolors(int scr, Brush *b,
    1.47 -		const char *bg, const char *fg, const char *bo);
    1.48 -extern void loadfont(Fnt *font, const char *fontstr);
    1.49 +extern void draw(Bool border, const char *text);
    1.50 +extern void initcolors(const char *bg, const char *fg, const char *bo);
    1.51 +extern void initfont(Fnt *font, const char *fontstr);
    1.52  extern unsigned int textnw(Fnt *font, char *text, unsigned int len);
    1.53  extern unsigned int textw(Fnt *font, char *text);
    1.54  extern unsigned int texth(Fnt *font);