X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.arg.h;h=11e7eee341dacecaedf91793a9aba540b6bd8192;hb=f196b71e4d543e7d8c4fd6398cf1bedd3dafc024;hp=67069a6c4dcb03e6ef9dcd9f69c71d979eb720c0;hpb=cdbc84b9a87c427b3d0a202475b0f5aae315fb90;p=dwm.git

diff --git a/config.arg.h b/config.arg.h
index 67069a6..11e7eee 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -2,16 +2,7 @@
  * See LICENSE file for license details.
  */
 
-#define TAGS \
-const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
-
-#define LAYOUTS \
-static Layout layout[] = { \
-	/* symbol		function */ \
-	{ "[]=",		dotile }, /* first entry is default */ \
-	{ "><>",		dofloat }, \
-};
-
+/* appearance */
 #define BORDERPX		1
 #define FONT			"-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR		"#333"
@@ -20,13 +11,33 @@ static Layout layout[] = { \
 #define SELBORDERCOLOR		"#69c"
 #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 */ \
+	{ "><>",		versatile }, \
+};
 #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 */ \
@@ -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,	togglefloat,	{ 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	isfloat */ \
-	{ "Firefox",			"3",		False }, \
-	{ "Gimp",			NULL,		True }, \
-	{ "MPlayer",			NULL,		True }, \
-	{ "Acroread",			NULL,		True }, \
-};