X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.arg.h;h=84695e59ef3e381607f9b1d36427a5cc12636b9d;hb=0bdcf75e25c9886e44c72f59809bf526e6156b18;hp=7b54ca27db5103c2390973de7df3604c47a7d9fd;hpb=cee56d38632bbac08e7f59d58c7c7ab1370be329;p=dwm.git

diff --git a/config.arg.h b/config.arg.h
index 7b54ca2..84695e5 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -2,36 +2,47 @@
  * See LICENSE file for license details.
  */
 
+/* appearance */
+#define BORDERPX		1
+#define FONT			"-*-proggyclean-medium-r-*-*-13-*-*-*-*-*-*-*"
+#define NORMBORDERCOLOR		"#333"
+#define NORMBGCOLOR		"#222"
+#define NORMFGCOLOR		"#ccc"
+#define SELBORDERCOLOR		"#8c8"
+#define SELBGCOLOR		"#555"
+#define SELFGCOLOR		"#fff"
+#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 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 */ \
-	{ "><>",		swim }, \
+	{ "><>",		versatile }, \
 };
-
-#define BORDERPX		1
-#define FONT			"-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
-#define NORMBORDERCOLOR		"#333"
-#define NORMBGCOLOR		"#222"
-#define NORMFGCOLOR		"#ccc"
-#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 */
 
+/* key definitions */
+#define MODKEY			Mod1Mask
 #define KEYS \
 static Key key[] = { \
 	/* modifier			key		function	argument */ \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
-		{ .cmd = "exec uxterm -bg '#222' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" } }, \
+		{ .cmd = "exec urxvtcd -tr -bg '#222' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" } }, \
 	{ MODKEY,			XK_p,		spawn, \
 		{ .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
 			" | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' " \
@@ -63,8 +74,8 @@ static Key key[] = { \
 	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	{ .i = 7 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	{ .i = 8 } }, \
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
-	{ MODKEY,			XK_space,	togglelayout,	{ 0 } }, \
-	{ MODKEY|ShiftMask,		XK_space,	toggleswimming,	{ 0 } }, \
+	{ MODKEY,			XK_space,	setlayout,	{ .i = -1 } }, \
+	{ MODKEY|ShiftMask,		XK_space,	toggleversatile,{ 0 } }, \
 	{ MODKEY,			XK_0,		view,		{ .i = -1 } }, \
 	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
 	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
@@ -86,12 +97,3 @@ static Key key[] = { \
 	{ MODKEY|ControlMask,		XK_9,		toggleview,	{ .i = 8 } }, \
 	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
 };
-
-#define RULES \
-static Rule rule[] = { \
-	/* class:instance:title regex	tags regex	swimming */ \
-	{ "Firefox",			"3",		False }, \
-	{ "Gimp",			NULL,		True }, \
-	{ "MPlayer",			NULL,		True }, \
-	{ "Acroread",			NULL,		True }, \
-};