aewl
diff wm.h @ 33:e90449e03167
new stuff (some warning elimination)
author | Anselm R. Garbe <garbeam@wmii.de> |
---|---|
date | Thu, 13 Jul 2006 01:55:54 +0200 |
parents | 082c75b937b5 |
children | cd30cce52b78 |
line diff
1.1 --- a/wm.h Thu Jul 13 01:30:55 2006 +0200 1.2 +++ b/wm.h Thu Jul 13 01:55:54 2006 +0200 1.3 @@ -87,15 +87,6 @@ 1.4 extern Brush brush; 1.5 extern Client *clients, *stack; 1.6 1.7 -/* draw.c */ 1.8 -extern void draw(Display *dpy, Brush *b, Bool border, const char *text); 1.9 -extern void loadcolors(Display *dpy, int screen, Brush *b, 1.10 - const char *bg, const char *fg, const char *bo); 1.11 -extern void loadfont(Display *dpy, Fnt *font, const char *fontstr); 1.12 -extern unsigned int textnw(Fnt *font, char *text, unsigned int len); 1.13 -extern unsigned int textw(Fnt *font, char *text); 1.14 -extern unsigned int texth(Fnt *font); 1.15 - 1.16 /* client.c */ 1.17 extern void manage(Window w, XWindowAttributes *wa); 1.18 extern void unmanage(Client *c); 1.19 @@ -115,11 +106,20 @@ 1.20 extern void grid(void *aux); 1.21 extern void gravitate(Client *c, Bool invert); 1.22 1.23 +/* draw.c */ 1.24 +extern void draw(Brush *b, Bool border, const char *text); 1.25 +extern void loadcolors(int scr, Brush *b, 1.26 + const char *bg, const char *fg, const char *bo); 1.27 +extern void loadfont(Fnt *font, const char *fontstr); 1.28 +extern unsigned int textnw(Fnt *font, char *text, unsigned int len); 1.29 +extern unsigned int textw(Fnt *font, char *text); 1.30 +extern unsigned int texth(Fnt *font); 1.31 + 1.32 /* event.c */ 1.33 extern void discard_events(long even_mask); 1.34 1.35 -/* key.c */ 1.36 -extern void update_keys(); 1.37 +/* kb.c */ 1.38 +extern void update_keys(void); 1.39 extern void keypress(XEvent *e); 1.40 1.41 /* mouse.c */ 1.42 @@ -127,17 +127,16 @@ 1.43 extern void mmove(Client *c); 1.44 1.45 /* util.c */ 1.46 -extern void error(char *errstr, ...); 1.47 +extern void error(const char *errstr, ...); 1.48 extern void *emallocz(unsigned int size); 1.49 extern void *emalloc(unsigned int size); 1.50 extern void *erealloc(void *ptr, unsigned int size); 1.51 extern char *estrdup(const char *str); 1.52 -extern void spawn(Display *dpy, char *argv[]); 1.53 +extern void spawn(char *argv[]); 1.54 extern void swap(void **p1, void **p2); 1.55 1.56 /* wm.c */ 1.57 -extern int error_handler(Display *dpy, XErrorEvent *error); 1.58 +extern int error_handler(Display *dsply, XErrorEvent *e); 1.59 extern void send_message(Window w, Atom a, long value); 1.60 extern int win_proto(Window w); 1.61 -extern void run(void *aux); 1.62 extern void quit(void *aux);