removed the CONFIG variable from config.mk, renamed config.h into config.default...

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 0b6b21f..68b307d 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -3,31 +3,13 @@
  * 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 MODKEY                 Mod1Mask /* Mod4Mask */
-/*
-#define BGCOLOR                        "#666699"
-#define FGCOLOR                        "#eeeeee"
-#define BORDERCOLOR            "#9999CC"
-*/
-#define MASTERW                        52 /* percent */
-#define WM_PROTOCOL_DELWIN     1
-
-/* tags */
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
-
-/* END CUSTOMIZE */
-
 /* mask shorthands, used in event.c and client.c */
-#define ButtonMask     (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask      (ButtonMask | PointerMotionMask)
+#define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
+#define PROTODELWIN            1
 
 typedef union Arg Arg;
 typedef struct Client Client;
@@ -75,8 +57,8 @@ struct Client {
        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;
        Client *next;