1.1 --- a/config.arg.h	Mon Nov 27 11:05:47 2006 +0100
     1.2 +++ b/config.arg.h	Mon Nov 27 13:21:38 2006 +0100
     1.3 @@ -17,45 +17,46 @@
     1.4  #define STATUSBGCOLOR		"#222222"
     1.5  #define STATUSFGCOLOR		"#99ccff"
     1.6  
     1.7 -#define MASTER			600 /* per thousand */
     1.8 +#define MASTER			600		/* per thousand */
     1.9  #define MODKEY			Mod1Mask
    1.10 -#define SNAP			40 /* pixel */
    1.11 +#define NFUNCS			1		/* number of funcs per key */
    1.12 +#define SNAP			40		/* pixel */
    1.13  
    1.14  #define KEYS \
    1.15  static Key key[] = { \
    1.16 -	/* modifier			key		function	arguments */ \
    1.17 -	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
    1.18 +	/* modifier			key		functions		arguments */ \
    1.19 +	{ MODKEY|ShiftMask,		XK_Return,	{ spawn }, \
    1.20  		{ .cmd = "exec urxvtc -tr -bg black -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
    1.21 -	{ MODKEY,			XK_p,		spawn, \
    1.22 +	{ MODKEY,			XK_p,		{ spawn }, \
    1.23  		{ .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
    1.24  			" | dmenu -font '"FONT"' -normbg '"NORMBGCOLOR"' -normfg '"NORMFGCOLOR"' " \
    1.25  			"-selbg '"SELBGCOLOR"' -selfg '"SELFGCOLOR"')\" && exec $exe" } }, \
    1.26 -	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
    1.27 -	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
    1.28 -	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
    1.29 -	{ MODKEY,			XK_g,		resizemaster,	{ .i = 15 } }, \
    1.30 -	{ MODKEY,			XK_s,		resizemaster,	{ .i = -15 } }, \
    1.31 -	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
    1.32 -	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
    1.33 -	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
    1.34 -	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 3 } }, \
    1.35 -	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
    1.36 -	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
    1.37 -	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
    1.38 -	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 3 } }, \
    1.39 -	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
    1.40 -	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
    1.41 -	{ MODKEY|ShiftMask,		XK_space,	togglefloat,	{ 0 } }, \
    1.42 -	{ MODKEY,			XK_0,		viewall,	{ 0 } }, \
    1.43 -	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
    1.44 -	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
    1.45 -	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
    1.46 -	{ MODKEY,			XK_4,		view,		{ .i = 3 } }, \
    1.47 -	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
    1.48 -	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
    1.49 -	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
    1.50 -	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 3 } }, \
    1.51 -	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
    1.52 +	{ MODKEY,			XK_j,		{ focusnext },		{ 0 } }, \
    1.53 +	{ MODKEY,			XK_k,		{ focusprev },		{ 0 } }, \
    1.54 +	{ MODKEY,			XK_Return,	{ zoom },		{ 0 } }, \
    1.55 +	{ MODKEY,			XK_g,		{ resizemaster },	{ .i = 15 } }, \
    1.56 +	{ MODKEY,			XK_s,		{ resizemaster },	{ .i = -15 } }, \
    1.57 +	{ MODKEY|ShiftMask,		XK_1,		{ tag },		{ .i = 0 } }, \
    1.58 +	{ MODKEY|ShiftMask,		XK_2,		{ tag },		{ .i = 1 } }, \
    1.59 +	{ MODKEY|ShiftMask,		XK_3,		{ tag },		{ .i = 2 } }, \
    1.60 +	{ MODKEY|ShiftMask,		XK_4,		{ tag },		{ .i = 3 } }, \
    1.61 +	{ MODKEY|ControlMask|ShiftMask,	XK_1,		{ toggletag },		{ .i = 0 } }, \
    1.62 +	{ MODKEY|ControlMask|ShiftMask,	XK_2,		{ toggletag },		{ .i = 1 } }, \
    1.63 +	{ MODKEY|ControlMask|ShiftMask,	XK_3,		{ toggletag },		{ .i = 2 } }, \
    1.64 +	{ MODKEY|ControlMask|ShiftMask,	XK_4,		{ toggletag },		{ .i = 3 } }, \
    1.65 +	{ MODKEY|ShiftMask,		XK_c,		{ killclient },		{ 0 } }, \
    1.66 +	{ MODKEY,			XK_space,	{ togglemode },		{ 0 } }, \
    1.67 +	{ MODKEY|ShiftMask,		XK_space,	{ togglefloat },	{ 0 } }, \
    1.68 +	{ MODKEY,			XK_0,		{ viewall },		{ 0 } }, \
    1.69 +	{ MODKEY,			XK_1,		{ view },		{ .i = 0 } }, \
    1.70 +	{ MODKEY,			XK_2,		{ view },		{ .i = 1 } }, \
    1.71 +	{ MODKEY,			XK_3,		{ view },		{ .i = 2 } }, \
    1.72 +	{ MODKEY,			XK_4,		{ view },		{ .i = 3 } }, \
    1.73 +	{ MODKEY|ControlMask,		XK_1,		{ toggleview },		{ .i = 0 } }, \
    1.74 +	{ MODKEY|ControlMask,		XK_2,		{ toggleview },		{ .i = 1 } }, \
    1.75 +	{ MODKEY|ControlMask,		XK_3,		{ toggleview },		{ .i = 2 } }, \
    1.76 +	{ MODKEY|ControlMask,		XK_4,		{ toggleview },		{ .i = 3 } }, \
    1.77 +	{ MODKEY|ShiftMask,		XK_q,		{ quit },		{ 0 } }, \
    1.78  };
    1.79  
    1.80  #define RULES \