X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=wm.h;h=1e6f2149b01178f02b498ff10086c53447182558;hb=4641aa2925731ac180b08c80f57db176391ea4a9;hp=454f7bf901ec79b21d0f8a7dcc677d532a1b5dca;hpb=366d81e313e6dd4e9e6c61ed8dfca4b4b40ccde6;p=dwm.git

diff --git a/wm.h b/wm.h
index 454f7bf..1e6f214 100644
--- a/wm.h
+++ b/wm.h
@@ -9,30 +9,28 @@
 
 #include <X11/Xutil.h>
 
+#define WM_PROTOCOL_DELWIN 1
+
+typedef struct Client Client;
+typedef struct Key Key;
+
 /* atoms */
-enum { WMState, WMProtocols, WMDelete, WMLast };
+enum { WMProtocols, WMDelete, WMLast };
 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];
+	char name[256], tag[256];
 	int proto;
-	unsigned int border;
-	Bool fixedsize;
+	int x, y, w, h;
+	int tx, ty, tw, th;
+	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+	long flags; 
 	Window win;
 	Window trans;
 	Window title;
-	XSizeHints size;
-	XRectangle r[RLast];
 	Client *next;
 	Client *snext;
 };
@@ -40,37 +38,58 @@ struct Client {
 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 Atom wm_atom[WMLast], net_atom[NetLast];
 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 int screen, sel_screen;
-extern char *bartext, tag[256];
+extern int screen, sx, sy, sw, sh, bx, by, bw, bh;
+extern char statustext[1024], tag[256];
 
 extern Brush brush;
-extern Client *client;
+extern Client *clients, *stack;
 
 /* bar.c */
 extern void draw_bar();
 
-/* cmd.c */
-extern void run(char *arg);
-
 /* client.c */
-extern Client *create_client(Window w, XWindowAttributes *wa);
-extern void manage(Client *c);
+extern void manage(Window w, XWindowAttributes *wa);
+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);
+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);
+
+/* event.c */
+extern void discard_events(long even_mask);
+
+/* grid.c */
+extern void arrange();
 
 /* 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);