we need a tagset per monitor, removed tagset declaration from config.h

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 95bb84c..95cb168 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,39 +1,38 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */

-static const char font[]            = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
+static const char font[]            = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";

 static const char normbordercolor[] = "#cccccc";
 static const char normbgcolor[]     = "#cccccc";
 static const char normfgcolor[]     = "#000000";
 static const char selbordercolor[]  = "#0066ff";
 static const char selbgcolor[]      = "#0066ff";
 static const char selfgcolor[]      = "#ffffff";
 static const char normbordercolor[] = "#cccccc";
 static const char normbgcolor[]     = "#cccccc";
 static const char normfgcolor[]     = "#000000";
 static const char selbordercolor[]  = "#0066ff";
 static const char selbgcolor[]      = "#0066ff";
 static const char selfgcolor[]      = "#ffffff";

-static uint borderpx                = 1;        /* border pixel of windows */
-static uint snap                    = 32;       /* snap pixel */
+static unsigned int borderpx        = 1;        /* border pixel of windows */
+static unsigned int snap            = 32;       /* snap pixel */

 static Bool showbar                 = True;     /* False means no bar */
 static Bool topbar                  = True;     /* False means bottom bar */
 
 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 */

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

 
 static Rule rules[] = {
 
 static Rule rules[] = {

-       /* class      instance    title       tags ref      isfloating */
+       /* class      instance    title       tags mask     isfloating */

        { "Gimp",     NULL,       NULL,       0,            True },
        { "Gimp",     NULL,       NULL,       0,            True },

-       { "Firefox",  NULL,       NULL,       1 << 8,       True },
+       { "Firefox",  NULL,       NULL,       1 << 8,       False },
+

 };
 
 /* layout(s) */
 };
 
 /* layout(s) */

-static float mfact           = 0.55;
-static Bool resizehints       = False;     /* False means respect size hints in tiled resizals */
+static float mfact      = 0.55; /* factor of master area size [0.05..0.95] */
+static Bool resizehints = True; /* False means respect size hints in tiled resizals */

 
 static Layout layouts[] = {
        /* symbol     arrange function */
 
 static Layout layouts[] = {
        /* symbol     arrange function */

-       { "[]=",      tile }, /* first entry is default */
-       { "><>",      NULL }, /* no layout function means floating behavior */
+       { "[]=",      tile },    /* first entry is default */
+       { "><>",      NULL },    /* no layout function means floating behavior */
+       { "[M]",      monocle },

 };
 
 /* key definitions */
 };
 
 /* key definitions */


@@ -60,14 +59,22 @@ static Key keys[] = {
        { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
        { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
        { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
        { 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_Return, zoom,           {0} },
        { MODKEY,                       XK_Tab,    view,           {0} },
        { MODKEY|ShiftMask,             XK_c,      killclient,     {0} },

-       { MODKEY,                       XK_space,  togglelayout,   {0} },
+       { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+       { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
+       { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+       { MODKEY,                       XK_space,  setlayout,      {0} },

        { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
        { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
        { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
        { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
        { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
        { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },

+#ifdef XINERAMA
+       { MODKEY,                       XK_w,      focusmon,       {.ui = 0 } },
+       { MODKEY,                       XK_e,      focusmon,       {.ui = 1 } },
+       { MODKEY|ShiftMask,             XK_w,      tagmon,         {.ui = 0 } },
+       { MODKEY|ShiftMask,             XK_e,      tagmon,         {.ui = 1 } },
+#endif /* XINERAMA */

        TAGKEYS(                        XK_1,                      0)
        TAGKEYS(                        XK_2,                      1)
        TAGKEYS(                        XK_3,                      2)
        TAGKEYS(                        XK_1,                      0)
        TAGKEYS(                        XK_2,                      1)
        TAGKEYS(                        XK_3,                      2)


@@ -81,31 +88,20 @@ static Key keys[] = {
 };
 
 /* button definitions */
 };
 
 /* 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 */
 /* 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} },
+       { ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
+       { ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },

        { ClkWinTitle,          0,              Button2,        zoom,           {0} },
        { ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
        { ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
        { ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
        { ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
        { ClkWinTitle,          0,              Button2,        zoom,           {0} },
        { ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
        { ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
        { ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
        { ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },

-       TAGBUTTONS(0)
-       TAGBUTTONS(1)
-       TAGBUTTONS(2)
-       TAGBUTTONS(3)
-       TAGBUTTONS(4)
-       TAGBUTTONS(5)
-       TAGBUTTONS(6)
-       TAGBUTTONS(7)
-       TAGBUTTONS(8)
+       { ClkTagBar,            0,              Button1,        view,           {0} },
+       { ClkTagBar,            0,              Button3,        toggleview,     {0} },
+       { ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
+       { ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },

 };
 
 };