X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=9d2d959bf8092089a4162727934558068f6dae47;hb=9833610356f7ce033589680fddf87000e5788774;hp=a6a04cabdb17630a204fae803a02956e92b89947;hpb=cd8d8e120857329800e93e22572e35560d1b0e80;p=dwm.git

diff --git a/dwm.h b/dwm.h
index a6a04ca..9d2d959 100644
--- a/dwm.h
+++ b/dwm.h
@@ -3,38 +3,18 @@
  * See LICENSE file for license details.
  */
 
+#include "config.h"
 #include <X11/Xlib.h>
 
-/* CUSTOMIZE */
+/* mask shorthands, used in event.c and client.c */
+#define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
+#define PROTODELWIN		1
 
-#define FONT			"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR			"#0a2c2d"
-#define FGCOLOR			"#ddeeee"
-#define BORDERCOLOR		"#176164"
-#define MODKEY			Mod1Mask /* Mod4Mask */
-/*
-#define BGCOLOR			"#666699"
-#define FGCOLOR			"#eeeeee"
-#define BORDERCOLOR		"#9999CC"
-*/
-#define MASTERW			52 /* percent */
-#define WM_PROTOCOL_DELWIN	1
-
-/* tags */
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
-
-/* END CUSTOMIZE */
-
-typedef union Arg Arg;
-typedef struct Client Client;
-typedef enum Corner Corner;
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-union Arg {
-	const char **argv;
+typedef union {
+	const char *cmd;
 	int i;
-};
+} Arg;
 
 /* atoms */
 enum { NetSupported, NetWMName, NetLast };
@@ -43,17 +23,18 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-enum Corner { TopLeft, TopRight, BotLeft, BotRight };
+/* 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;
@@ -61,32 +42,35 @@ struct DC { /* draw context */
 	Drawable drawable;
 	Fnt font;
 	GC gc;
-};
+} DC;
 
+typedef struct Client Client;
 struct Client {
 	char name[256];
-	char *tags[TLast];
 	int proto;
 	int x, y, w, h;
 	int tx, ty, tw, th; /* title */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
-	unsigned int border;
 	long flags; 
+	unsigned int border;
 	Bool isfloat;
 	Bool ismax;
+	Bool *tags;
 	Client *next;
 	Client *prev;
 	Window win;
-	Window title;
+	Window twin;
 };
 
-extern char *tags[TLast], stext[1024];
-extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern const char *tags[];
+extern char stext[1024];
+extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern unsigned int ntags, numlockmask;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running, issel;
+extern Bool running, issel, *seltag;
 extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
@@ -96,21 +80,16 @@ 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);
-extern void higher(Client *c);
 extern void killclient(Arg *arg);
-extern void lower(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
 extern void resize(Client *c, Bool sizehints, Corner sticky);
 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();
@@ -118,10 +97,11 @@ extern void drawstatus();
 extern void drawtitle(Client *c);
 extern unsigned long getcolor(const char *colstr);
 extern void setfont(const char *fontstr);
-extern unsigned int textw(char *text);
+extern unsigned int textw(const char *text);
 
 /* event.c */
 extern void grabkeys();
+extern void procevent();
 
 /* main.c */
 extern int getproto(Window w);
@@ -130,17 +110,27 @@ extern void sendevent(Window w, Atom a, long value);
 extern int xerror(Display *dsply, XErrorEvent *ee);
 
 /* tag.c */
-extern void appendtag(Arg *arg);
-extern void dofloat(Arg *arg);
-extern void dotile(Arg *arg);
-extern Client *getnext(Client *c, unsigned int t);
+extern void initrregs();
+extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
-extern void replacetag(Arg *arg);
 extern void settags(Client *c);
-extern void togglemode(Arg *arg);
-extern void view(Arg *arg);
+extern void tag(Arg *arg);
+extern void toggletag(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 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 zoom(Arg *arg);