several changes, new stuff

[dwm.git] / wm.h

diff --git a/wm.h b/wm.h
index b9ba8f7..055ef62 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -42,8 +42,8 @@ struct Client {
 struct Key {
        unsigned long mod;
        KeySym keysym;
 struct Key {
        unsigned long mod;
        KeySym keysym;

-       void (*func)(char *arg);
-       char *arg;
+       void (*func)(void *aux);
+       void *aux;

 };
 
 extern Display *dpy;
 };
 
 extern Display *dpy;


@@ -55,7 +55,7 @@ extern Bool running, sel_screen, grid;
 extern void (*handler[LASTEvent]) (XEvent *);
 
 extern int screen;
 extern void (*handler[LASTEvent]) (XEvent *);
 
 extern int screen;

-extern char *bartext, tag[256];
+extern char statustext[1024], tag[256];

 
 extern Brush brush;
 extern Client *clients, *stack;
 
 extern Brush brush;
 extern Client *clients, *stack;


@@ -64,8 +64,9 @@ extern Client *clients, *stack;
 extern void draw_bar();
 
 /* cmd.c */
 extern void draw_bar();
 
 /* cmd.c */

-extern void run(char *arg);
-extern void quit(char *arg);
+extern void run(void *aux);
+extern void quit(void *aux);
+extern void kill(void *aux);

 
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
 
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);


@@ -73,6 +74,7 @@ extern void unmanage(Client *c);
 extern Client *getclient(Window w);
 extern void focus(Client *c);
 extern void update_name(Client *c);
 extern Client *getclient(Window w);
 extern void focus(Client *c);
 extern void update_name(Client *c);

+extern void draw_client(Client *c);

 
 /* event.c */
 extern unsigned int flush_events(long even_mask);
 
 /* event.c */
 extern unsigned int flush_events(long even_mask);