X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=wm.h;h=8cc87f07c0392d08cfb5c0abeac062c3a6002ec1;hb=da2bbd371c522d63d737d43a127601a3fdbcb9d8;hp=3885cb52ca80cdfa314bbd7760e39d7f4237a19d;hpb=1076f2b6b3d3751d5d5db6fcb9ac8c247e04e893;p=dwm.git

diff --git a/wm.h b/wm.h
index 3885cb5..8cc87f0 100644
--- a/wm.h
+++ b/wm.h
@@ -3,55 +3,98 @@
  * See LICENSE file for license details.
  */
 
-#include <X11/Xlib.h>
+#include "config.h"
+#include "draw.h"
+#include "util.h"
+
 #include <X11/Xutil.h>
 
-/* WM atoms */
-enum { WMState, WMProtocols, WMDelete, WMLast };
+#define WM_PROTOCOL_DELWIN 1
+
+typedef struct Client Client;
+typedef struct Key Key;
 
-/* NET atoms */
+/* atoms */
+enum { WMProtocols, WMDelete, WMLast };
 enum { NetSupported, NetWMName, NetLast };
 
-/* Cursor */
+/* cursor */
 enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
 
-/* Rects */
-enum { RFloat, RGrid, RLast };
-
-typedef struct Client Client;
-typedef struct Tag Tag;
-
 struct Client {
-	Tag *tag;
 	char name[256];
+	char *tags[TLast];
 	int proto;
+	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;
-	GC gc;
-	XSizeHints size;
-	XRectangle r[RLast];
 	Client *next;
-	Client *tnext;
-	Client *tprev;
+	Client *snext;
 };
 
-struct Tag {
-	char name[256];
-	Client *clients;
-	Client *sel;
-	XRectangle r;
+struct Key {
+	unsigned long mod;
+	KeySym keysym;
+	void (*func)(void *aux);
+	void *aux;
 };
 
 extern Display *dpy;
-extern Window root;
-extern XRectangle rect;
-extern int screen, sel_screen;
-extern unsigned int kmask, numlock_mask;
-extern Atom wm_atom[WMLast];
-extern Atom net_atom[NetLast];
+extern Window root, barwin;
+extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
-extern Pixmap pmap;
+extern Bool running, issel;
+extern void (*handler[LASTEvent]) (XEvent *);
+extern void (*arrange)(void *aux);
+
+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;
+
+/* bar.c */
+extern void draw_bar();
+
+/* 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);
+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 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 void error(char *errstr, ...);
+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);