X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwm.h;h=9b34210f596734053736ca090841ee309269513c;hb=d9a6a3b5d2e0152d5746723fcd482994602f292e;hp=1529d178418475f1830ab5d444373e6a03ea1172;hpb=4688ad181da14be36e034918580ec0ce5968ffdb;p=dwm.git

diff --git a/dwm.h b/dwm.h
index 1529d17..9b34210 100644
--- a/dwm.h
+++ b/dwm.h
@@ -4,30 +4,15 @@
  */
 
 #include <X11/Xlib.h>
+#include CONFIG
 
-/********** CUSTOMIZE **********/
-
-#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 */
+/* mask shorthands, used in event.c and client.c */
+#define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 #define WM_PROTOCOL_DELWIN	1
 
-/* tags */
-enum { Tscratch, Tdev, Twww, Twork, TLast };
-
-/********** CUSTOMIZE **********/
-
 typedef union Arg Arg;
 typedef struct Client Client;
-typedef enum Corner Corner;
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
@@ -43,7 +28,8 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-enum Corner { TopLeft, TopRight, BotLeft, BotRight };
+/* windowcorners */
+typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 
 struct Fnt {
 	int ascent;
@@ -76,7 +62,7 @@ struct Client {
 	Bool isfloat;
 	Bool ismax;
 	Client *next;
-	Client *revert;
+	Client *prev;
 	Window win;
 	Window title;
 };
@@ -105,8 +91,7 @@ extern void higher(Client *c);
 extern void killclient(Arg *arg);
 extern void lower(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
-extern void pop(Client *c);
-extern void resize(Client *c, Bool inc, Corner sticky);
+extern void resize(Client *c, Bool sizehints, Corner sticky);
 extern void setsize(Client *c);
 extern void settitle(Client *c);
 extern void togglemax(Arg *arg);
@@ -134,12 +119,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);