cleaned up and commented the config.*.h

diff --git a/config.arg.h b/config.arg.h
index 423e935..11e7eee 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -2,6 +2,7 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

+/* appearance */

 #define BORDERPX               1
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#333"
 #define BORDERPX               1
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#333"


@@ -10,23 +11,33 @@
 #define SELBORDERCOLOR         "#69c"
 #define SELBGCOLOR             "#555"
 #define SELFGCOLOR             "#fff"
 #define SELBORDERCOLOR         "#69c"
 #define SELBGCOLOR             "#555"
 #define SELFGCOLOR             "#fff"

-
-#define MASTER                 600             /* per thousand */
-#define MODKEY                 Mod1Mask
-#define NMASTER                        1               /* clients in master area */
-#define SNAP                   40              /* pixel */

 #define TOPBAR                 True            /* False */
 
 #define TOPBAR                 True            /* False */
 

+/* behavior */
+#define SNAP                   40              /* pixel */

 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };

+#define RULES \
+static Rule rule[] = { \
+       /* class:instance:title regex   tags regex      isversatile */ \
+       { "Firefox",                    "3",            False }, \
+       { "Gimp",                       NULL,           True }, \
+       { "MPlayer",                    NULL,           True }, \
+       { "Acroread",                   NULL,           True }, \
+};

 
 

+/* layout(s) */

 #define LAYOUTS \
 static Layout layout[] = { \
        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                versatile }, \
 };
 #define LAYOUTS \
 static Layout layout[] = { \
        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                versatile }, \
 };

+#define MASTER                 600             /* per thousand */
+#define NMASTER                        1               /* clients in master area */

 
 

+/* key definitions */
+#define MODKEY                 Mod1Mask

 #define KEYS \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \
 #define KEYS \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \


@@ -86,12 +97,3 @@ static Key key[] = { \
        { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };
        { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };

-
-#define RULES \
-static Rule rule[] = { \
-       /* class:instance:title regex   tags regex      isversatile */ \
-       { "Firefox",                    "3",            False }, \
-       { "Gimp",                       NULL,           True }, \
-       { "MPlayer",                    NULL,           True }, \
-       { "Acroread",                   NULL,           True }, \
-};

diff --git a/config.default.h b/config.default.h
index b29d1a4..eb6933b 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -2,6 +2,7 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

+/* appearance */

 #define BORDERPX               1
 #define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#dddddd"
 #define BORDERPX               1
 #define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#dddddd"


@@ -10,23 +11,34 @@
 #define SELBORDERCOLOR         "#ff0000"
 #define SELBGCOLOR             "#006699"
 #define SELFGCOLOR             "#ffffff"
 #define SELBORDERCOLOR         "#ff0000"
 #define SELBGCOLOR             "#006699"
 #define SELFGCOLOR             "#ffffff"

-
-#define MASTER                 600             /* per thousand */
-#define MODKEY                 Mod1Mask
-#define NMASTER                        1               /* clients in master area */
-#define SNAP                   20              /* pixel */

 #define TOPBAR                 True            /* False */
 
 #define TOPBAR                 True            /* False */
 

+/* behavior */
+#define SNAP                   20              /* pixel */

 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };

+/* Query class:instance:title for regex matching info with following command:
+ * xprop | awk -F '"' '/^WM_CLASS/ { printf("%s:%s:",$4,$2) }; /^WM_NAME/ { printf("%s\n",$2) }' */
+#define RULES \
+static Rule rule[] = { \
+       /* class:instance:title regex   tags regex      isversatile */ \
+       { "Gimp",                       NULL,           True }, \
+       { "MPlayer",                    NULL,           True }, \
+       { "Acroread",                   NULL,           True }, \
+};

 
 

+/* layout(s) */

 #define LAYOUTS \
 #define LAYOUTS \

-Layout layout[] = { \
+static Layout layout[] = { \

        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                versatile }, \
 };
        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                versatile }, \
 };

+#define MASTER                 600             /* per thousand */
+#define NMASTER                        1               /* clients in master area */

 
 

+/* key definitions */
+#define MODKEY                 Mod1Mask

 #define KEYS \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \
 #define KEYS \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \


@@ -81,13 +93,3 @@ static Key key[] = { \
        { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };
        { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };

-
-/* Query class:instance:title for regex matching info with following command:
- * xprop | awk -F '"' '/^WM_CLASS/ { printf("%s:%s:",$4,$2) }; /^WM_NAME/ { printf("%s\n",$2) }' */
-#define RULES \
-static Rule rule[] = { \
-       /* class:instance:title regex   tags regex      isversatile */ \
-       { "Gimp",                       NULL,           True }, \
-       { "MPlayer",                    NULL,           True }, \
-       { "Acroread",                   NULL,           True }, \
-};

diff --git a/config.mk b/config.mk
index d3a6ffd..a41fe8e 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
 # dwm version

-VERSION = 3.6
+VERSION = 3.7

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system