applied Gottox bitmask + void *arg patch

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 63c8c06..9e92c28 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -18,7 +18,8 @@ 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) */
@@ -35,55 +36,55 @@ Layout layouts[] = {
 #define MODKEY Mod1Mask
 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_Return, zoom,           NULL },
        { MODKEY,                       XK_Tab,    viewprevtag,    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,           (int[]){ ~0 } },
+       { MODKEY,                       XK_1,      view,           (int[]){ 1 << 0 } },
+       { MODKEY,                       XK_2,      view,           (int[]){ 1 << 1 } },
+       { MODKEY,                       XK_3,      view,           (int[]){ 1 << 2 } },
+       { MODKEY,                       XK_4,      view,           (int[]){ 1 << 3 } },
+       { MODKEY,                       XK_5,      view,           (int[]){ 1 << 4 } },
+       { MODKEY,                       XK_6,      view,           (int[]){ 1 << 5 } },
+       { MODKEY,                       XK_7,      view,           (int[]){ 1 << 6 } },
+       { MODKEY,                       XK_8,      view,           (int[]){ 1 << 7 } },
+       { MODKEY,                       XK_9,      view,           (int[]){ 1 << 8 } },
+       { MODKEY|ControlMask,           XK_1,      toggleview,     (int[]){ 1 << 0 } },
+       { MODKEY|ControlMask,           XK_2,      toggleview,     (int[]){ 1 << 1 } },
+       { MODKEY|ControlMask,           XK_3,      toggleview,     (int[]){ 1 << 2 } },
+       { MODKEY|ControlMask,           XK_4,      toggleview,     (int[]){ 1 << 3 } },
+       { MODKEY|ControlMask,           XK_5,      toggleview,     (int[]){ 1 << 4 } },
+       { MODKEY|ControlMask,           XK_6,      toggleview,     (int[]){ 1 << 5 } },
+       { MODKEY|ControlMask,           XK_7,      toggleview,     (int[]){ 1 << 6 } },
+       { MODKEY|ControlMask,           XK_8,      toggleview,     (int[]){ 1 << 7 } },
+       { MODKEY|ControlMask,           XK_9,      toggleview,     (int[]){ 1 << 8 } },
+       { MODKEY|ShiftMask,             XK_0,      tag,            (int[]){ ~0 } },
+       { MODKEY|ShiftMask,             XK_1,      tag,            (int[]){ 1 << 0 } },
+       { MODKEY|ShiftMask,             XK_2,      tag,            (int[]){ 1 << 1 } },
+       { MODKEY|ShiftMask,             XK_3,      tag,            (int[]){ 1 << 2 } },
+       { MODKEY|ShiftMask,             XK_4,      tag,            (int[]){ 1 << 3 } },
+       { MODKEY|ShiftMask,             XK_5,      tag,            (int[]){ 1 << 4 } },
+       { MODKEY|ShiftMask,             XK_6,      tag,            (int[]){ 1 << 5 } },
+       { MODKEY|ShiftMask,             XK_7,      tag,            (int[]){ 1 << 6 } },
+       { MODKEY|ShiftMask,             XK_8,      tag,            (int[]){ 1 << 7 } },
+       { MODKEY|ShiftMask,             XK_9,      tag,            (int[]){ 1 << 8 } },
+       { MODKEY|ControlMask|ShiftMask, XK_1,      toggletag,      (int[]){ 1 << 0 } },
+       { MODKEY|ControlMask|ShiftMask, XK_2,      toggletag,      (int[]){ 1 << 1 } },
+       { MODKEY|ControlMask|ShiftMask, XK_3,      toggletag,      (int[]){ 1 << 2 } },
+       { MODKEY|ControlMask|ShiftMask, XK_4,      toggletag,      (int[]){ 1 << 3 } },
+       { MODKEY|ControlMask|ShiftMask, XK_5,      toggletag,      (int[]){ 1 << 4 } },
+       { MODKEY|ControlMask|ShiftMask, XK_6,      toggletag,      (int[]){ 1 << 5 } },
+       { MODKEY|ControlMask|ShiftMask, XK_7,      toggletag,      (int[]){ 1 << 6 } },
+       { MODKEY|ControlMask|ShiftMask, XK_8,      toggletag,      (int[]){ 1 << 7 } },
+       { MODKEY|ControlMask|ShiftMask, XK_9,      toggletag,      (int[]){ 1 << 8 } },
        { MODKEY|ShiftMask,             XK_q,      quit,           NULL },
 };