integrated yiyus mouse.diff (though the bar click handling is slightly broken, I...

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 5154405..fe97061 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -8,25 +8,29 @@
 #define SELBORDERCOLOR  "#0066ff"
 #define SELBGCOLOR      "#0066ff"
 #define SELFGCOLOR      "#ffffff"
 #define SELBORDERCOLOR  "#0066ff"
 #define SELBGCOLOR      "#0066ff"
 #define SELFGCOLOR      "#ffffff"

-unsigned int borderpx  = 1;        /* border pixel of windows */
-unsigned int snap      = 32;       /* snap pixel */
-Bool showbar           = True;     /* False means no bar */
-Bool topbar            = True;     /* False means bottom bar */
+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 */
+
+#ifdef XINERAMA
+static uint xidx        = 0;        /* Xinerama screen index to use */
+#endif

 
 /* tagging */
 
 /* tagging */

-const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };

 
 

-Rule rules[] = {
+static Rule rules[] = {

        /* class      instance    title       tags ref      isfloating */
        { "Gimp",     NULL,       NULL,       0,            True },
        { "Firefox",  NULL,       NULL,       1 << 8,       True },
 };
 
 /* layout(s) */
        /* class      instance    title       tags ref      isfloating */
        { "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 */
+static float mfact           = 0.55;
+static Bool resizehints       = False;     /* False means respect size hints in tiled resizals */

 
 

-Layout layouts[] = {
+static Layout layouts[] = {

        /* symbol     arrange function */
        { "[]=",      tile }, /* 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 */


@@ -35,36 +39,73 @@ Layout layouts[] = {
 /* key definitions */
 #define MODKEY Mod1Mask
 #define TAGKEYS(KEY,TAG) \
 /* 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 },
+       { MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
+       { MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
+       { MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
+       { MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
+
+/* helper for spawning shell commands */
+#define SHCMD(cmd) { .v = (char*[]){ "/bin/sh", "-c", cmd, NULL } }

 
 

-Key keys[] = {
+static Key keys[] = {

        /* modifier                     key        function        argument */
        /* modifier                     key        function        argument */

-       { 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,       (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|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_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 },
+       { 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,                      0)
+       TAGKEYS(                        XK_2,                      1)
+       TAGKEYS(                        XK_3,                      2)
+       TAGKEYS(                        XK_4,                      3)
+       TAGKEYS(                        XK_5,                      4)
+       TAGKEYS(                        XK_6,                      5)
+       TAGKEYS(                        XK_7,                      6)
+       TAGKEYS(                        XK_8,                      7)
+       TAGKEYS(                        XK_9,                      8)
+       { MODKEY|ShiftMask,             XK_q,      quit,           {0} },
+};
+
+/* button definitions */
+#define TAGBUTTONS(TAG) \
+       { TAG,                  0,              Button1,        view,           {.ui = 1 << TAG} }, \
+       { TAG,                  0,              Button3,        toggleview,     {.ui = 1 << TAG} }, \
+       { TAG,                  MODKEY,         Button1,        tag,            {.ui = 1 << TAG} }, \
+       { TAG,                  MODKEY,         Button3,        toggletag,      {.ui = 1 << TAG} },
+
+/* click can be a tag number (starting at 0),
+ * ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static Button buttons[] = {
+       /* click                event mask      button          function        argument */
+       { ClkLtSymbol,          0,              Button1,        togglelayout,   {0} },
+       { ClkLtSymbol,          0,              Button3,        togglemax,      {0} },
+       { ClkWinTitle,          0,              Button1,        movemouse,      {0} },
+       { ClkWinTitle,          0,              Button2,        zoom,           {0} },
+       { ClkWinTitle,          0,              Button3,        resizemouse,    {0} },
+       { ClkWinTitle,          0,              Button4,        focusstack,     {.i = +1 } },
+       { ClkWinTitle,          0,              Button5,        focusstack,     {.i = -1 } },
+       { ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
+       { ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
+       { ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
+       { ClkRootWin,           Button1Mask,    Button3,        spawn,          {.v = (char *[]){"uxterm", NULL}} },
+       TAGBUTTONS(0)
+       TAGBUTTONS(1)
+       TAGBUTTONS(2)
+       TAGBUTTONS(3)
+       TAGBUTTONS(4)
+       TAGBUTTONS(5)
+       TAGBUTTONS(6)
+       TAGBUTTONS(7)
+       TAGBUTTONS(8)

 };
 };

+