X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=config.def.h;h=83a8c183c3d72ee5d8b6849949d9976d4fb49f60;hp=0619a9eb0fe4fa6f996b3c0f2fbe27fbf402811b;hb=98e7950be812d20fc33f597641819561ee90fc0e;hpb=549726869bd88f70727ecae8a28161700395b20b

diff --git a/config.def.h b/config.def.h
index 0619a9e..83a8c18 100644
--- a/config.def.h
+++ b/config.def.h
@@ -18,74 +18,53 @@ const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 Rule rules[] = {
 	/* class      instance    title       tags ref      isfloating */
-	{ "Gimp",     NULL,       NULL,       NULL,         True },
+	{ "Gimp",     NULL,       NULL,       0,            True },
+	{ "Firefox",  NULL,       NULL,       1 << 8,       True },
 };
 
 /* layout(s) */
 double mfact           = 0.55;
-Bool resizehints       = True;     /* False means respect size hints in tiled resizals */
-
-#include "tile.c"
+Bool resizehints       = False;     /* False means respect size hints in tiled resizals */
 
 Layout layouts[] = {
-	/* symbol     arrange  geom */
-	{ "[]=",      tile,    updatetilegeom }, /* first entry is default */
-	{ "><>",      NULL,                   }, /* no layout function means floating behavior */
+	/* symbol     arrange function */
+	{ "[]=",      tile }, /* first entry is default */
+	{ "><>",      NULL }, /* no layout function means floating behavior */
 };
 
 /* key definitions */
 #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 },
+
 Key keys[] = {
 	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_p,      spawn,          "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          "exec uxterm" },
+	{ MODKEY,                       XK_p,      spawn,          (char *)"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          (char *)"exec uxterm" },
 	{ MODKEY,                       XK_b,      togglebar,      NULL },
 	{ MODKEY,                       XK_j,      focusnext,      NULL },
 	{ MODKEY,                       XK_k,      focusprev,      NULL },
-	{ MODKEY,                       XK_h,      setmfact,       "-0.05" },
-	{ MODKEY,                       XK_l,      setmfact,       "+0.05" },
+	{ MODKEY,                       XK_h,      setmfact,       (double[]){-0.05} },
+	{ MODKEY,                       XK_l,      setmfact,       (double[]){+0.05} },
+	{ MODKEY,                       XK_m,      togglemax,      NULL },
 	{ MODKEY,                       XK_Return, zoom,           NULL },
-	{ MODKEY,                       XK_Tab,    viewprevtag,    NULL },
+	{ MODKEY,                       XK_Tab,    view,           NULL },
 	{ MODKEY|ShiftMask,             XK_c,      killclient,     NULL },
 	{ MODKEY,                       XK_space,  togglelayout,   NULL },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, 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,                       XK_0,      view,           (uint[]){ ~0 } },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            (uint[]){ ~0 } },
+	TAGKEYS(                        XK_1,                      (uint[]){ 1 << 0} )
+	TAGKEYS(                        XK_2,                      (uint[]){ 1 << 1} )
+	TAGKEYS(                        XK_3,                      (uint[]){ 1 << 2} )
+	TAGKEYS(                        XK_4,                      (uint[]){ 1 << 3} )
+	TAGKEYS(                        XK_5,                      (uint[]){ 1 << 4} )
+	TAGKEYS(                        XK_6,                      (uint[]){ 1 << 5} )
+	TAGKEYS(                        XK_7,                      (uint[]){ 1 << 6} )
+	TAGKEYS(                        XK_8,                      (uint[]){ 1 << 7} )
+	TAGKEYS(                        XK_9,                      (uint[]){ 1 << 8} )
 	{ MODKEY|ShiftMask,             XK_q,      quit,           NULL },
 };