X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.def.h;h=d76bd0bf91c56008250d447b15f46e068e910673;hb=d66ad1457e6b1e3fc18c01767fdb499acaef3c8e;hp=b2f75dc4691fdea77dc05a015dedee1eefd45ba9;hpb=c3eca4d14fb5e607d16166e2ecbf8bcb980421d5;p=dwm.git

diff --git a/config.def.h b/config.def.h
index b2f75dc..d76bd0b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -12,7 +12,8 @@
 #define SELFGCOLOR		"#ffffff"
 
 /* tagging */
-const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "www", NULL };
+const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "www" };
+Bool seltags[LENGTH(tags)] = {[0] = True};
 Rule rules[] = {
 	/* class:instance:title regex	tags regex	isfloating */
 	{ "Firefox",			"www",		False },
@@ -22,7 +23,6 @@ Rule rules[] = {
 };
 
 /* layout(s) */
-#define ISTILE			isarrange(tile) /* || isarrange(<custom>) */
 #define MWFACT			0.6	/* master width factor [0.1 .. 0.9] */
 #define RESIZEHINTS		True	/* False - respect size hints in tiled resizals */
 #define SNAP			32	/* snap pixel */
@@ -34,60 +34,61 @@ Layout layouts[] = {
 
 /* key definitions */
 #define MODKEY			Mod1Mask
-#define KEYS \
-Key keys[] = { \
-	/* modifier			key		function	argument */ \
-	{ MODKEY,			XK_p,		spawn, \
-		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
-		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
-	{ MODKEY|ShiftMask,		XK_Return,	spawn, "exec xterm" }, \
-	{ MODKEY,			XK_space,	setlayout,	NULL }, \
-	{ MODKEY,			XK_b,		togglebar,	NULL }, \
-	{ MODKEY,			XK_j,		focusnext,	NULL }, \
-	{ MODKEY,			XK_k,		focusprev,	NULL }, \
-	{ MODKEY,			XK_h,		setmwfact,	"-0.05" }, \
-	{ MODKEY,			XK_l,		setmwfact,	"+0.05" }, \
-	{ MODKEY,			XK_m,		togglemax,	NULL }, \
-	{ MODKEY,			XK_Return,	zoom,		NULL }, \
-	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL }, \
-	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL }, \
-	{ MODKEY,			XK_0,		view,		NULL }, \
-	{ MODKEY,			XK_1,		view,		tags[0] }, \
-	{ MODKEY,			XK_2,		view,		tags[1] }, \
-	{ MODKEY,			XK_3,		view,		tags[2] }, \
-	{ MODKEY,			XK_4,		view,		tags[3] }, \
-	{ MODKEY,			XK_5,		view,		tags[4] }, \
-	{ MODKEY,			XK_6,		view,		tags[5] }, \
-	{ MODKEY,			XK_7,		view,		tags[6] }, \
-	{ MODKEY,			XK_8,		view,		tags[7] }, \
-	{ MODKEY,			XK_9,		view,		tags[8] }, \
-	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] }, \
-	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] }, \
-	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] }, \
-	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] }, \
-	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] }, \
-	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] }, \
-	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] }, \
-	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] }, \
-	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] }, \
-	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL }, \
-	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] }, \
-	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] }, \
-	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] }, \
-	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] }, \
-	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] }, \
-	{ MODKEY|ShiftMask,		XK_6,		tag,		tags[5] }, \
-	{ MODKEY|ShiftMask,		XK_7,		tag,		tags[6] }, \
-	{ MODKEY|ShiftMask,		XK_8,		tag,		tags[7] }, \
-	{ MODKEY|ShiftMask,		XK_9,		tag,		tags[8] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	tags[0] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	tags[1] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	tags[2] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	tags[3] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	tags[4] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	tags[5] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	tags[6] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	tags[7] }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	tags[8] }, \
-	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL }, \
+Key keys[] = {
+	/* modifier			key		function	argument */
+	{ MODKEY,			XK_p,		spawn,
+		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'"
+		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" },
+	{ MODKEY|ShiftMask,		XK_Return,	spawn, "exec uxterm" },
+	{ MODKEY,			XK_space,	setlayout,	NULL },
+	{ MODKEY,			XK_b,		togglebar,	NULL },
+	{ MODKEY,			XK_j,		focusnext,	NULL },
+	{ MODKEY,			XK_k,		focusprev,	NULL },
+	{ MODKEY,			XK_h,		setmwfact,	"-0.05" },
+	{ MODKEY,			XK_l,		setmwfact,	"+0.05" },
+	{ MODKEY,			XK_m,		togglemax,	NULL },
+	{ MODKEY,			XK_r,		reapply,	NULL },
+	{ MODKEY,			XK_Return,	zoom,		NULL },
+	{ MODKEY,			XK_Tab,		viewprevtag,	NULL },
+	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL },
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL },
+	{ MODKEY,			XK_0,		view,		NULL },
+	{ MODKEY,			XK_1,		view,		tags[0] },
+	{ MODKEY,			XK_2,		view,		tags[1] },
+	{ MODKEY,			XK_3,		view,		tags[2] },
+	{ MODKEY,			XK_4,		view,		tags[3] },
+	{ MODKEY,			XK_5,		view,		tags[4] },
+	{ MODKEY,			XK_6,		view,		tags[5] },
+	{ MODKEY,			XK_7,		view,		tags[6] },
+	{ MODKEY,			XK_8,		view,		tags[7] },
+	{ MODKEY,			XK_9,		view,		tags[8] },
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] },
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] },
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] },
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] },
+	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] },
+	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] },
+	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] },
+	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] },
+	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] },
+	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL },
+	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] },
+	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] },
+	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] },
+	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] },
+	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] },
+	{ MODKEY|ShiftMask,		XK_6,		tag,		tags[5] },
+	{ MODKEY|ShiftMask,		XK_7,		tag,		tags[6] },
+	{ MODKEY|ShiftMask,		XK_8,		tag,		tags[7] },
+	{ MODKEY|ShiftMask,		XK_9,		tag,		tags[8] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	tags[0] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	tags[1] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	tags[2] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	tags[3] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	tags[4] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	tags[5] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	tags[6] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	tags[7] },
+	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	tags[8] },
+	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL },
 };