applied noviewprev.diff, fix.diff and unusedflags.diff

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 12d72b2..b18af75 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -27,13 +27,19 @@ double mfact           = 0.55;
 Bool resizehints       = True;     /* False means respect size hints in tiled resizals */
 
 Layout layouts[] = {
 Bool resizehints       = True;     /* False means respect size hints in tiled resizals */
 
 Layout layouts[] = {

-       /* symbol     arrange  geom */
-       { "[]=",      tile,    updatetilegeom }, /* first entry is default */
-       { "><>",      NULL,    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
 };
 
 /* 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,          (char *)"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
 Key keys[] = {
        /* modifier                     key        function        argument */
        { MODKEY,                       XK_p,      spawn,          (char *)"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },


@@ -43,48 +49,22 @@ Key keys[] = {
        { MODKEY,                       XK_k,      focusprev,      NULL },
        { MODKEY,                       XK_h,      setmfact,       (double[]){-0.05} },
        { MODKEY,                       XK_l,      setmfact,       (double[]){+0.05} },
        { MODKEY,                       XK_k,      focusprev,      NULL },
        { 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_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,           (uint[]){ ~0 } },
        { MODKEY|ShiftMask,             XK_c,      killclient,     NULL },
        { MODKEY,                       XK_space,  togglelayout,   NULL },
        { MODKEY|ShiftMask,             XK_space,  togglefloating, NULL },
        { MODKEY,                       XK_0,      view,           (uint[]){ ~0 } },

-       { MODKEY,                       XK_1,      view,           (uint[]){ 1 << 0 } },
-       { MODKEY,                       XK_2,      view,           (uint[]){ 1 << 1 } },
-       { MODKEY,                       XK_3,      view,           (uint[]){ 1 << 2 } },
-       { MODKEY,                       XK_4,      view,           (uint[]){ 1 << 3 } },
-       { MODKEY,                       XK_5,      view,           (uint[]){ 1 << 4 } },
-       { MODKEY,                       XK_6,      view,           (uint[]){ 1 << 5 } },
-       { MODKEY,                       XK_7,      view,           (uint[]){ 1 << 6 } },
-       { MODKEY,                       XK_8,      view,           (uint[]){ 1 << 7 } },
-       { MODKEY,                       XK_9,      view,           (uint[]){ 1 << 8 } },
-       { MODKEY|ControlMask,           XK_1,      toggleview,     (uint[]){ 1 << 0 } },
-       { MODKEY|ControlMask,           XK_2,      toggleview,     (uint[]){ 1 << 1 } },
-       { MODKEY|ControlMask,           XK_3,      toggleview,     (uint[]){ 1 << 2 } },
-       { MODKEY|ControlMask,           XK_4,      toggleview,     (uint[]){ 1 << 3 } },
-       { MODKEY|ControlMask,           XK_5,      toggleview,     (uint[]){ 1 << 4 } },
-       { MODKEY|ControlMask,           XK_6,      toggleview,     (uint[]){ 1 << 5 } },
-       { MODKEY|ControlMask,           XK_7,      toggleview,     (uint[]){ 1 << 6 } },
-       { MODKEY|ControlMask,           XK_8,      toggleview,     (uint[]){ 1 << 7 } },
-       { MODKEY|ControlMask,           XK_9,      toggleview,     (uint[]){ 1 << 8 } },

        { MODKEY|ShiftMask,             XK_0,      tag,            (uint[]){ ~0 } },
        { MODKEY|ShiftMask,             XK_0,      tag,            (uint[]){ ~0 } },

-       { MODKEY|ShiftMask,             XK_1,      tag,            (uint[]){ 1 << 0 } },
-       { MODKEY|ShiftMask,             XK_2,      tag,            (uint[]){ 1 << 1 } },
-       { MODKEY|ShiftMask,             XK_3,      tag,            (uint[]){ 1 << 2 } },
-       { MODKEY|ShiftMask,             XK_4,      tag,            (uint[]){ 1 << 3 } },
-       { MODKEY|ShiftMask,             XK_5,      tag,            (uint[]){ 1 << 4 } },
-       { MODKEY|ShiftMask,             XK_6,      tag,            (uint[]){ 1 << 5 } },
-       { MODKEY|ShiftMask,             XK_7,      tag,            (uint[]){ 1 << 6 } },
-       { MODKEY|ShiftMask,             XK_8,      tag,            (uint[]){ 1 << 7 } },
-       { MODKEY|ShiftMask,             XK_9,      tag,            (uint[]){ 1 << 8 } },
-       { MODKEY|ControlMask|ShiftMask, XK_1,      toggletag,      (uint[]){ 1 << 0 } },
-       { MODKEY|ControlMask|ShiftMask, XK_2,      toggletag,      (uint[]){ 1 << 1 } },
-       { MODKEY|ControlMask|ShiftMask, XK_3,      toggletag,      (uint[]){ 1 << 2 } },
-       { MODKEY|ControlMask|ShiftMask, XK_4,      toggletag,      (uint[]){ 1 << 3 } },
-       { MODKEY|ControlMask|ShiftMask, XK_5,      toggletag,      (uint[]){ 1 << 4 } },
-       { MODKEY|ControlMask|ShiftMask, XK_6,      toggletag,      (uint[]){ 1 << 5 } },
-       { MODKEY|ControlMask|ShiftMask, XK_7,      toggletag,      (uint[]){ 1 << 6 } },
-       { MODKEY|ControlMask|ShiftMask, XK_8,      toggletag,      (uint[]){ 1 << 7 } },
-       { MODKEY|ControlMask|ShiftMask, XK_9,      toggletag,      (uint[]){ 1 << 8 } },
+       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 },
 };
        { MODKEY|ShiftMask,             XK_q,      quit,           NULL },
 };