several changes, new stuff

[dwm.git] / wm.h

diff --git a/wm.h b/wm.h
index 68c30da..055ef62 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -9,7 +9,10 @@
 
 #include <X11/Xutil.h>
 
 
 #include <X11/Xutil.h>
 

+#define WM_PROTOCOL_DELWIN 1
+

 /* atoms */
 /* atoms */

+enum { WMProtocols, WMDelete, WMLast };

 enum { NetSupported, NetWMName, NetLast };
 
 /* cursor */
 enum { NetSupported, NetWMName, NetLast };
 
 /* cursor */


@@ -25,6 +28,7 @@ struct Client {
        char name[256];
        char tag[256];
        unsigned int border;
        char name[256];
        char tag[256];
        unsigned int border;

+       int proto;

        Bool fixedsize;
        Window win;
        Window trans;
        Bool fixedsize;
        Window win;
        Window trans;


@@ -38,36 +42,42 @@ 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 Window root, barwin;
 };
 
 extern Display *dpy;
 extern Window root, barwin;

-extern Atom net_atom[NetLast];
+extern Atom wm_atom[WMLast], net_atom[NetLast];

 extern Cursor cursor[CurLast];
 extern XRectangle rect, barrect;
 extern Cursor cursor[CurLast];
 extern XRectangle rect, barrect;

-extern Bool running;
-extern Bool grid;
+extern Bool running, sel_screen, grid;

 extern void (*handler[LASTEvent]) (XEvent *);
 
 extern void (*handler[LASTEvent]) (XEvent *);
 

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

 
 extern Brush brush;
 
 extern Brush brush;

-extern Client *clients;
+extern Client *clients, *stack;

 
 /* bar.c */
 extern void draw_bar();
 
 /* cmd.c */
 
 /* bar.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);

-void unmanage(Client *c);
-extern Client * getclient(Window w);
+extern void unmanage(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);

 
 /* key.c */
 extern void update_keys();
 
 /* key.c */
 extern void update_keys();


@@ -75,3 +85,5 @@ extern void keypress(XEvent *e);
 
 /* wm.c */
 extern int error_handler(Display *dpy, XErrorEvent *error);
 
 /* wm.c */
 extern int error_handler(Display *dpy, XErrorEvent *error);

+extern void send_message(Window w, Atom a, long value);
+extern int win_proto(Window w);