X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.arg.h;h=ce77572dff0a3477987f5be01fa606e6ebf9ae78;hb=19390b1a91da680a502ce5acebd086cfbe32627c;hp=8e9b2b4532d56cf7ad78c59b2492b80dadf0ba56;hpb=52a8cc8d4691eba01eded12bcddefef2394544ae;p=dwm.git

diff --git a/config.arg.h b/config.arg.h
index 8e9b2b4..ce77572 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -9,7 +9,7 @@ const char *tags[] = { "dev", "work", "net", "fnord", NULL };
 #define FLOATSYMBOL		"><>"
 #define TILESYMBOL		"[]="
 
-#define FONT			"-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+#define FONT			"-*-terminus-medium-*-*-*-14-*-*-*-*-*-iso10646-*"
 #define NORMBGCOLOR		"#333333"
 #define NORMFGCOLOR		"#dddddd"
 #define SELBGCOLOR		"#336699"
@@ -17,44 +17,46 @@ const char *tags[] = { "dev", "work", "net", "fnord", NULL };
 #define STATUSBGCOLOR		"#222222"
 #define STATUSFGCOLOR		"#99ccff"
 
-#define MASTER			600 /* per thousand */
+#define MASTER			600		/* per thousand */
 #define MODKEY			Mod1Mask
-#define SNAP			40 /* pixel */
+#define NFUNCS			1		/* number of funcs per key */
+#define SNAP			40		/* pixel */
 
 #define KEYS \
 static Key key[] = { \
-	/* modifier			key		function	arguments */ \
-	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
+	/* modifier			key		functions		arguments */ \
+	{ MODKEY|ShiftMask,		XK_Return,	{ spawn }, \
 		{ .cmd = "exec urxvtc -tr -bg black -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
-	{ MODKEY,			XK_p,		spawn, \
+	{ MODKEY,			XK_p,		{ spawn }, \
 		{ .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
 			" | dmenu -font '"FONT"' -normbg '"NORMBGCOLOR"' -normfg '"NORMFGCOLOR"' " \
 			"-selbg '"SELBGCOLOR"' -selfg '"SELFGCOLOR"')\" && exec $exe" } }, \
-	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
-	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
-	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY,			XK_g,		resizemaster,	{ .i = 15 } }, \
-	{ MODKEY,			XK_s,		resizemaster,	{ .i = -15 } }, \
-	{ 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|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|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
-	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
-	{ MODKEY,			XK_0,		viewall,	{ 0 } }, \
-	{ 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|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|ShiftMask,		XK_q,		quit,		{ 0 } }, \
+	{ MODKEY,			XK_j,		{ focusnext },		{ 0 } }, \
+	{ MODKEY,			XK_k,		{ focusprev },		{ 0 } }, \
+	{ MODKEY,			XK_Return,	{ zoom },		{ 0 } }, \
+	{ MODKEY,			XK_g,		{ resizemaster },	{ .i = 15 } }, \
+	{ MODKEY,			XK_s,		{ resizemaster },	{ .i = -15 } }, \
+	{ 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|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|ShiftMask,		XK_c,		{ killclient },		{ 0 } }, \
+	{ MODKEY,			XK_space,	{ togglemode },		{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_space,	{ togglefloat },	{ 0 } }, \
+	{ MODKEY,			XK_0,		{ viewall },		{ 0 } }, \
+	{ 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|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|ShiftMask,		XK_q,		{ quit },		{ 0 } }, \
 };
 
 #define RULES \