replaced Arg union with const char *arg, seems cleaner to me, even if we need atoi() in some places

1 files changed, 51 insertions, 51 deletions

diff --git a/config.default.h b/config.default.h
index 98b847fb..6db35f28 100644
--- a/config.default.h
+++ b/config.default.h
@@ -42,55 +42,55 @@ static Layout layout[] = { \
 #define KEYS \
 static Key key[] = { \
 	/* modifier			key		function	argument */ \
-	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
-	{ MODKEY,			XK_space,	setlayout,	{ .i = -1 } }, \
-	{ MODKEY,			XK_d,		incnmaster,	{ .i = -1 } }, \
-	{ MODKEY,			XK_i,		incnmaster,	{ .i = 1 } }, \
-	{ MODKEY,			XK_h,		incmasterw,	{ .i = -15 } }, \
-	{ MODKEY,			XK_l,		incmasterw,	{ .i = 15 } }, \
-	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
-	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
-	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
-	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY|ShiftMask,		XK_space,	toggleversatile,{ 0 } }, \
-	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
-	{ MODKEY,			XK_0,		view,		{ .i = -1 } }, \
-	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
-	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
-	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
-	{ MODKEY,			XK_4,		view,		{ .i = 3 } }, \
-	{ MODKEY,			XK_5,		view,		{ .i = 4 } }, \
-	{ MODKEY,			XK_6,		view,		{ .i = 5 } }, \
-	{ MODKEY,			XK_7,		view,		{ .i = 6 } }, \
-	{ MODKEY,			XK_8,		view,		{ .i = 7 } }, \
-	{ MODKEY,			XK_9,		view,		{ .i = 8 } }, \
-	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
-	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 3 } }, \
-	{ MODKEY|ControlMask,		XK_5,		toggleview,	{ .i = 4 } }, \
-	{ MODKEY|ControlMask,		XK_6,		toggleview,	{ .i = 5 } }, \
-	{ MODKEY|ControlMask,		XK_7,		toggleview,	{ .i = 6 } }, \
-	{ MODKEY|ControlMask,		XK_8,		toggleview,	{ .i = 7 } }, \
-	{ MODKEY|ControlMask,		XK_9,		toggleview,	{ .i = 8 } }, \
-	{ MODKEY|ShiftMask,		XK_0,		tag,		{ .i = -1 } }, \
-	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
-	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
-	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
-	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 3 } }, \
-	{ MODKEY|ShiftMask,		XK_5,		tag,		{ .i = 4 } }, \
-	{ MODKEY|ShiftMask,		XK_6,		tag,		{ .i = 5 } }, \
-	{ MODKEY|ShiftMask,		XK_7,		tag,		{ .i = 6 } }, \
-	{ MODKEY|ShiftMask,		XK_8,		tag,		{ .i = 7 } }, \
-	{ MODKEY|ShiftMask,		XK_9,		tag,		{ .i = 8 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 3 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	{ .i = 4 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	{ .i = 5 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	{ .i = 6 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	{ .i = 7 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	{ .i = 8 } }, \
-	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec xterm" }, \
+	{ MODKEY,			XK_space,	setlayout,	NULL }, \
+	{ MODKEY,			XK_d,		incnmaster,	"-1" }, \
+	{ MODKEY,			XK_i,		incnmaster,	"1" }, \
+	{ MODKEY,			XK_h,		incmasterw,	"-15" }, \
+	{ MODKEY,			XK_l,		incmasterw,	"15" }, \
+	{ MODKEY,			XK_j,		focusnext,	NULL }, \
+	{ MODKEY,			XK_k,		focusprev,	NULL }, \
+	{ MODKEY,			XK_m,		togglemax,	NULL }, \
+	{ MODKEY,			XK_Return,	zoom,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_space,	toggleversatile,NULL }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL }, \
+	{ MODKEY,			XK_0,		view,		NULL }, \
+	{ MODKEY,			XK_1,		view,		"0" }, \
+	{ MODKEY,			XK_2,		view,		"1" }, \
+	{ MODKEY,			XK_3,		view,		"2" }, \
+	{ MODKEY,			XK_4,		view,		"3" }, \
+	{ MODKEY,			XK_5,		view,		"4" }, \
+	{ MODKEY,			XK_6,		view,		"5" }, \
+	{ MODKEY,			XK_7,		view,		"6" }, \
+	{ MODKEY,			XK_8,		view,		"7" }, \
+	{ MODKEY,			XK_9,		view,		"8" }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	"0" }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	"1" }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	"2" }, \
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	"3" }, \
+	{ MODKEY|ControlMask,		XK_5,		toggleview,	"4" }, \
+	{ MODKEY|ControlMask,		XK_6,		toggleview,	"5" }, \
+	{ MODKEY|ControlMask,		XK_7,		toggleview,	"6" }, \
+	{ MODKEY|ControlMask,		XK_8,		toggleview,	"7" }, \
+	{ MODKEY|ControlMask,		XK_9,		toggleview,	"8" }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		"0" }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		"1" }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		"2" }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		"3" }, \
+	{ MODKEY|ShiftMask,		XK_5,		tag,		"4" }, \
+	{ MODKEY|ShiftMask,		XK_6,		tag,		"5" }, \
+	{ MODKEY|ShiftMask,		XK_7,		tag,		"6" }, \
+	{ MODKEY|ShiftMask,		XK_8,		tag,		"7" }, \
+	{ MODKEY|ShiftMask,		XK_9,		tag,		"8" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	"0" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	"1" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	"2" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	"3" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	"4" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	"5" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	"6" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	"7" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	"8" }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL }, \
 };