X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=wm.h;h=7e4843408349d766ca2bf7e26c09869fc8406a8f;hp=831c178402b2078fa184f78e2032b02cec34bbf1;hb=44f2e8b952264311887c3b51dc6a987af226062a;hpb=8b59083eb13c0712e04d9a5b6d7bf4af5913c442

diff --git a/wm.h b/wm.h
index 831c178..7e48434 100644
--- a/wm.h
+++ b/wm.h
@@ -19,7 +19,7 @@ enum { Tscratch, Tdev, Tirc, Twww, Twork, TLast };
 
 /********** CUSTOMIZE **********/
 
-typedef struct Brush Brush;
+typedef struct DC DC;
 typedef struct Client Client;
 typedef struct Fnt Fnt;
 typedef struct Key Key;
@@ -39,7 +39,7 @@ struct Fnt {
 	int height;
 };
 
-struct Brush {
+struct DC { /* draw context */
 	GC gc;
 	Drawable drawable;
 	int x, y, w, h;
@@ -79,23 +79,13 @@ extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
 extern Bool running, issel;
 extern void (*handler[LASTEvent]) (XEvent *);
-extern void (*arrange)(void *aux);
 
 extern int tsel, screen, sx, sy, sw, sh, th;
 extern char stext[1024], *tags[TLast];
 
-extern Brush brush;
+extern DC dc;
 extern Client *clients, *stack;
 
-/* draw.c */
-extern void draw(Display *dpy, Brush *b, Bool border, const char *text);
-extern void loadcolors(Display *dpy, int screen, Brush *b,
-		const char *bg, const char *fg, const char *bo);
-extern void loadfont(Display *dpy, Fnt *font, const char *fontstr);
-extern unsigned int textnw(Fnt *font, char *text, unsigned int len);
-extern unsigned int textw(Fnt *font, char *text);
-extern unsigned int texth(Fnt *font);
-
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
 extern void unmanage(Client *c);
@@ -111,33 +101,37 @@ extern void lower(Client *c);
 extern void ckill(void *aux);
 extern void sel(void *aux);
 extern void max(void *aux);
-extern void floating(void *aux);
-extern void grid(void *aux);
+extern void toggle(void *aux);
 extern void gravitate(Client *c, Bool invert);
 
+/* draw.c */
+extern void draw(Bool border, const char *text);
+extern void initcolors(const char *bg, const char *fg, const char *bo);
+extern void initfont(Fnt *font, const char *fontstr);
+extern unsigned int textnw(Fnt *font, char *text, unsigned int len);
+extern unsigned int textw(Fnt *font, char *text);
+extern unsigned int texth(Fnt *font);
+
 /* event.c */
 extern void discard_events(long even_mask);
 
-/* key.c */
-extern void update_keys();
+/* dev.c */
+extern void update_keys(void);
 extern void keypress(XEvent *e);
-
-/* mouse.c */
 extern void mresize(Client *c);
 extern void mmove(Client *c);
 
 /* util.c */
-extern void error(char *errstr, ...);
+extern void error(const char *errstr, ...);
 extern void *emallocz(unsigned int size);
 extern void *emalloc(unsigned int size);
 extern void *erealloc(void *ptr, unsigned int size);
 extern char *estrdup(const char *str);
-extern void spawn(Display *dpy, char *argv[]);
+extern void spawn(char *argv[]);
 extern void swap(void **p1, void **p2);
 
 /* wm.c */
-extern int error_handler(Display *dpy, XErrorEvent *error);
+extern int error_handler(Display *dsply, XErrorEvent *e);
 extern void send_message(Window w, Atom a, long value);
 extern int win_proto(Window w);
-extern void run(void *aux);
 extern void quit(void *aux);