X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=e1df6bc5bec5528bfde76a06ccf03cbdd1630753;hb=26157e6973f240a9b5ee407b9d2d5eca9358844f;hp=bb941dc64ce0d6993a900ffd7be55f1523483f1b;hpb=ee31e38dc75832a66cb0fc01bcf2f419ac96a20b;p=dwm.git

diff --git a/dwm.h b/dwm.h
index bb941dc..e1df6bc 100644
--- a/dwm.h
+++ b/dwm.h
@@ -11,15 +11,10 @@
 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 #define PROTODELWIN		1
 
-typedef union Arg Arg;
-typedef struct Client Client;
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-union Arg {
+typedef union {
 	const char *cmd;
 	int i;
-};
+} Arg;
 
 /* atoms */
 enum { NetSupported, NetWMName, NetLast };
@@ -28,27 +23,31 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-/* windowcorners */
+/* color */
+enum { ColFG, ColBG, ColLast };
+
+/* window corners */
 typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 
-struct Fnt {
+typedef struct {
 	int ascent;
 	int descent;
 	int height;
 	XFontSet set;
 	XFontStruct *xfont;
-};
+} Fnt;
 
-struct DC { /* draw context */
+typedef struct { /* draw context */
 	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
+	unsigned long status[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
-};
+} DC;
 
+typedef struct Client Client;
 struct Client {
 	char name[256];
 	int proto;
@@ -57,24 +56,23 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
 	long flags; 
-	unsigned int border;
+	unsigned int border, weight;
 	Bool isfloat;
-	Bool ismax;
 	Bool *tags;
 	Client *next;
 	Client *prev;
 	Window win;
-	Window title;
+	Window twin;
 };
 
 extern const char *tags[];
 extern char stext[1024];
-extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
 extern unsigned int ntags, numlockmask;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running, issel, *seltag;
+extern Bool running, issel, maximized, *seltag;
 extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
@@ -84,8 +82,6 @@ extern Window root, barwin;
 /* client.c */
 extern void ban(Client *c);
 extern void focus(Client *c);
-extern void focusnext(Arg *arg);
-extern void focusprev(Arg *arg);
 extern Client *getclient(Window w);
 extern Client *getctitle(Window w);
 extern void gravitate(Client *c, Bool invert);
@@ -96,7 +92,6 @@ extern void setsize(Client *c);
 extern void settitle(Client *c);
 extern void togglemax(Arg *arg);
 extern void unmanage(Client *c);
-extern void zoom(Arg *arg);
 
 /* draw.c */
 extern void drawall();
@@ -108,6 +103,7 @@ extern unsigned int textw(const char *text);
 
 /* event.c */
 extern void grabkeys();
+extern void procevent();
 
 /* main.c */
 extern int getproto(Window w);
@@ -116,22 +112,29 @@ extern void sendevent(Window w, Atom a, long value);
 extern int xerror(Display *dsply, XErrorEvent *ee);
 
 /* tag.c */
-extern void dofloat(Arg *arg);
-extern void dotile(Arg *arg);
 extern void initrregs();
-extern Bool isvisible(Client *c);
 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
-extern void restack();
 extern void settags(Client *c);
 extern void tag(Arg *arg);
-extern void togglemode(Arg *arg);
 extern void toggletag(Arg *arg);
-extern void toggleview(Arg *arg);
-extern void view(Arg *arg);
 
 /* util.c */
 extern void *emallocz(unsigned int size);
 extern void eprint(const char *errstr, ...);
 extern void *erealloc(void *ptr, unsigned int size);
 extern void spawn(Arg *arg);
+
+/* view.c */
+extern void detach(Client *c);
+extern void dofloat(Arg *arg);
+extern void dotile(Arg *arg);
+extern void focusnext(Arg *arg);
+extern void focusprev(Arg *arg);
+extern Bool isvisible(Client *c);
+extern void restack();
+extern void togglemode(Arg *arg);
+extern void toggleview(Arg *arg);
+extern void view(Arg *arg);
+extern void viewall(Arg *arg);
+extern void zoom(Arg *arg);