X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.h;h=a410f4e71cc03124c3b43c79bd8d2e41268251c1;hb=11737233a7ce6bc656bc7bc061c68eeda824ee9b;hp=6b907a9a721c5c35f10e8f58c91e900512fd67cc;hpb=58f2fe3f6af3d6f8c925125c721a2d1800d750dc;p=dwm.git

diff --git a/dwm.h b/dwm.h
index 6b907a9..a410f4e 100644
--- a/dwm.h
+++ b/dwm.h
@@ -11,6 +11,7 @@
 #define BGCOLOR				"#0a2c2d"
 #define FGCOLOR				"#ddeeee"
 #define BORDERCOLOR			"#176164"
+#define MODKEY				 Mod1Mask /* Mod4Mask */
 /*
 #define BGCOLOR				"#666699"
 #define FGCOLOR				"#eeeeee"
@@ -25,11 +26,10 @@ enum { Tscratch, Tdev, Twww, Twork, TLast };
 /********** CUSTOMIZE **********/
 
 typedef union Arg Arg;
-typedef struct DC DC;
 typedef struct Client Client;
+typedef enum Corner Corner;
+typedef struct DC DC;
 typedef struct Fnt Fnt;
-typedef struct Key Key;
-typedef struct Rule Rule;
 
 union Arg {
 	const char **argv;
@@ -43,6 +43,8 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
+enum Corner { TopLeft, TopRight, BotLeft, BotRight };
+
 struct Fnt {
 	int ascent;
 	int descent;
@@ -65,10 +67,8 @@ 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;
@@ -80,20 +80,6 @@ struct Client {
 	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 int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern void (*handler[LASTEvent])(XEvent *);
@@ -104,7 +90,6 @@ extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
-extern Key key[];
 extern Window root, barwin;
 
 /* client.c */
@@ -121,8 +106,7 @@ 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);
-extern void setgeom(Client *c);
+extern void resize(Client *c, Bool inc, Corner sticky);
 extern void setsize(Client *c);
 extern void settitle(Client *c);
 extern void unmanage(Client *c);