centralized/externalized configuration to config.h

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 0d37e99..f7bebb0 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -4,32 +4,16 @@
  */
 
 #include <X11/Xlib.h>
+#include CONFIG
 
-/********** 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)
 
 typedef union Arg Arg;
-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;
@@ -43,6 +27,9 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
+/* windowcorners */
+typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
+
 struct Fnt {
        int ascent;
        int descent;
@@ -66,32 +53,19 @@ struct Client {
        char *tags[TLast];
        int proto;
        int x, y, w, h;
-       int tx, ty, tw, th;
+       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;
 };
 
-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 *);
@@ -102,7 +76,6 @@ extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
-extern Key key[];
 extern Window root, barwin;
 
 /* client.c */
@@ -117,10 +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 resize(Client *c, Bool inc);
+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);
 
@@ -145,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);