fixed several stuff (gridwm gets better and better)

[dwm.git] / wm.h

diff --git a/wm.h b/wm.h
index 038078f..9ea74fe 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -10,7 +10,6 @@
 #include <X11/Xutil.h>
 
 /* atoms */
-enum { WMState, WMProtocols, WMDelete, WMLast };
 enum { NetSupported, NetWMName, NetLast };
 
 /* cursor */
@@ -20,12 +19,11 @@ enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
 enum { RFloat, RGrid, RLast };
 
 typedef struct Client Client;
-typedef struct Tag Tag;
+typedef struct Key Key;
 
 struct Client {
-       Tag *tag;
        char name[256];
-       int proto;
+       char tag[256];
        unsigned int border;
        Bool fixedsize;
        Window win;
@@ -37,34 +35,42 @@ struct Client {
        Client *snext;
 };
 
-struct Tag {
-       char name[256];
-       Client *stack;
-       XRectangle r;
-       Tag *next;
-       Tag *cnext;
+struct Key {
+       unsigned long mod;
+       KeySym keysym;
+       void (*func)(char *arg);
+       char *arg;
 };
 
 extern Display *dpy;
 extern Window root, barwin;
-extern Atom wm_atom[WMLast], net_atom[NetLast];
+extern Atom net_atom[NetLast];
 extern Cursor cursor[CurLast];
 extern XRectangle rect, barrect;
 extern Bool running;
+extern Bool grid;
 extern void (*handler[LASTEvent]) (XEvent *);
 
 extern int screen, sel_screen;
-extern unsigned int lock_mask, numlock_mask;
-extern char *bartext, *shell;
+extern char *bartext, tag[256];
 
 extern Brush brush;
+extern Client *clients;
 
 /* bar.c */
 extern void draw_bar();
 
+/* cmd.c */
+extern void run(char *arg);
+extern void quit(char *arg);
+
 /* client.c */
 extern Client *create_client(Window w, XWindowAttributes *wa);
 extern void manage(Client *c);
+extern Client * getclient(Window w);
+
+/* key.c */
+extern void update_keys();
+extern void keypress(XEvent *e);
 
 /* wm.c */
-extern int win_proto(Window w);