X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/cdd6c3e820a360aaca1e8cd9c4b882bac1448261..e5a965a27480c8b27cfb4884cc8f4988924d1087:/config.def.h?ds=inline

diff --git a/config.def.h b/config.def.h
index e8ab532..6a6f7be 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,93 +1,70 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define BARPOS			BarTop /* BarBot, BarOff */
-#define BORDERPX		1
-#define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
-#define NORMBORDERCOLOR		"#cccccc"
-#define NORMBGCOLOR		"#cccccc"
-#define NORMFGCOLOR		"#000000"
-#define SELBORDERCOLOR		"#0066ff"
-#define SELBGCOLOR		"#0066ff"
-#define SELFGCOLOR		"#ffffff"
+#define FONT            "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
+#define NORMBORDERCOLOR "#cccccc"
+#define NORMBGCOLOR     "#cccccc"
+#define NORMFGCOLOR     "#000000"
+#define SELBORDERCOLOR  "#0066ff"
+#define SELBGCOLOR      "#0066ff"
+#define SELFGCOLOR      "#ffffff"
+static uint borderpx  = 1;        /* border pixel of windows */
+static uint snap      = 32;       /* snap pixel */
+static Bool showbar   = True;     /* False means no bar */
+static Bool topbar    = True;     /* False means bottom bar */
 
 /* tagging */
-const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "www" };
-Rule rules[] = {
-	/* class:instance:title regex	tags regex	isfloating */
-	{ "Firefox",			"www",		False },
-	{ "Gimp",			NULL,		True },
-	{ "MPlayer",			NULL,		True },
-	{ "Acroread",			NULL,		True },
+static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static Rule rules[] = {
+	/* class      instance    title       tags ref      isfloating */
+	{ "Gimp",     NULL,       NULL,       0,            True },
+	{ "Firefox",  NULL,       NULL,       1 << 8,       True },
 };
 
 /* layout(s) */
-#define ISTILE			isarrange(tile) /* || isarrange(<custom>) */
-#define MWFACT			0.6	/* master width factor [0.1 .. 0.9] */
-#define SNAP			32	/* snap pixel */
-Layout layouts[] = {
-	/* symbol		function */
-	{ "[]=",		tile }, /* first entry is default */
-	{ "><>",		floating },
+static float mfact           = 0.55;
+static Bool resizehints       = False;     /* False means respect size hints in tiled resizals */
+
+static Layout layouts[] = {
+	/* symbol     arrange function */
+	{ "[]=",      tile }, /* first entry is default */
+	{ "><>",      NULL }, /* no layout function means floating behavior */
 };
 
 /* 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 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_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 }, \
+#define MODKEY Mod1Mask
+#define TAGKEYS(KEY,TAG) \
+        { MODKEY,                       KEY,      view,           TAG }, \
+        { MODKEY|ControlMask,           KEY,      toggleview,     TAG }, \
+        { MODKEY|ShiftMask,             KEY,      tag,            TAG }, \
+        { MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      TAG },
+
+static Key keys[] = {
+	/* modifier                     key        function        argument */
+	{ MODKEY,                       XK_p,      spawn,          {.v = (char *[]){"dmenu_run", "-fn", FONT, "-nb", NORMBGCOLOR, "-nf", NORMFGCOLOR, "-sb", SELBGCOLOR, "-sf", SELFGCOLOR, NULL}} },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = (char *[]){"uxterm", NULL}} },
+	{ MODKEY,                       XK_b,      togglebar,      {0}},
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1  }},
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1  }},
+	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05}},
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05}},
+	{ MODKEY,                       XK_m,      togglemax,      {0}},
+	{ MODKEY,                       XK_Return, zoom,           {0}},
+	{ MODKEY,                       XK_Tab,    view,           {0}},
+	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0}},
+	{ MODKEY,                       XK_space,  togglelayout,   {0}},
+	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0}},
+	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+	TAGKEYS(                        XK_1,                      {.ui = 1 << 0} )
+	TAGKEYS(                        XK_2,                      {.ui = 1 << 1} )
+	TAGKEYS(                        XK_3,                      {.ui = 1 << 2} )
+	TAGKEYS(                        XK_4,                      {.ui = 1 << 3} )
+	TAGKEYS(                        XK_5,                      {.ui = 1 << 4} )
+	TAGKEYS(                        XK_6,                      {.ui = 1 << 5} )
+	TAGKEYS(                        XK_7,                      {.ui = 1 << 6} )
+	TAGKEYS(                        XK_8,                      {.ui = 1 << 7} )
+	TAGKEYS(                        XK_9,                      {.ui = 1 << 8} )
+	{ MODKEY|ShiftMask,             XK_q,      quit,           {0}},
 };