applied Gottox' patches, and also removed usegrab

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 6cf3989..b270fef 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -8,17 +8,14 @@ static const char normfgcolor[]     = "#000000";
 static const char selbordercolor[]  = "#0066ff";
 static const char selbgcolor[]      = "#0066ff";
 static const char selfgcolor[]      = "#ffffff";
 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 */
 static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 /* tagging */
 static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };

+static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */

 
 static Rule rules[] = {
        /* class      instance    title       tags mask     isfloating */
 
 static Rule rules[] = {
        /* class      instance    title       tags mask     isfloating */


@@ -27,14 +24,14 @@ static Rule rules[] = {
 };
 
 /* layout(s) */
 };
 
 /* layout(s) */

-static float mfact      = 0.55;
+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 */
        { "[]=",      tile },    /* first entry is default */
        { "><>",      NULL },    /* no layout function means floating behavior */
 static Bool resizehints = True; /* False means respect size hints in tiled resizals */
 
 static Layout layouts[] = {
        /* symbol     arrange function */
        { "[]=",      tile },    /* first entry is default */
        { "><>",      NULL },    /* no layout function means floating behavior */

-       { "[M]",      monocle }, /* first entry is default */
+       { "[M]",      monocle },

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


@@ -84,12 +81,6 @@ 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 can be a tag number (starting at 0),
  * ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static Button buttons[] = {


@@ -101,14 +92,9 @@ static Button buttons[] = {
        { ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
        { ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
        { ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
        { 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} },

 };
 
 };