X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=wm.h;h=b5b07b5901a2cdaf625a707cc5609e22c7ca3975;hp=70f7ec77731555a0a54c109e2302c69b37a2ff5b;hb=dfd84f9bf3b9d949412a73bc62a43109b340d395;hpb=8a34fa50f75f4d6d8af234ac0c4f6d40b988d700

diff --git a/wm.h b/wm.h
index 70f7ec7..b5b07b5 100644
--- a/wm.h
+++ b/wm.h
@@ -3,56 +3,92 @@
  * See LICENSE file for license details.
  */
 
+#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
 
-/* NET atoms */
+typedef struct Client Client;
+typedef struct Key Key;
+
+/* 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 name[256], tag[256];
 	int proto;
+	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;
-	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, sel_screen, grid;
+extern void (*handler[LASTEvent]) (XEvent *);
+
+extern int screen, sx, sy, sw, sh, bx, by, bw, bh;
+extern char statustext[1024], tag[256];
+
+extern Brush brush;
+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);
+extern void sel(void *aux);
+
+/* 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);
+
+/* 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 int error_handler(Display *dpy, XErrorEvent *error);
+extern void send_message(Window w, Atom a, long value);
+extern int win_proto(Window w);