simplified several portions of code through replacing rect structs with x,y,h,w count...

[dwm.git] / wm.h

diff --git a/wm.h b/wm.h
index 3885cb5..b5b07b5 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -3,55 +3,92 @@
  * 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 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 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);