X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=c44da292561800611c446b04e62faf4fc9f05dc0;hb=dc5c070c44d9af434405c8d6538abd06299d3298;hp=d3138be7411e102e8155dcbf69d1aa3d38d9e66b;hpb=c53980cddcee8afd13ea793134ed3ddf5dbef0e3;p=dwm.git

diff --git a/dwm.h b/dwm.h
index d3138be..c44da29 100644
--- a/dwm.h
+++ b/dwm.h
@@ -3,34 +3,18 @@
  * See LICENSE file for license details.
  */
 
+#include "config.h"
 #include <X11/Xlib.h>
 
-/********** CUSTOMIZE **********/
-
-#define FONT				"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR				"#0a2c2d"
-#define FGCOLOR				"#ddeeee"
-#define BORDERCOLOR			"#176164"
-/*
-#define BGCOLOR				"#666699"
-#define FGCOLOR				"#eeeeee"
-#define BORDERCOLOR			"#9999CC"
-*/
-#define MASTERW				52 /* percent */
-#define WM_PROTOCOL_DELWIN	1
-
-/* tags */
-enum { Tscratch, Tdev, Twww, Twork, TLast };
-
-/********** CUSTOMIZE **********/
+/* mask shorthands, used in event.c and client.c */
+#define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
+#define PROTODELWIN		1
 
 typedef union Arg Arg;
-typedef enum Corner Corner;
-typedef struct DC DC;
 typedef struct Client Client;
+typedef struct DC DC;
 typedef struct Fnt Fnt;
-typedef struct Key Key;
-typedef struct Rule Rule;
 
 union Arg {
 	const char **argv;
@@ -44,7 +28,8 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-enum Corner { TopLeft, TopRight, BottomLeft, BottomRight };
+/* windowcorners */
+typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 
 struct Fnt {
 	int ascent;
@@ -66,38 +51,24 @@ struct DC { /* draw context */
 
 struct Client {
 	char name[256];
-	char *tags[TLast];
 	int proto;
-	int *x, *y, *w, *h; /* current geom */
-	int bx, by, bw, bh; /* title bar */
-	int fx, fy, fw, fh; /* floating geom */
-	int tx, ty, tw, th; /* tiled geom */
+	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[TLast];
 	Client *next;
-	Client *revert;
+	Client *prev;
 	Window win;
 	Window title;
 };
 
-struct Rule {
-	const char *class;
-	const char *instance;
-	char *tags[TLast];
-	Bool isfloat;
-};
-
-struct Key {
-	unsigned long mod;
-	KeySym keysym;
-	void (*func)(Arg *arg);
-	Arg arg;
-};
-
-extern char *tags[TLast], stext[1024];
+extern const char *tags[TLast];
+extern char stext[1024];
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
@@ -107,7 +78,6 @@ extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
-extern Key key[];
 extern Window root, barwin;
 
 /* client.c */
@@ -122,12 +92,10 @@ extern void higher(Client *c);
 extern void killclient(Arg *arg);
 extern void lower(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
-extern void maximize(Arg *arg);
-extern void pop(Client *c);
-extern void resize(Client *c, Bool inc, Corner sticky);
-extern void setgeom(Client *c);
+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);
 
@@ -137,7 +105,7 @@ 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();
@@ -152,11 +120,14 @@ extern int xerror(Display *dsply, XErrorEvent *ee);
 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 heretag(Arg *arg);
+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 viewnext(Arg *arg);
+extern void viewprev(Arg *arg);
 
 /* util.c */
 extern void *emallocz(unsigned int size);