before leaning things up

[dwm.git] / wm.h

diff --git a/wm.h b/wm.h
index 055ef62..8cc87f0 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -11,6 +11,9 @@
 
 #define WM_PROTOCOL_DELWIN 1
 
+typedef struct Client Client;
+typedef struct Key Key;
+
 /* atoms */
 enum { WMProtocols, WMDelete, WMLast };
 enum { NetSupported, NetWMName, NetLast };
@@ -18,23 +21,19 @@ enum { NetSupported, NetWMName, NetLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
 
-/* rects */
-enum { RFloat, RGrid, RLast };
-
-typedef struct Client Client;
-typedef struct Key Key;
-
 struct Client {
        char name[256];
-       char tag[256];
-       unsigned int border;
+       char *tags[TLast];
        int proto;
-       Bool fixedsize;
+       int x, y, w, h;
+       int tx, ty, tw, th;
+       int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+       int grav;
+       unsigned int border;
+       long flags; 
        Window win;
        Window trans;
        Window title;
-       XSizeHints size;
-       XRectangle r[RLast];
        Client *next;
        Client *snext;
 };
@@ -50,12 +49,12 @@ extern Display *dpy;
 extern Window root, barwin;
 extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
-extern XRectangle rect, barrect;
-extern Bool running, sel_screen, grid;
+extern Bool running, issel;
 extern void (*handler[LASTEvent]) (XEvent *);
+extern void (*arrange)(void *aux);
 
-extern int screen;
-extern char statustext[1024], tag[256];
+extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh;
+extern char stext[1024], *tags[TLast];
 
 extern Brush brush;
 extern Client *clients, *stack;
@@ -63,11 +62,6 @@ extern Client *clients, *stack;
 /* bar.c */
 extern void draw_bar();
 
-/* cmd.c */
-extern void run(void *aux);
-extern void quit(void *aux);
-extern void kill(void *aux);
-
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
 extern void unmanage(Client *c);
@@ -75,15 +69,32 @@ extern Client *getclient(Window w);
 extern void focus(Client *c);
 extern void update_name(Client *c);
 extern void draw_client(Client *c);
+extern void resize(Client *c);
+extern void update_size(Client *c);
+extern Client *gettitle(Window w);
+extern void raise(Client *c);
+extern void lower(Client *c);
+extern void kill(void *aux);
+extern void sel(void *aux);
+extern void max(void *aux);
+extern void floating(void *aux);
+extern void grid(void *aux);
+extern void gravitate(Client *c, Bool invert);
 
 /* event.c */
-extern unsigned int flush_events(long even_mask);
+extern void discard_events(long even_mask);
 
 /* key.c */
 extern void update_keys();
 extern void keypress(XEvent *e);
 
+/* mouse.c */
+extern void mresize(Client *c);
+extern void mmove(Client *c);
+
 /* 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);
+extern void run(void *aux);
+extern void quit(void *aux);