X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.default.h;h=a8a2c0e77eba2f3eeaf7d3f860a84a483c8c2117;hb=442334641e4124d8c32387287d431a83761ff916;hp=ce3773e38ea2150bddb34f5e73bfe4525150ee6f;hpb=b35575574be53a1b3be42d7037d2f432a19a3890;p=dwm.git

diff --git a/config.default.h b/config.default.h
index ce3773e..a8a2c0e 100644
--- a/config.default.h
+++ b/config.default.h
@@ -17,40 +17,41 @@ const char *tags[] = { "0", "1", "2", "3", "4", NULL };
 #define MASTERW			60 /* percent */
 
 #define KEYS \
-	const char *term[] = { "xterm", NULL }; \
 static Key key[] = { \
-	/* modifier		key		function	arguments */ \
-	{ MODKEY,		XK_0,		view,		{ .i = 0 } }, \
-	{ MODKEY,		XK_1,		view,		{ .i = 1 } }, \
-	{ MODKEY,		XK_2,		view,		{ .i = 2 } }, \
-	{ MODKEY,		XK_3,		view,		{ .i = 3 } }, \
-	{ MODKEY,		XK_4,		view,		{ .i = 4 } }, \
-	{ MODKEY,		XK_h,		viewprev,	{ 0 } }, \
-	{ MODKEY,		XK_j,		focusnext,	{ 0 } }, \
-	{ MODKEY,		XK_k,		focusprev,	{ 0 } }, \
-	{ MODKEY,		XK_l,		viewnext,	{ 0 } }, \
-	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, \
-	{ MODKEY,		XK_space,	togglemode,	{ 0 } }, \
-	{ MODKEY,		XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY|ControlMask,	XK_0,		appendtag,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask,	XK_1,		appendtag,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask,	XK_2,		appendtag,	{ .i = 2 } }, \
-	{ MODKEY|ControlMask,	XK_3,		appendtag,	{ .i = 3 } }, \
-	{ MODKEY|ControlMask,	XK_4,		appendtag,	{ .i = 4 } }, \
-	{ MODKEY|ShiftMask,	XK_0,		replacetag,	{ .i = 0 } }, \
-	{ MODKEY|ShiftMask,	XK_1,		replacetag,	{ .i = 1 } }, \
-	{ MODKEY|ShiftMask,	XK_2,		replacetag,	{ .i = 2 } }, \
-	{ MODKEY|ShiftMask,	XK_3,		replacetag,	{ .i = 3 } }, \
-	{ MODKEY|ShiftMask,	XK_4,		replacetag,	{ .i = 4 } }, \
-	{ MODKEY|ShiftMask,	XK_c,		killclient,	{ 0 } }, \
-	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } }, \
-	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .argv = term } }, \
+	/* modifier			key		function	arguments */ \
+	{ MODKEY,			XK_0,		view,		{ .i = 0 } }, \
+	{ MODKEY,			XK_1,		view,		{ .i = 1 } }, \
+	{ MODKEY,			XK_2,		view,		{ .i = 2 } }, \
+	{ MODKEY,			XK_3,		view,		{ .i = 3 } }, \
+	{ MODKEY,			XK_4,		view,		{ .i = 4 } }, \
+	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
+	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
+	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
+	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
+	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
+	{ MODKEY|ControlMask,		XK_0,		toggleview,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		{ .i = 0 } }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 1 } }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 2 } }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 3 } }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_0,		toggletag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 4 } }, \
 };
 
 #define RULES \
-	const unsigned int firefox[] = { 2 }; \
 static Rule rule[] = { \
-	/* class:instance	tags		isfloat */ \
-	{ "Firefox.*",		firefox,	False }, \
-	{ "Gimp.*",		NULL,		True}, \
+	/* class:instance regex		tags regex	isfloat */ \
+	{ "Firefox.*",			"2",		False }, \
+	{ "Gimp.*",			NULL,		True}, \
 };