centralized/externalized configuration to config.h

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 9670c68..f7bebb0 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -4,30 +4,14 @@
  */
 
 #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 */
-#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)
 
 typedef union Arg Arg;
 typedef struct Client Client;
-typedef enum Corner Corner;
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
@@ -43,7 +27,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;
@@ -67,17 +52,16 @@ 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; 
        Bool isfloat;
+       Bool ismax;
        Client *next;
-       Client *revert;
+       Client *prev;
        Window win;
        Window title;
 };
@@ -106,12 +90,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);
 
@@ -136,11 +118,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);