dwm try single tagsset

4 files changed, 1753 insertions, 1748 deletions

diff --git a/tree/src/dwm/dwm-6.6/config.def.h b/tree/src/dwm/dwm-6.6/config.def.h
index 7989be8..3fee16b 100644
--- a/tree/src/dwm/dwm-6.6/config.def.h
+++ b/tree/src/dwm/dwm-6.6/config.def.h
@@ -15,22 +15,22 @@ static const char col_gray3[]       = "#bbbbbb";
 static const char col_gray4[]       = "#eeeeee";
 static const char col_purple[]      = "#6904f7";
 static const char *colors[][3]      = {
-	/*               fg         bg         border   */
-	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-	[SchemeSel]  = { col_gray4, col_purple,  col_purple  },
+        /*               fg         bg         border   */
+        [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+        [SchemeSel]  = { col_gray4, col_purple,  col_purple  },
 };
 
 /* tagging */
 static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 static const Rule rules[] = {
-	/* xprop(1):
-	 *	WM_CLASS(STRING) = instance, class
-	 *	WM_NAME(STRING) = title
-	 */
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
+        /* xprop(1):
+         *      WM_CLASS(STRING) = instance, class
+         *      WM_NAME(STRING) = title
+         */
+        /* class      instance    title       tags mask     isfloating   monitor */
+        { "Gimp",     NULL,       NULL,       0,            1,           -1 },
+        { "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
 };
 
 /* layout(s) */
@@ -40,19 +40,19 @@ static const int resizehints = 1;    /* 1 means respect size hints in tiled resi
 static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
 
 static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
+        /* symbol     arrange function */
+        { "[]=",      tile },    /* first entry is default */
+        { "><>",      NULL },    /* no layout function means floating behavior */
+        { "[M]",      monocle },
 };
 
 /* key definitions */
 #define MODKEY Mod4Mask
 #define TAGKEYS(KEY,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} },
+        { 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 in the pre dwm-5.0 fashion */
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
@@ -62,75 +62,78 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn()
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_purple, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "tmuterm", NULL };
 static const char *browsercmd[]  = { "tmubrowse", NULL };
-static const char *bupcmd[]  = { "brightnessup", NULL };                                 
-static const char *bdowncmd[]  = { "brightnessdown", NULL };                             
-static const char *bmaxcmd[]  = { "brightnessmax", NULL };                               
-static const char *upvol[]      = { "volumeup", NULL };  
-static const char *downvol[]    = { "volumedown", NULL };  
+static const char *bupcmd[]  = { "brightnessup", NULL };
+static const char *bdowncmd[]  = { "brightnessdown", NULL };
+static const char *bmaxcmd[]  = { "brightnessmax", NULL };
+static const char *upvol[]      = { "volumeup", NULL };
+static const char *downvol[]    = { "volumedown", NULL };
 static const char *mutevol[]    = { "volumemute", NULL };
 
-#include "movestack.c"
+/*
+ * #include "movestack.c"
+ */
 static const Key keys[] = {
-	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY,                       XK_e,      spawn,          {.v = browsercmd } },
-	{ 0,                            XF86XK_MonBrightnessUp, spawn,          {.v = bupcmd } },      
-	{ 0,                            XF86XK_MonBrightnessDown, spawn,          {.v = bdowncmd } },  
-	{ 0,                            XF86XK_Display, spawn,          {.v = bmaxcmd} },              
-	{ 0,                            XF86XK_AudioLowerVolume, spawn, {.v = downvol } },             
-	{ 0,                            XF86XK_AudioMute, spawn, {.v = mutevol } },                    
-	{ 0,                            XF86XK_AudioRaiseVolume, spawn, {.v = upvol   } },             
-	{ MODKEY,                       XK_b,      togglebar,      {0} },
-	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-	{ MODKEY,                       XK_o,      incnmaster,     {.i = -1 } },
-	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
-	{ MODKEY,                       XK_Return, zoom,           {0} },
-	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY,                       XK_w,      selectclient,   {0} },
-	{ MODKEY|ShiftMask,             XK_c,      killclient,     {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,                       XK_comma,  focusmon,       {.i = -1 } },
-	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-	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,      quitprompt,           {0} },
+        /* modifier                     key        function        argument */
+        { MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } },
+        { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+        { MODKEY,                       XK_e,      spawn,          {.v = browsercmd } },
+        { 0,                            XF86XK_MonBrightnessUp, spawn,          {.v = bupcmd } },
+        { 0,                            XF86XK_MonBrightnessDown, spawn,          {.v = bdowncmd } },
+        { 0,                            XF86XK_Display, spawn,          {.v = bmaxcmd} },
+        { 0,                            XF86XK_AudioLowerVolume, spawn, {.v = downvol } },
+        { 0,                            XF86XK_AudioMute, spawn, {.v = mutevol } },
+        { 0,                            XF86XK_AudioRaiseVolume, spawn, {.v = upvol   } },
+        { MODKEY,                       XK_b,      togglebar,      {0} },
+        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+        { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+        { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+        { MODKEY,                       XK_o,      incnmaster,     {.i = -1 } },
+        { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+        { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
+        /*
+         * { MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
+         * { MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
+         */
+        { MODKEY,                       XK_Return, zoom,           {0} },
+        { MODKEY,                       XK_Tab,    view,           {0} },
+        { MODKEY,                       XK_w,      selectclient,   {0} },
+        { MODKEY|ShiftMask,             XK_c,      killclient,     {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,                       XK_comma,  focusmon,       {.i = -1 } },
+        { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+        { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+        { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
+        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,      quitprompt,           {0} },
 };
 
 /* button definitions */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
-	/* click                event mask      button          function        argument */
-	{ 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} },
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
+        /* click                event mask      button          function        argument */
+        { 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} },
+        { ClkTagBar,            0,              Button1,        view,           {0} },
+        { ClkTagBar,            0,              Button3,        toggleview,     {0} },
+        { ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
+        { ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
 };
-
diff --git a/tree/src/dwm/dwm-6.6/config.h b/tree/src/dwm/dwm-6.6/config.h
deleted file mode 100644
index 7989be8..0000000
--- a/tree/src/dwm/dwm-6.6/config.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#include <X11/XF86keysym.h>
-
-/* appearance */
-static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int snap      = 1;       /* snap pixel */
-static const int showbar            = 1;        /* 0 means no bar */
-static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "monospace:size=10" };
-static const char dmenufont[]       = "monospace:size=10";
-static const char col_gray1[]       = "#222222";
-static const char col_gray2[]       = "#444444";
-static const char col_gray3[]       = "#bbbbbb";
-static const char col_gray4[]       = "#eeeeee";
-static const char col_purple[]      = "#6904f7";
-static const char *colors[][3]      = {
-	/*               fg         bg         border   */
-	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-	[SchemeSel]  = { col_gray4, col_purple,  col_purple  },
-};
-
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule rules[] = {
-	/* xprop(1):
-	 *	WM_CLASS(STRING) = instance, class
-	 *	WM_NAME(STRING) = title
-	 */
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
-};
-
-/* layout(s) */
-static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster     = 1;    /* number of clients in master area */
-static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
-static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
-};
-
-/* key definitions */
-#define MODKEY Mod4Mask
-#define TAGKEYS(KEY,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 in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_purple, "-sf", col_gray4, NULL };
-static const char *termcmd[]  = { "tmuterm", NULL };
-static const char *browsercmd[]  = { "tmubrowse", NULL };
-static const char *bupcmd[]  = { "brightnessup", NULL };                                 
-static const char *bdowncmd[]  = { "brightnessdown", NULL };                             
-static const char *bmaxcmd[]  = { "brightnessmax", NULL };                               
-static const char *upvol[]      = { "volumeup", NULL };  
-static const char *downvol[]    = { "volumedown", NULL };  
-static const char *mutevol[]    = { "volumemute", NULL };
-
-#include "movestack.c"
-static const Key keys[] = {
-	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY,                       XK_e,      spawn,          {.v = browsercmd } },
-	{ 0,                            XF86XK_MonBrightnessUp, spawn,          {.v = bupcmd } },      
-	{ 0,                            XF86XK_MonBrightnessDown, spawn,          {.v = bdowncmd } },  
-	{ 0,                            XF86XK_Display, spawn,          {.v = bmaxcmd} },              
-	{ 0,                            XF86XK_AudioLowerVolume, spawn, {.v = downvol } },             
-	{ 0,                            XF86XK_AudioMute, spawn, {.v = mutevol } },                    
-	{ 0,                            XF86XK_AudioRaiseVolume, spawn, {.v = upvol   } },             
-	{ MODKEY,                       XK_b,      togglebar,      {0} },
-	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-	{ MODKEY,                       XK_o,      incnmaster,     {.i = -1 } },
-	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
-	{ MODKEY,                       XK_Return, zoom,           {0} },
-	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY,                       XK_w,      selectclient,   {0} },
-	{ MODKEY|ShiftMask,             XK_c,      killclient,     {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,                       XK_comma,  focusmon,       {.i = -1 } },
-	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-	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,      quitprompt,           {0} },
-};
-
-/* button definitions */
-/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static const Button buttons[] = {
-	/* click                event mask      button          function        argument */
-	{ 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} },
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-};
-
diff --git a/tree/src/dwm/dwm-6.6/dwm b/tree/src/dwm/dwm-6.6/dwm
deleted file mode 100755
index 0304d57..0000000
--- a/tree/src/dwm/dwm-6.6/dwm
+++ /dev/null
diff --git a/tree/src/dwm/dwm-6.6/dwm.c b/tree/src/dwm/dwm-6.6/dwm.c
index e090a53..80cf56f 100644
--- a/tree/src/dwm/dwm-6.6/dwm.c
+++ b/tree/src/dwm/dwm-6.6/dwm.c
@@ -49,7 +49,7 @@
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
 #define INTERSECT(x,y,w,h,m)    (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
                                * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
-#define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
+#define ISVISIBLE(C, M)         ((C->tags & M->tagset[M->seltags]))
 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
@@ -67,85 +67,91 @@ enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
 
 typedef union {
-	int i;
-	unsigned int ui;
-	float f;
-	const void *v;
+        int i;
+        unsigned int ui;
+        float f;
+        const void *v;
 } Arg;
 
 typedef struct {
-	unsigned int click;
-	unsigned int mask;
-	unsigned int button;
-	void (*func)(const Arg *arg);
-	const Arg arg;
+        unsigned int click;
+        unsigned int mask;
+        unsigned int button;
+        void (*func)(const Arg *arg);
+        const Arg arg;
 } Button;
 
+typedef struct Clientlist Clientlist;
 typedef struct Monitor Monitor;
 typedef struct Client Client;
 struct Client {
-	char name[256];
-	float mina, maxa;
-	int x, y, w, h;
-	int oldx, oldy, oldw, oldh;
-	int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
-	int bw, oldbw;
-	unsigned int tags;
-	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-	Client *next;
-	Client *snext;
-	Monitor *mon;
-	Window win;
+        char name[256];
+        float mina, maxa;
+        int x, y, w, h;
+        int oldx, oldy, oldw, oldh;
+        int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
+        int bw, oldbw;
+        unsigned int tags;
+        int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+        Client *next;
+        Client *snext;
+        Monitor *mon;
+        Window win;
 };
 
 typedef struct {
-	unsigned int mod;
-	KeySym keysym;
-	void (*func)(const Arg *);
-	const Arg arg;
+        unsigned int mod;
+        KeySym keysym;
+        void (*func)(const Arg *);
+        const Arg arg;
 } Key;
 
 typedef struct {
-	const char *symbol;
-	void (*arrange)(Monitor *);
+        const char *symbol;
+        void (*arrange)(Monitor *);
 } Layout;
 
 struct Monitor {
-	char ltsymbol[16];
-	float mfact;
-	int nmaster;
-	int num;
-	int by;               /* bar geometry */
-	int mx, my, mw, mh;   /* screen size */
-	int wx, wy, ww, wh;   /* window area  */
-	unsigned int seltags;
-	unsigned int sellt;
-	unsigned int tagset[2];
-	int showbar;
-	int topbar;
-	Client *clients;
-	Client *sel;
-	Client *stack;
-	Monitor *next;
-	Window barwin;
-	const Layout *lt[2];
+        char ltsymbol[16];
+        float mfact;
+        int nmaster;
+        int num;
+        int by;               /* bar geometry */
+        int mx, my, mw, mh;   /* screen size */
+        int wx, wy, ww, wh;   /* window area  */
+        unsigned int seltags;
+        unsigned int sellt;
+        unsigned int tagset[2];
+        int showbar;
+        int topbar;
+        Clientlist *cl;
+        Client *sel;
+        Monitor *next;
+        Window barwin;
+        const Layout *lt[2];
 };
 
 typedef struct {
-	const char *class;
-	const char *instance;
-	const char *title;
-	unsigned int tags;
-	int isfloating;
-	int monitor;
+        const char *class;
+        const char *instance;
+        const char *title;
+        unsigned int tags;
+        int isfloating;
+        int monitor;
 } Rule;
 
+struct Clientlist {
+        Client *clients;
+        Client *stack;
+};
+
 /* function declarations */
 static void applyrules(Client *c);
 static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
 static void arrange(Monitor *m);
 static void arrangemon(Monitor *m);
 static void attach(Client *c);
+static void attachclients(Monitor *m);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
@@ -162,6 +168,7 @@ static void detachstack(Client *c);
 static Monitor *dirtomon(int dir);
 static void drawbar(Monitor *m);
 static void drawbars(void);
+static void enternotify(XEvent *e);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
@@ -182,7 +189,7 @@ static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);
-static Client *nexttiled(Client *c);
+static Client *nexttiled(Client *c, Monitor *m);
 static void pop(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
@@ -245,19 +252,20 @@ static int lrpad;            /* sum of left and right padding for text */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
-	[ButtonPress] = buttonpress,
-	[ClientMessage] = clientmessage,
-	[ConfigureRequest] = configurerequest,
-	[ConfigureNotify] = configurenotify,
-	[DestroyNotify] = destroynotify,
-	[Expose] = expose,
-	[FocusIn] = focusin,
-	[KeyPress] = keypress,
-	[MappingNotify] = mappingnotify,
-	[MapRequest] = maprequest,
-	[MotionNotify] = motionnotify,
-	[PropertyNotify] = propertynotify,
-	[UnmapNotify] = unmapnotify
+        [ButtonPress] = buttonpress,
+        [ClientMessage] = clientmessage,
+        [ConfigureRequest] = configurerequest,
+        [ConfigureNotify] = configurenotify,
+        [DestroyNotify] = destroynotify,
+        [EnterNotify] = enternotify,
+        [Expose] = expose,
+        [FocusIn] = focusin,
+        [KeyPress] = keypress,
+        [MappingNotify] = mappingnotify,
+        [MapRequest] = maprequest,
+        [MotionNotify] = motionnotify,
+        [PropertyNotify] = propertynotify,
+        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
 static int running = 1;
@@ -268,6 +276,7 @@ static Display *dpy;
 static Drw *drw;
 static Monitor *mons, *selmon;
 static Window root, wmcheckwin;
+static Clientlist *cl;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
@@ -279,1926 +288,2055 @@ struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
 void
 applyrules(Client *c)
 {
-	const char *class, *instance;
-	unsigned int i;
-	const Rule *r;
-	Monitor *m;
-	XClassHint ch = { NULL, NULL };
-
-	/* rule matching */
-	c->isfloating = 0;
-	c->tags = 0;
-	XGetClassHint(dpy, c->win, &ch);
-	class    = ch.res_class ? ch.res_class : broken;
-	instance = ch.res_name  ? ch.res_name  : broken;
-
-	for (i = 0; i < LENGTH(rules); i++) {
-		r = &rules[i];
-		if ((!r->title || strstr(c->name, r->title))
-		&& (!r->class || strstr(class, r->class))
-		&& (!r->instance || strstr(instance, r->instance)))
-		{
-			c->isfloating = r->isfloating;
-			c->tags |= r->tags;
-			for (m = mons; m && m->num != r->monitor; m = m->next);
-			if (m)
-				c->mon = m;
-		}
-	}
-	if (ch.res_class)
-		XFree(ch.res_class);
-	if (ch.res_name)
-		XFree(ch.res_name);
-	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
+        const char *class, *instance;
+        unsigned int i;
+        const Rule *r;
+        Monitor *m;
+        XClassHint ch = { NULL, NULL };
+
+        /* rule matching */
+        c->isfloating = 0;
+        c->tags = 0;
+        XGetClassHint(dpy, c->win, &ch);
+        class    = ch.res_class ? ch.res_class : broken;
+        instance = ch.res_name  ? ch.res_name  : broken;
+
+        for (i = 0; i < LENGTH(rules); i++) {
+                r = &rules[i];
+                if ((!r->title || strstr(c->name, r->title))
+                && (!r->class || strstr(class, r->class))
+                && (!r->instance || strstr(instance, r->instance)))
+                {
+                        c->isfloating = r->isfloating;
+                        c->tags |= r->tags;
+                        for (m = mons; m && (m->tagset[m->seltags] & c->tags) == 0; m = m->next);
+                        if (m)
+                                c->mon = m;
+                }
+        }
+        if (ch.res_class)
+                XFree(ch.res_class);
+        if (ch.res_name)
+                XFree(ch.res_name);
+        c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
 }
 
 int
 applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)
 {
-	int baseismin;
-	Monitor *m = c->mon;
-
-	/* set minimum possible */
-	*w = MAX(1, *w);
-	*h = MAX(1, *h);
-	if (interact) {
-		if (*x > sw)
-			*x = sw - WIDTH(c);
-		if (*y > sh)
-			*y = sh - HEIGHT(c);
-		if (*x + *w + 2 * c->bw < 0)
-			*x = 0;
-		if (*y + *h + 2 * c->bw < 0)
-			*y = 0;
-	} else {
-		if (*x >= m->wx + m->ww)
-			*x = m->wx + m->ww - WIDTH(c);
-		if (*y >= m->wy + m->wh)
-			*y = m->wy + m->wh - HEIGHT(c);
-		if (*x + *w + 2 * c->bw <= m->wx)
-			*x = m->wx;
-		if (*y + *h + 2 * c->bw <= m->wy)
-			*y = m->wy;
-	}
-	if (*h < bh)
-		*h = bh;
-	if (*w < bh)
-		*w = bh;
-	if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
-		if (!c->hintsvalid)
-			updatesizehints(c);
-		/* see last two sentences in ICCCM 4.1.2.3 */
-		baseismin = c->basew == c->minw && c->baseh == c->minh;
-		if (!baseismin) { /* temporarily remove base dimensions */
-			*w -= c->basew;
-			*h -= c->baseh;
-		}
-		/* adjust for aspect limits */
-		if (c->mina > 0 && c->maxa > 0) {
-			if (c->maxa < (float)*w / *h)
-				*w = *h * c->maxa + 0.5;
-			else if (c->mina < (float)*h / *w)
-				*h = *w * c->mina + 0.5;
-		}
-		if (baseismin) { /* increment calculation requires this */
-			*w -= c->basew;
-			*h -= c->baseh;
-		}
-		/* adjust for increment value */
-		if (c->incw)
-			*w -= *w % c->incw;
-		if (c->inch)
-			*h -= *h % c->inch;
-		/* restore base dimensions */
-		*w = MAX(*w + c->basew, c->minw);
-		*h = MAX(*h + c->baseh, c->minh);
-		if (c->maxw)
-			*w = MIN(*w, c->maxw);
-		if (c->maxh)
-			*h = MIN(*h, c->maxh);
-	}
-	return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
+        int baseismin;
+        Monitor *m = c->mon;
+
+        /* set minimum possible */
+        *w = MAX(1, *w);
+        *h = MAX(1, *h);
+        if (interact) {
+                if (*x > sw)
+                        *x = sw - WIDTH(c);
+                if (*y > sh)
+                        *y = sh - HEIGHT(c);
+                if (*x + *w + 2 * c->bw < 0)
+                        *x = 0;
+                if (*y + *h + 2 * c->bw < 0)
+                        *y = 0;
+        } else {
+                if (*x >= m->wx + m->ww)
+                        *x = m->wx + m->ww - WIDTH(c);
+                if (*y >= m->wy + m->wh)
+                        *y = m->wy + m->wh - HEIGHT(c);
+                if (*x + *w + 2 * c->bw <= m->wx)
+                        *x = m->wx;
+                if (*y + *h + 2 * c->bw <= m->wy)
+                        *y = m->wy;
+        }
+        if (*h < bh)
+                *h = bh;
+        if (*w < bh)
+                *w = bh;
+        if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
+                if (!c->hintsvalid)
+                        updatesizehints(c);
+                /* see last two sentences in ICCCM 4.1.2.3 */
+                baseismin = c->basew == c->minw && c->baseh == c->minh;
+                if (!baseismin) { /* temporarily remove base dimensions */
+                        *w -= c->basew;
+                        *h -= c->baseh;
+                }
+                /* adjust for aspect limits */
+                if (c->mina > 0 && c->maxa > 0) {
+                        if (c->maxa < (float)*w / *h)
+                                *w = *h * c->maxa + 0.5;
+                        else if (c->mina < (float)*h / *w)
+                                *h = *w * c->mina + 0.5;
+                }
+                if (baseismin) { /* increment calculation requires this */
+                        *w -= c->basew;
+                        *h -= c->baseh;
+                }
+                /* adjust for increment value */
+                if (c->incw)
+                        *w -= *w % c->incw;
+                if (c->inch)
+                        *h -= *h % c->inch;
+                /* restore base dimensions */
+                *w = MAX(*w + c->basew, c->minw);
+                *h = MAX(*h + c->baseh, c->minh);
+                if (c->maxw)
+                        *w = MIN(*w, c->maxw);
+                if (c->maxh)
+                        *h = MIN(*h, c->maxh);
+        }
+        return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
 }
 
 void
 arrange(Monitor *m)
 {
-	if (m)
-		showhide(m->stack);
-	else for (m = mons; m; m = m->next)
-		showhide(m->stack);
-	if (m) {
-		arrangemon(m);
-		restack(m);
-	} else for (m = mons; m; m = m->next)
-		arrangemon(m);
+        if (m)
+                showhide(m->cl->stack);
+        else for (m = mons; m; m = m->next)
+                showhide(m->cl->stack);
+        if (m) {
+                arrangemon(m);
+                restack(m);
+        } else for (m = mons; m; m = m->next)
+                arrangemon(m);
 }
 
 void
 arrangemon(Monitor *m)
 {
-	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
-	if (m->lt[m->sellt]->arrange)
-		m->lt[m->sellt]->arrange(m);
+        strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
+        if (m->lt[m->sellt]->arrange)
+                m->lt[m->sellt]->arrange(m);
 }
 
 void
 attach(Client *c)
 {
-	c->next = c->mon->clients;
-	c->mon->clients = c;
+        c->next = c->mon->cl->clients;
+        c->mon->cl->clients = c;
+}
+
+void
+attachclients(Monitor *m) {
+        /* attach clients to the specified monitor */
+        Monitor *tm;
+        Client *c;
+        unsigned int utags = 0;
+        Bool rmons = False;
+        if(!m)
+                return;
+
+        /* collect information about the tags in use */
+        for (tm = mons; tm; tm = tm->next)
+                if(tm != m)
+                        utags |= tm->tagset[tm->seltags];
+
+        for (c = m->cl->clients; c; c = c->next)
+                if(ISVISIBLE(c, m)) {
+                        /* if client is also visible on other tags that are displayed on
+                         * other monitors, remove these tags */
+                        if(c->tags & utags) {
+                                c->tags = c->tags & m->tagset[m->seltags];
+                                rmons = True;
+                        }
+                        unfocus(c, True);
+                        c->mon = m;
+                }
+
+        if (rmons)
+                for (tm = mons; tm; tm = tm->next)
+                        if(tm != m)
+                                arrange(tm);
+
 }
 
 void
 attachstack(Client *c)
 {
-	c->snext = c->mon->stack;
-	c->mon->stack = c;
+        c->snext = c->mon->cl->stack;
+        c->mon->cl->stack = c;
 }
 
 void
 buttonpress(XEvent *e)
 {
-	unsigned int i, x, click;
-	Arg arg = {0};
-	Client *c;
-	Monitor *m;
-	XButtonPressedEvent *ev = &e->xbutton;
-
-	click = ClkRootWin;
-	/* focus monitor if necessary */
-	if ((m = wintomon(ev->window)) && m != selmon) {
-		unfocus(selmon->sel, 1);
-		selmon = m;
-		focus(NULL);
-	}
-	if (ev->window == selmon->barwin) {
-		i = x = 0;
-		do
-			x += TEXTW(tags[i]);
-		while (ev->x >= x && ++i < LENGTH(tags));
-		if (i < LENGTH(tags)) {
-			click = ClkTagBar;
-			arg.ui = 1 << i;
-		} else if (ev->x < x + TEXTW(selmon->ltsymbol))
-			click = ClkLtSymbol;
-		else if (ev->x > selmon->ww - (int)TEXTW(stext))
-			click = ClkStatusText;
-		else
-			click = ClkWinTitle;
-	} else if ((c = wintoclient(ev->window))) {
-		focus(c);
-		restack(selmon);
-		XAllowEvents(dpy, ReplayPointer, CurrentTime);
-		click = ClkClientWin;
-	}
-	for (i = 0; i < LENGTH(buttons); i++)
-		if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
-		&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+        unsigned int i, x, click;
+        Arg arg = {0};
+        Client *c;
+        Monitor *m;
+        XButtonPressedEvent *ev = &e->xbutton;
+
+        click = ClkRootWin;
+        /* focus monitor if necessary */
+        if ((m = wintomon(ev->window)) && m != selmon) {
+                unfocus(selmon->sel, 1);
+                selmon = m;
+                focus(NULL);
+        }
+        if (ev->window == selmon->barwin) {
+                i = x = 0;
+                do
+                        x += TEXTW(tags[i]);
+                while (ev->x >= x && ++i < LENGTH(tags));
+                if (i < LENGTH(tags)) {
+                        click = ClkTagBar;
+                        arg.ui = 1 << i;
+                } else if (ev->x < x + TEXTW(selmon->ltsymbol))
+                        click = ClkLtSymbol;
+                else if (ev->x > selmon->ww - (int)TEXTW(stext))
+                        click = ClkStatusText;
+                else
+                        click = ClkWinTitle;
+        } else if ((c = wintoclient(ev->window))) {
+                focus(c);
+                restack(selmon);
+                XAllowEvents(dpy, ReplayPointer, CurrentTime);
+                click = ClkClientWin;
+        }
+        for (i = 0; i < LENGTH(buttons); i++)
+                if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+                && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+                        buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 }
 
 void
 checkotherwm(void)
 {
-	xerrorxlib = XSetErrorHandler(xerrorstart);
-	/* this causes an error if some other window manager is running */
-	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
-	XSync(dpy, False);
-	XSetErrorHandler(xerror);
-	XSync(dpy, False);
+        xerrorxlib = XSetErrorHandler(xerrorstart);
+        /* this causes an error if some other window manager is running */
+        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
+        XSync(dpy, False);
+        XSetErrorHandler(xerror);
+        XSync(dpy, False);
 }
 
 void
 cleanup(void)
 {
-	Arg a = {.ui = ~0};
-	Layout foo = { "", NULL };
-	Monitor *m;
-	size_t i;
-
-	view(&a);
-	selmon->lt[selmon->sellt] = &foo;
-	for (m = mons; m; m = m->next)
-		while (m->stack)
-			unmanage(m->stack, 0);
-	XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	while (mons)
-		cleanupmon(mons);
-	for (i = 0; i < CurLast; i++)
-		drw_cur_free(drw, cursor[i]);
-	for (i = 0; i < LENGTH(colors); i++)
-		free(scheme[i]);
-	free(scheme);
-	XDestroyWindow(dpy, wmcheckwin);
-	drw_free(drw);
-	XSync(dpy, False);
-	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-	XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+        Arg a = {.ui = ~0};
+        Layout foo = { "", NULL };
+        Monitor *m;
+        size_t i;
+
+        view(&a);
+        selmon->lt[selmon->sellt] = &foo;
+        for (m = mons; m; m = m->next)
+                while (m->cl->stack)
+                        unmanage(m->cl->stack, 0);
+        XUngrabKey(dpy, AnyKey, AnyModifier, root);
+        while (mons)
+                cleanupmon(mons);
+        for (i = 0; i < CurLast; i++)
+                drw_cur_free(drw, cursor[i]);
+        for (i = 0; i < LENGTH(colors); i++)
+                free(scheme[i]);
+        free(scheme);
+        XDestroyWindow(dpy, wmcheckwin);
+        drw_free(drw);
+        XSync(dpy, False);
+        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+        XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
 }
 
 void
 cleanupmon(Monitor *mon)
 {
-	Monitor *m;
+        Monitor *m;
 
-	if (mon == mons)
-		mons = mons->next;
-	else {
-		for (m = mons; m && m->next != mon; m = m->next);
-		m->next = mon->next;
-	}
-	XUnmapWindow(dpy, mon->barwin);
-	XDestroyWindow(dpy, mon->barwin);
-	free(mon);
+        if (mon == mons)
+                mons = mons->next;
+        else {
+                for (m = mons; m && m->next != mon; m = m->next);
+                m->next = mon->next;
+        }
+        XUnmapWindow(dpy, mon->barwin);
+        XDestroyWindow(dpy, mon->barwin);
+        free(mon);
 }
 
 void
 clientmessage(XEvent *e)
 {
-	XClientMessageEvent *cme = &e->xclient;
-	Client *c = wintoclient(cme->window);
+        XClientMessageEvent *cme = &e->xclient;
+        Client *c = wintoclient(cme->window);
 
-	if (!c)
-		return;
-	if (cme->message_type == netatom[NetWMState]) {
-		if (cme->data.l[1] == netatom[NetWMFullscreen]
-		|| cme->data.l[2] == netatom[NetWMFullscreen])
-			setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
-				|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
-	} else if (cme->message_type == netatom[NetActiveWindow]) {
-		if (c != selmon->sel && !c->isurgent)
-			seturgent(c, 1);
-	}
+        if (!c)
+                return;
+        if (cme->message_type == netatom[NetWMState]) {
+                if (cme->data.l[1] == netatom[NetWMFullscreen]
+                || cme->data.l[2] == netatom[NetWMFullscreen])
+                        setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
+                                || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
+        } else if (cme->message_type == netatom[NetActiveWindow]) {
+                if (c != selmon->sel && !c->isurgent)
+                        seturgent(c, 1);
+        }
 }
 
 void
 configure(Client *c)
 {
-	XConfigureEvent ce;
+        XConfigureEvent ce;
 
-	ce.type = ConfigureNotify;
-	ce.display = dpy;
-	ce.event = c->win;
-	ce.window = c->win;
-	ce.x = c->x;
-	ce.y = c->y;
-	ce.width = c->w;
-	ce.height = c->h;
-	ce.border_width = c->bw;
-	ce.above = None;
-	ce.override_redirect = False;
-	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
+        ce.type = ConfigureNotify;
+        ce.display = dpy;
+        ce.event = c->win;
+        ce.window = c->win;
+        ce.x = c->x;
+        ce.y = c->y;
+        ce.width = c->w;
+        ce.height = c->h;
+        ce.border_width = c->bw;
+        ce.above = None;
+        ce.override_redirect = False;
+        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
 void
 configurenotify(XEvent *e)
 {
-	Monitor *m;
-	Client *c;
-	XConfigureEvent *ev = &e->xconfigure;
-	int dirty;
-
-	/* TODO: updategeom handling sucks, needs to be simplified */
-	if (ev->window == root) {
-		dirty = (sw != ev->width || sh != ev->height);
-		sw = ev->width;
-		sh = ev->height;
-		if (updategeom() || dirty) {
-			drw_resize(drw, sw, bh);
-			updatebars();
-			for (m = mons; m; m = m->next) {
-				for (c = m->clients; c; c = c->next)
-					if (c->isfullscreen)
-						resizeclient(c, m->mx, m->my, m->mw, m->mh);
-				XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-			}
-			focus(NULL);
-			arrange(NULL);
-		}
-	}
+        Monitor *m;
+        Client *c;
+        XConfigureEvent *ev = &e->xconfigure;
+        int dirty;
+
+        /* TODO: updategeom handling sucks, needs to be simplified */
+        if (ev->window == root) {
+                dirty = (sw != ev->width || sh != ev->height);
+                sw = ev->width;
+                sh = ev->height;
+                if (updategeom() || dirty) {
+                        drw_resize(drw, sw, bh);
+                        updatebars();
+                        for (m = mons; m; m = m->next) {
+                                for (c = m->cl->clients; c; c = c->next)
+                                        if (c->isfullscreen)
+                                                resizeclient(c, m->mx, m->my, m->mw, m->mh);
+                                XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+                        }
+                        focus(NULL);
+                        arrange(NULL);
+                }
+        }
 }
 
 void
 configurerequest(XEvent *e)
 {
-	Client *c;
-	Monitor *m;
-	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XWindowChanges wc;
-
-	if ((c = wintoclient(ev->window))) {
-		if (ev->value_mask & CWBorderWidth)
-			c->bw = ev->border_width;
-		else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
-			m = c->mon;
-			if (ev->value_mask & CWX) {
-				c->oldx = c->x;
-				c->x = m->mx + ev->x;
-			}
-			if (ev->value_mask & CWY) {
-				c->oldy = c->y;
-				c->y = m->my + ev->y;
-			}
-			if (ev->value_mask & CWWidth) {
-				c->oldw = c->w;
-				c->w = ev->width;
-			}
-			if (ev->value_mask & CWHeight) {
-				c->oldh = c->h;
-				c->h = ev->height;
-			}
-			if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
-				c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
-			if ((c->y + c->h) > m->my + m->mh && c->isfloating)
-				c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
-			if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
-				configure(c);
-			if (ISVISIBLE(c))
-				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-		} else
-			configure(c);
-	} else {
-		wc.x = ev->x;
-		wc.y = ev->y;
-		wc.width = ev->width;
-		wc.height = ev->height;
-		wc.border_width = ev->border_width;
-		wc.sibling = ev->above;
-		wc.stack_mode = ev->detail;
-		XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-	}
-	XSync(dpy, False);
+        Client *c;
+        Monitor *m;
+        XConfigureRequestEvent *ev = &e->xconfigurerequest;
+        XWindowChanges wc;
+
+        if ((c = wintoclient(ev->window))) {
+                if (ev->value_mask & CWBorderWidth)
+                        c->bw = ev->border_width;
+                else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
+                        m = c->mon;
+                        if (ev->value_mask & CWX) {
+                                c->oldx = c->x;
+                                c->x = m->mx + ev->x;
+                        }
+                        if (ev->value_mask & CWY) {
+                                c->oldy = c->y;
+                                c->y = m->my + ev->y;
+                        }
+                        if (ev->value_mask & CWWidth) {
+                                c->oldw = c->w;
+                                c->w = ev->width;
+                        }
+                        if (ev->value_mask & CWHeight) {
+                                c->oldh = c->h;
+                                c->h = ev->height;
+                        }
+                        if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
+                                c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
+                        if ((c->y + c->h) > m->my + m->mh && c->isfloating)
+                                c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
+                        if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
+                                configure(c);
+                        if (ISVISIBLE(c, m))
+                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+                } else
+                        configure(c);
+        } else {
+                wc.x = ev->x;
+                wc.y = ev->y;
+                wc.width = ev->width;
+                wc.height = ev->height;
+                wc.border_width = ev->border_width;
+                wc.sibling = ev->above;
+                wc.stack_mode = ev->detail;
+                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
+        }
+        XSync(dpy, False);
 }
 
 Monitor *
 createmon(void)
 {
-	Monitor *m;
-
-	m = ecalloc(1, sizeof(Monitor));
-	m->tagset[0] = m->tagset[1] = 1;
-	m->mfact = mfact;
-	m->nmaster = nmaster;
-	m->showbar = showbar;
-	m->topbar = topbar;
-	m->lt[0] = &layouts[0];
-	m->lt[1] = &layouts[1 % LENGTH(layouts)];
-	strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-	return m;
+        Monitor *m, *tm;
+        int i;
+
+        /* bail out if the number of monitors exceeds the number of tags */
+        for (i=1, tm=mons; tm; i++, tm=tm->next);
+        if (i > LENGTH(tags)) {
+                fprintf(stderr, "dwm: failed to add monitor, number of tags exceeded\n");
+                return NULL;
+        }
+        /* find the first tag that isn't in use */
+        for (i=0; i < LENGTH(tags); i++) {
+                for (tm=mons; tm && !(tm->tagset[tm->seltags] & (1<<i)); tm=tm->next);
+                if (!tm)
+                        break;
+        }
+        /* reassign all tags to monitors since there's currently no free tag for the
+         * new monitor */
+        if (i >= LENGTH(tags))
+                for (i=0, tm=mons; tm; tm=tm->next, i++) {
+                        tm->seltags ^= 1;
+                        tm->tagset[tm->seltags] = (1<<i) & TAGMASK;
+                }
+
+        m = ecalloc(1, sizeof(Monitor));
+        m->cl = cl;
+        m->tagset[0] = m->tagset[1] = (1<<i) & TAGMASK;
+        m->mfact = mfact;
+        m->nmaster = nmaster;
+        m->showbar = showbar;
+        m->topbar = topbar;
+        m->lt[0] = &layouts[0];
+        m->lt[1] = &layouts[1 % LENGTH(layouts)];
+        strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+        return m;
 }
 
 void
 destroynotify(XEvent *e)
 {
-	Client *c;
-	XDestroyWindowEvent *ev = &e->xdestroywindow;
+        Client *c;
+        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
-	if ((c = wintoclient(ev->window)))
-		unmanage(c, 1);
+        if ((c = wintoclient(ev->window)))
+                unmanage(c, 1);
 }
 
 void
 detach(Client *c)
 {
-	Client **tc;
+        Client **tc;
 
-	for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
-	*tc = c->next;
+        for (tc = &c->mon->cl->clients; *tc && *tc != c; tc = &(*tc)->next);
+        *tc = c->next;
 }
 
 void
 detachstack(Client *c)
 {
-	Client **tc, *t;
+        Client **tc, *t;
 
-	for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
-	*tc = c->snext;
+        for (tc = &c->mon->cl->stack; *tc && *tc != c; tc = &(*tc)->snext);
+        *tc = c->snext;
 
-	if (c == c->mon->sel) {
-		for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
-		c->mon->sel = t;
-	}
+        if (c == c->mon->sel) {
+                for (t = c->mon->cl->stack; t && !ISVISIBLE(t, c->mon); t = t->snext);
+                c->mon->sel = t;
+        }
 }
 
 Monitor *
 dirtomon(int dir)
 {
-	Monitor *m = NULL;
+        Monitor *m = NULL;
 
-	if (dir > 0) {
-		if (!(m = selmon->next))
-			m = mons;
-	} else if (selmon == mons)
-		for (m = mons; m->next; m = m->next);
-	else
-		for (m = mons; m->next != selmon; m = m->next);
-	return m;
+        if (dir > 0) {
+                if (!(m = selmon->next))
+                        m = mons;
+        } else if (selmon == mons)
+                for (m = mons; m->next; m = m->next);
+        else
+                for (m = mons; m->next != selmon; m = m->next);
+        return m;
 }
 
 void
 drawbar(Monitor *m)
 {
-	int x, w, tw = 0;
-	int boxs = drw->fonts->h / 9;
-	int boxw = drw->fonts->h / 6 + 2;
-	unsigned int i, occ = 0, urg = 0;
-	Client *c;
-
-	if (!m->showbar)
-		return;
-
-	/* draw status first so it can be overdrawn by tags later */
-	if (m == selmon) { /* status is only drawn on selected monitor */
-		drw_setscheme(drw, scheme[SchemeNorm]);
-		tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
-		drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
-	}
-
-	for (c = m->clients; c; c = c->next) {
-		occ |= c->tags;
-		if (c->isurgent)
-			urg |= c->tags;
-	}
-	x = 0;
-	for (i = 0; i < LENGTH(tags); i++) {
-		w = TEXTW(tags[i]);
-		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
-		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
-		if (occ & 1 << i)
-			drw_rect(drw, x + boxs, boxs, boxw, boxw,
-				m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-				urg & 1 << i);
-		x += w;
-	}
-	w = TEXTW(m->ltsymbol);
-	drw_setscheme(drw, scheme[SchemeNorm]);
-	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
-
-	if ((w = m->ww - tw - x) > bh) {
-		if (m->sel) {
-			drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
-			drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
-			if (m->sel->isfloating)
-				drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
-		} else {
-			drw_setscheme(drw, scheme[SchemeNorm]);
-			drw_rect(drw, x, 0, w, bh, 1, 1);
-		}
-	}
-	drw_map(drw, m->barwin, 0, 0, m->ww, bh);
+        int x, w, tw = 0;
+        int boxs = drw->fonts->h / 9;
+        int boxw = drw->fonts->h / 6 + 2;
+        unsigned int i, occ = 0, urg = 0;
+        Client *c;
+
+        if (!m->showbar)
+                return;
+
+        /* draw status first so it can be overdrawn by tags later */
+        if (m == selmon) { /* status is only drawn on selected monitor */
+                drw_setscheme(drw, scheme[SchemeNorm]);
+                tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+                drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
+        }
+
+        for (c = m->cl->clients; c; c = c->next) {
+                occ |= c->tags;
+                if (c->isurgent)
+                        urg |= c->tags;
+        }
+        x = 0;
+        for (i = 0; i < LENGTH(tags); i++) {
+                w = TEXTW(tags[i]);
+                drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
+                drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
+                if (occ & 1 << i)
+                        drw_rect(drw, x + boxs, boxs, boxw, boxw,
+                                m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+                                urg & 1 << i);
+                x += w;
+        }
+        w = TEXTW(m->ltsymbol);
+        drw_setscheme(drw, scheme[SchemeNorm]);
+        x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+        if ((w = m->ww - tw - x) > bh) {
+                if (m->sel) {
+                        drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
+                        drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+                        if (m->sel->isfloating)
+                                drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
+                } else {
+                        drw_setscheme(drw, scheme[SchemeNorm]);
+                        drw_rect(drw, x, 0, w, bh, 1, 1);
+                }
+        }
+        drw_map(drw, m->barwin, 0, 0, m->ww, bh);
 }
 
 void
 drawbars(void)
 {
-	Monitor *m;
+        Monitor *m;
+
+        for (m = mons; m; m = m->next)
+                drawbar(m);
+}
+
+void
+enternotify(XEvent *e)
+{
+        Client *c;
+        Monitor *m;
+        XCrossingEvent *ev = &e->xcrossing;
 
-	for (m = mons; m; m = m->next)
-		drawbar(m);
+        if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
+                return;
+        c = wintoclient(ev->window);
+        m = c ? c->mon : wintomon(ev->window);
+        if (m != selmon) {
+                unfocus(selmon->sel, 1);
+                selmon = m;
+        } else if (!c || c == selmon->sel)
+                return;
+        focus(c);
 }
 
 void
 expose(XEvent *e)
 {
-	Monitor *m;
-	XExposeEvent *ev = &e->xexpose;
+        Monitor *m;
+        XExposeEvent *ev = &e->xexpose;
 
-	if (ev->count == 0 && (m = wintomon(ev->window)))
-		drawbar(m);
+        if (ev->count == 0 && (m = wintomon(ev->window)))
+                drawbar(m);
 }
 
 void
 focus(Client *c)
 {
-	if (!c || !ISVISIBLE(c))
-		for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
-	if (selmon->sel && selmon->sel != c)
-		unfocus(selmon->sel, 0);
-	if (c) {
-		if (c->mon != selmon)
-			selmon = c->mon;
-		if (c->isurgent)
-			seturgent(c, 0);
-		detachstack(c);
-		attachstack(c);
-		grabbuttons(c, 1);
-		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
-		setfocus(c);
-	} else {
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-	}
-	selmon->sel = c;
-	drawbars();
+        if (!c || !ISVISIBLE(c, selmon))
+                for (c = selmon->cl->stack; c && !ISVISIBLE(c, selmon); c = c->snext);
+        if (selmon->sel && selmon->sel != c)
+                unfocus(selmon->sel, 0);
+        if (c) {
+                if (c->mon != selmon)
+                        selmon = c->mon;
+                if (c->isurgent)
+                        seturgent(c, 0);
+                detachstack(c);
+                attachstack(c);
+                grabbuttons(c, 1);
+                XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
+                setfocus(c);
+        } else {
+                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+        }
+        selmon->sel = c;
+        drawbars();
 }
 
 /* there are some broken focus acquiring clients needing extra handling */
 void
 focusin(XEvent *e)
 {
-	XFocusChangeEvent *ev = &e->xfocus;
+        XFocusChangeEvent *ev = &e->xfocus;
 
-	if (selmon->sel && ev->window != selmon->sel->win)
-		setfocus(selmon->sel);
+        if (selmon->sel && ev->window != selmon->sel->win)
+                setfocus(selmon->sel);
 }
 
 void
 focusmon(const Arg *arg)
 {
-	Monitor *m;
+        Monitor *m;
 
-	if (!mons->next)
-		return;
-	if ((m = dirtomon(arg->i)) == selmon)
-		return;
-	unfocus(selmon->sel, 0);
-	selmon = m;
-	focus(NULL);
-	warp(selmon->sel);
+        if (!mons->next)
+                return;
+        if ((m = dirtomon(arg->i)) == selmon)
+                return;
+        unfocus(selmon->sel, 0);
+        selmon = m;
+        focus(NULL);
+        warp(selmon->sel);
 }
 
 void
 focusstack(const Arg *arg)
 {
-	Client *c = NULL, *i;
-
-	if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
-		return;
-	if (arg->i > 0) {
-		for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
-		if (!c)
-			for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
-	} else {
-		for (i = selmon->clients; i != selmon->sel; i = i->next)
-			if (ISVISIBLE(i))
-				c = i;
-		if (!c)
-			for (; i; i = i->next)
-				if (ISVISIBLE(i))
-					c = i;
-	}
-	if (c) {
-		focus(c);
-		restack(selmon);
-	}
+        Client *c = NULL, *i;
+
+        if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
+                return;
+        if (arg->i > 0) {
+                for (c = selmon->sel->next; c && !ISVISIBLE(c, selmon); c = c->next);
+                if (!c)
+                        for (c = selmon->cl->clients; c && !ISVISIBLE(c, selmon); c = c->next);
+        } else {
+                for (i = selmon->cl->clients; i != selmon->sel; i = i->next)
+                        if (ISVISIBLE(i, selmon))
+                                c = i;
+                if (!c)
+                        for (; i; i = i->next)
+                                if (ISVISIBLE(i, selmon))
+                                        c = i;
+        }
+        if (c) {
+                focus(c);
+                restack(selmon);
+        }
 }
 
 Atom
 getatomprop(Client *c, Atom prop)
 {
-	int di;
-	unsigned long dl;
-	unsigned char *p = NULL;
-	Atom da, atom = None;
+        int di;
+        unsigned long dl;
+        unsigned char *p = NULL;
+        Atom da, atom = None;
 
-	if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-		&da, &di, &dl, &dl, &p) == Success && p) {
-		atom = *(Atom *)p;
-		XFree(p);
-	}
-	return atom;
+        if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
+                &da, &di, &dl, &dl, &p) == Success && p) {
+                atom = *(Atom *)p;
+                XFree(p);
+        }
+        return atom;
 }
 
 int
 getrootptr(int *x, int *y)
 {
-	int di;
-	unsigned int dui;
-	Window dummy;
+        int di;
+        unsigned int dui;
+        Window dummy;
 
-	return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
+        return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
 }
 
 long
 getstate(Window w)
 {
-	int format;
-	long result = -1;
-	unsigned char *p = NULL;
-	unsigned long n, extra;
-	Atom real;
+        int format;
+        long result = -1;
+        unsigned char *p = NULL;
+        unsigned long n, extra;
+        Atom real;
 
-	if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-		&real, &format, &n, &extra, (unsigned char **)&p) != Success)
-		return -1;
-	if (n != 0)
-		result = *p;
-	XFree(p);
-	return result;
+        if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
+                &real, &format, &n, &extra, (unsigned char **)&p) != Success)
+                return -1;
+        if (n != 0)
+                result = *p;
+        XFree(p);
+        return result;
 }
 
 int
 gettextprop(Window w, Atom atom, char *text, unsigned int size)
 {
-	char **list = NULL;
-	int n;
-	XTextProperty name;
+        char **list = NULL;
+        int n;
+        XTextProperty name;
 
-	if (!text || size == 0)
-		return 0;
-	text[0] = '\0';
-	if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)
-		return 0;
-	if (name.encoding == XA_STRING) {
-		strncpy(text, (char *)name.value, size - 1);
-	} else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
-		strncpy(text, *list, size - 1);
-		XFreeStringList(list);
-	}
-	text[size - 1] = '\0';
-	XFree(name.value);
-	return 1;
+        if (!text || size == 0)
+                return 0;
+        text[0] = '\0';
+        if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)
+                return 0;
+        if (name.encoding == XA_STRING) {
+                strncpy(text, (char *)name.value, size - 1);
+        } else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
+                strncpy(text, *list, size - 1);
+                XFreeStringList(list);
+        }
+        text[size - 1] = '\0';
+        XFree(name.value);
+        return 1;
 }
 
 void
 grabbuttons(Client *c, int focused)
 {
-	updatenumlockmask();
-	{
-		unsigned int i, j;
-		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-		if (!focused)
-			XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-				BUTTONMASK, GrabModeSync, GrabModeSync, None, None);
-		for (i = 0; i < LENGTH(buttons); i++)
-			if (buttons[i].click == ClkClientWin)
-				for (j = 0; j < LENGTH(modifiers); j++)
-					XGrabButton(dpy, buttons[i].button,
-						buttons[i].mask | modifiers[j],
-						c->win, False, BUTTONMASK,
-						GrabModeAsync, GrabModeSync, None, None);
-	}
+        updatenumlockmask();
+        {
+                unsigned int i, j;
+                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+                XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+                if (!focused)
+                        XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+                                BUTTONMASK, GrabModeSync, GrabModeSync, None, None);
+                for (i = 0; i < LENGTH(buttons); i++)
+                        if (buttons[i].click == ClkClientWin)
+                                for (j = 0; j < LENGTH(modifiers); j++)
+                                        XGrabButton(dpy, buttons[i].button,
+                                                buttons[i].mask | modifiers[j],
+                                                c->win, False, BUTTONMASK,
+                                                GrabModeAsync, GrabModeSync, None, None);
+        }
 }
 
 void
 grabkeys(void)
 {
-	updatenumlockmask();
-	{
-		unsigned int i, j, k;
-		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-		int start, end, skip;
-		KeySym *syms;
-
-		XUngrabKey(dpy, AnyKey, AnyModifier, root);
-		XDisplayKeycodes(dpy, &start, &end);
-		syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip);
-		if (!syms)
-			return;
-		for (k = start; k <= end; k++)
-			for (i = 0; i < LENGTH(keys); i++)
-				/* skip modifier codes, we do that ourselves */
-				if (keys[i].keysym == syms[(k - start) * skip])
-					for (j = 0; j < LENGTH(modifiers); j++)
-						XGrabKey(dpy, k,
-							 keys[i].mod | modifiers[j],
-							 root, True,
-							 GrabModeAsync, GrabModeAsync);
-		XFree(syms);
-	}
+        updatenumlockmask();
+        {
+                unsigned int i, j, k;
+                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+                int start, end, skip;
+                KeySym *syms;
+
+                XUngrabKey(dpy, AnyKey, AnyModifier, root);
+                XDisplayKeycodes(dpy, &start, &end);
+                syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip);
+                if (!syms)
+                        return;
+                for (k = start; k <= end; k++)
+                        for (i = 0; i < LENGTH(keys); i++)
+                                /* skip modifier codes, we do that ourselves */
+                                if (keys[i].keysym == syms[(k - start) * skip])
+                                        for (j = 0; j < LENGTH(modifiers); j++)
+                                                XGrabKey(dpy, k,
+                                                         keys[i].mod | modifiers[j],
+                                                         root, True,
+                                                         GrabModeAsync, GrabModeAsync);
+                XFree(syms);
+        }
 }
 
 void
 incnmaster(const Arg *arg)
 {
-	selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-	arrange(selmon);
+        selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+        arrange(selmon);
 }
 
 #ifdef XINERAMA
 static int
 isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
 {
-	while (n--)
-		if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
-		&& unique[n].width == info->width && unique[n].height == info->height)
-			return 0;
-	return 1;
+        while (n--)
+                if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
+                && unique[n].width == info->width && unique[n].height == info->height)
+                        return 0;
+        return 1;
 }
 #endif /* XINERAMA */
 
 void
 keypress(XEvent *e)
 {
-	unsigned int i;
-	KeySym keysym;
-	XKeyEvent *ev;
+        unsigned int i;
+        KeySym keysym;
+        XKeyEvent *ev;
 
-	ev = &e->xkey;
-	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for (i = 0; i < LENGTH(keys); i++)
-		if (keysym == keys[i].keysym
-		&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-		&& keys[i].func)
-			keys[i].func(&(keys[i].arg));
+        ev = &e->xkey;
+        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+        for (i = 0; i < LENGTH(keys); i++)
+                if (keysym == keys[i].keysym
+                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+                && keys[i].func)
+                        keys[i].func(&(keys[i].arg));
 }
 
 void
 killclient(const Arg *arg)
 {
-	if (!selmon->sel)
-		return;
-	if (!sendevent(selmon->sel, wmatom[WMDelete])) {
-		XGrabServer(dpy);
-		XSetErrorHandler(xerrordummy);
-		XSetCloseDownMode(dpy, DestroyAll);
-		XKillClient(dpy, selmon->sel->win);
-		XSync(dpy, False);
-		XSetErrorHandler(xerror);
-		XUngrabServer(dpy);
-	}
+        if (!selmon->sel)
+                return;
+        if (!sendevent(selmon->sel, wmatom[WMDelete])) {
+                XGrabServer(dpy);
+                XSetErrorHandler(xerrordummy);
+                XSetCloseDownMode(dpy, DestroyAll);
+                XKillClient(dpy, selmon->sel->win);
+                XSync(dpy, False);
+                XSetErrorHandler(xerror);
+                XUngrabServer(dpy);
+        }
 }
 
 void
 manage(Window w, XWindowAttributes *wa)
 {
-	Client *c, *t = NULL;
-	Window trans = None;
-	XWindowChanges wc;
-
-	c = ecalloc(1, sizeof(Client));
-	c->win = w;
-	/* geometry */
-	c->x = c->oldx = wa->x;
-	c->y = c->oldy = wa->y;
-	c->w = c->oldw = wa->width;
-	c->h = c->oldh = wa->height;
-	c->oldbw = wa->border_width;
-
-	updatetitle(c);
-	if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
-		c->mon = t->mon;
-		c->tags = t->tags;
-	} else {
-		c->mon = selmon;
-		applyrules(c);
-	}
-
-	if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
-		c->x = c->mon->wx + c->mon->ww - WIDTH(c);
-	if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh)
-		c->y = c->mon->wy + c->mon->wh - HEIGHT(c);
-	c->x = MAX(c->x, c->mon->wx);
-	c->y = MAX(c->y, c->mon->wy);
-	c->bw = borderpx;
-
-	wc.border_width = c->bw;
-	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
-	XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
-	configure(c); /* propagates border_width, if size doesn't change */
-	updatewindowtype(c);
-	updatesizehints(c);
-	updatewmhints(c);
-	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
-	grabbuttons(c, 0);
-	if (!c->isfloating)
-		c->isfloating = c->oldstate = trans != None || c->isfixed;
-	if (c->isfloating)
-		XRaiseWindow(dpy, c->win);
-	attach(c);
-	attachstack(c);
-	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
-		(unsigned char *) &(c->win), 1);
-	XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
-	setclientstate(c, NormalState);
-	if (c->mon == selmon)
-		unfocus(selmon->sel, 0);
-	c->mon->sel = c;
-	arrange(c->mon);
-	XMapWindow(dpy, c->win);
-	focus(NULL);
+        Client *c, *t = NULL;
+        Window trans = None;
+        XWindowChanges wc;
+
+        c = ecalloc(1, sizeof(Client));
+        c->win = w;
+        /* geometry */
+        c->x = c->oldx = wa->x;
+        c->y = c->oldy = wa->y;
+        c->w = c->oldw = wa->width;
+        c->h = c->oldh = wa->height;
+        c->oldbw = wa->border_width;
+
+        updatetitle(c);
+        if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
+                c->mon = t->mon;
+                c->tags = t->tags;
+        } else {
+                c->mon = selmon;
+                applyrules(c);
+        }
+
+        if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
+                c->x = c->mon->wx + c->mon->ww - WIDTH(c);
+        if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh)
+                c->y = c->mon->wy + c->mon->wh - HEIGHT(c);
+        c->x = MAX(c->x, c->mon->wx);
+        c->y = MAX(c->y, c->mon->wy);
+        c->bw = borderpx;
+
+        wc.border_width = c->bw;
+        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+        XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
+        configure(c); /* propagates border_width, if size doesn't change */
+        updatewindowtype(c);
+        updatesizehints(c);
+        updatewmhints(c);
+        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
+        grabbuttons(c, 0);
+        if (!c->isfloating)
+                c->isfloating = c->oldstate = trans != None || c->isfixed;
+        if (c->isfloating)
+                XRaiseWindow(dpy, c->win);
+        attach(c);
+        attachstack(c);
+        XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
+                (unsigned char *) &(c->win), 1);
+        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
+        setclientstate(c, NormalState);
+        if (c->mon == selmon)
+                unfocus(selmon->sel, 0);
+        c->mon->sel = c;
+        arrange(c->mon);
+        XMapWindow(dpy, c->win);
+        focus(NULL);
 }
 
 void
 mappingnotify(XEvent *e)
 {
-	XMappingEvent *ev = &e->xmapping;
+        XMappingEvent *ev = &e->xmapping;
 
-	XRefreshKeyboardMapping(ev);
-	if (ev->request == MappingKeyboard)
-		grabkeys();
+        XRefreshKeyboardMapping(ev);
+        if (ev->request == MappingKeyboard)
+                grabkeys();
 }
 
 void
 maprequest(XEvent *e)
 {
-	static XWindowAttributes wa;
-	XMapRequestEvent *ev = &e->xmaprequest;
+        static XWindowAttributes wa;
+        XMapRequestEvent *ev = &e->xmaprequest;
 
-	if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
-		return;
-	if (!wintoclient(ev->window))
-		manage(ev->window, &wa);
+        if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
+                return;
+        if (!wintoclient(ev->window))
+                manage(ev->window, &wa);
 }
 
 void
 monocle(Monitor *m)
 {
-	unsigned int n = 0;
-	Client *c;
+        unsigned int n = 0;
+        Client *c;
 
-	for (c = m->clients; c; c = c->next)
-		if (ISVISIBLE(c))
-			n++;
-	if (n > 0) /* override layout symbol */
-		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
-	for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
-		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
+        for (c = m->cl->clients; c; c = c->next)
+                if (ISVISIBLE(c, m))
+                        n++;
+        if (n > 0) /* override layout symbol */
+                snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
+        for (c = nexttiled(m->cl->clients, m); c; c = nexttiled(c->next, m))
+                resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
 }
 
 void
 motionnotify(XEvent *e)
 {
-	static Monitor *mon = NULL;
-	Monitor *m;
-	XMotionEvent *ev = &e->xmotion;
+        static Monitor *mon = NULL;
+        Monitor *m;
+        XMotionEvent *ev = &e->xmotion;
 
-	if (ev->window != root)
-		return;
-	if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
-		unfocus(selmon->sel, 1);
-		selmon = m;
-		focus(NULL);
-	}
-	mon = m;
+        if (ev->window != root)
+                return;
+        if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
+                unfocus(selmon->sel, 1);
+                selmon = m;
+                focus(NULL);
+        }
+        mon = m;
 }
 
 void
 movemouse(const Arg *arg)
 {
-	int x, y, ocx, ocy, nx, ny;
-	Client *c;
-	Monitor *m;
-	XEvent ev;
-	Time lasttime = 0;
-
-	if (!(c = selmon->sel))
-		return;
-	if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
-		return;
-	restack(selmon);
-	ocx = c->x;
-	ocy = c->y;
-	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-		None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
-		return;
-	if (!getrootptr(&x, &y))
-		return;
-	do {
-		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-		switch(ev.type) {
-		case ConfigureRequest:
-		case Expose:
-		case MapRequest:
-			handler[ev.type](&ev);
-			break;
-		case MotionNotify:
-			if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-				continue;
-			lasttime = ev.xmotion.time;
-
-			nx = ocx + (ev.xmotion.x - x);
-			ny = ocy + (ev.xmotion.y - y);
-			if (abs(selmon->wx - nx) < snap)
-				nx = selmon->wx;
-			else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
-				nx = selmon->wx + selmon->ww - WIDTH(c);
-			if (abs(selmon->wy - ny) < snap)
-				ny = selmon->wy;
-			else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
-				ny = selmon->wy + selmon->wh - HEIGHT(c);
-			if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-			&& (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
-				togglefloating(NULL);
-			if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-				resize(c, nx, ny, c->w, c->h, 1);
-			break;
-		}
-	} while (ev.type != ButtonRelease);
-	XUngrabPointer(dpy, CurrentTime);
-	if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-		sendmon(c, m);
-		selmon = m;
-		focus(NULL);
-	}
+        int x, y, ocx, ocy, nx, ny;
+        Client *c;
+        Monitor *m;
+        XEvent ev;
+        Time lasttime = 0;
+
+        if (!(c = selmon->sel))
+                return;
+        if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
+                return;
+        restack(selmon);
+        ocx = c->x;
+        ocy = c->y;
+        if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
+                return;
+        if (!getrootptr(&x, &y))
+                return;
+        do {
+                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
+                switch(ev.type) {
+                case ConfigureRequest:
+                case Expose:
+                case MapRequest:
+                        handler[ev.type](&ev);
+                        break;
+                case MotionNotify:
+                        if ((ev.xmotion.time - lasttime) <= (1000 / 60))
+                                continue;
+                        lasttime = ev.xmotion.time;
+
+                        nx = ocx + (ev.xmotion.x - x);
+                        ny = ocy + (ev.xmotion.y - y);
+                        if (abs(selmon->wx - nx) < snap)
+                                nx = selmon->wx;
+                        else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
+                                nx = selmon->wx + selmon->ww - WIDTH(c);
+                        if (abs(selmon->wy - ny) < snap)
+                                ny = selmon->wy;
+                        else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
+                                ny = selmon->wy + selmon->wh - HEIGHT(c);
+                        if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
+                        && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                                togglefloating(NULL);
+                        if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                                resize(c, nx, ny, c->w, c->h, 1);
+                        break;
+                }
+        } while (ev.type != ButtonRelease);
+        XUngrabPointer(dpy, CurrentTime);
+        if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
+                sendmon(c, m);
+                selmon = m;
+                focus(NULL);
+        }
 }
 
 Client *
-nexttiled(Client *c)
+nexttiled(Client *c, Monitor *m)
 {
-	for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
-	return c;
+        for (; c && (c->isfloating || !ISVISIBLE(c, m)); c = c->next);
+        return c;
 }
 
 void
 pop(Client *c)
 {
-	detach(c);
-	attach(c);
-	focus(c);
-	arrange(c->mon);
+        detach(c);
+        attach(c);
+        focus(c);
+        arrange(c->mon);
 }
 
 void
 propertynotify(XEvent *e)
 {
-	Client *c;
-	Window trans;
-	XPropertyEvent *ev = &e->xproperty;
-
-	if ((ev->window == root) && (ev->atom == XA_WM_NAME))
-		updatestatus();
-	else if (ev->state == PropertyDelete)
-		return; /* ignore */
-	else if ((c = wintoclient(ev->window))) {
-		switch(ev->atom) {
-		default: break;
-		case XA_WM_TRANSIENT_FOR:
-			if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
-				(c->isfloating = (wintoclient(trans)) != NULL))
-				arrange(c->mon);
-			break;
-		case XA_WM_NORMAL_HINTS:
-			c->hintsvalid = 0;
-			break;
-		case XA_WM_HINTS:
-			updatewmhints(c);
-			drawbars();
-			break;
-		}
-		if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-			updatetitle(c);
-			if (c == c->mon->sel)
-				drawbar(c->mon);
-		}
-		if (ev->atom == netatom[NetWMWindowType])
-			updatewindowtype(c);
-	}
+        Client *c;
+        Window trans;
+        XPropertyEvent *ev = &e->xproperty;
+
+        if ((ev->window == root) && (ev->atom == XA_WM_NAME))
+                updatestatus();
+        else if (ev->state == PropertyDelete)
+                return; /* ignore */
+        else if ((c = wintoclient(ev->window))) {
+                switch(ev->atom) {
+                default: break;
+                case XA_WM_TRANSIENT_FOR:
+                        if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
+                                (c->isfloating = (wintoclient(trans)) != NULL))
+                                arrange(c->mon);
+                        break;
+                case XA_WM_NORMAL_HINTS:
+                        c->hintsvalid = 0;
+                        break;
+                case XA_WM_HINTS:
+                        updatewmhints(c);
+                        drawbars();
+                        break;
+                }
+                if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+                        updatetitle(c);
+                        if (c == c->mon->sel)
+                                drawbar(c->mon);
+                }
+                if (ev->atom == netatom[NetWMWindowType])
+                        updatewindowtype(c);
+        }
 }
 
 void
 quit(const Arg *arg)
 {
-	running = 0;
+        running = 0;
 }
 
 void
 quitprompt(const Arg *arg)
 {
-	FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r");
-	if(pp != NULL) {
-		char buf[1024];
-		if (fgets(buf, sizeof(buf), pp) == NULL) {
-			fprintf(stderr, "Quitprompt: Error reading pipe!\n");
-			return;
-		}
-		if (strcmp(buf, "yes\n") == 0) {
-			pclose(pp);
-			restart = 0;
-			quit(NULL);
-		} else if (strcmp(buf, "restart\n") == 0) {
-			pclose(pp);
-			restart = 1;
-			quit(NULL);
-		} else if (strcmp(buf, "no\n") == 0) {
-			pclose(pp);
-			return;
-		}
-	}
+        FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r");
+        if(pp != NULL) {
+                char buf[1024];
+                if (fgets(buf, sizeof(buf), pp) == NULL) {
+                        fprintf(stderr, "Quitprompt: Error reading pipe!\n");
+                        return;
+                }
+                if (strcmp(buf, "yes\n") == 0) {
+                        pclose(pp);
+                        restart = 0;
+                        quit(NULL);
+                } else if (strcmp(buf, "restart\n") == 0) {
+                        pclose(pp);
+                        restart = 1;
+                        quit(NULL);
+                } else if (strcmp(buf, "no\n") == 0) {
+                        pclose(pp);
+                        return;
+                }
+        }
 }
 
 Monitor *
 recttomon(int x, int y, int w, int h)
 {
-	Monitor *m, *r = selmon;
-	int a, area = 0;
+        Monitor *m, *r = selmon;
+        int a, area = 0;
 
-	for (m = mons; m; m = m->next)
-		if ((a = INTERSECT(x, y, w, h, m)) > area) {
-			area = a;
-			r = m;
-		}
-	return r;
+        for (m = mons; m; m = m->next)
+                if ((a = INTERSECT(x, y, w, h, m)) > area) {
+                        area = a;
+                        r = m;
+                }
+        return r;
 }
 
 void
 resize(Client *c, int x, int y, int w, int h, int interact)
 {
-	if (applysizehints(c, &x, &y, &w, &h, interact))
-		resizeclient(c, x, y, w, h);
+        if (applysizehints(c, &x, &y, &w, &h, interact))
+                resizeclient(c, x, y, w, h);
 }
 
 void
 resizeclient(Client *c, int x, int y, int w, int h)
 {
-	XWindowChanges wc;
-	unsigned int n;
-	Client *nbc;
+        XWindowChanges wc;
+        unsigned int n;
+        Client *nbc;
 
-	c->oldx = c->x; c->x = wc.x = x;
-	c->oldy = c->y; c->y = wc.y = y;
-	c->oldw = c->w; c->w = wc.width = w;
-	c->oldh = c->h; c->h = wc.height = h;
-	wc.border_width = c->bw;
+        c->oldx = c->x; c->x = wc.x = x;
+        c->oldy = c->y; c->y = wc.y = y;
+        c->oldw = c->w; c->w = wc.width = w;
+        c->oldh = c->h; c->h = wc.height = h;
+        wc.border_width = c->bw;
 
-	for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
+        for (n = 0, nbc = nexttiled(c, c->mon); nbc; nbc = nexttiled(nbc->next, nbc->mon), n++);
 
-	if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
-	} else {
-		if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
-			wc.border_width = 0;
-			c->w = wc.width += c->bw * 2;
-			c->h = wc.height += c->bw * 2;
-		}
-	}
+        if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
+        } else {
+                if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
+                        wc.border_width = 0;
+                        c->w = wc.width += c->bw * 2;
+                        c->h = wc.height += c->bw * 2;
+                }
+        }
 
-	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
-	configure(c);
-	XSync(dpy, False);
+        XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+        configure(c);
+        XSync(dpy, False);
 }
 
 void
 resizemouse(const Arg *arg)
 {
-	int ocx, ocy, nw, nh;
-	Client *c;
-	Monitor *m;
-	XEvent ev;
-	Time lasttime = 0;
-
-	if (!(c = selmon->sel))
-		return;
-	if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
-		return;
-	restack(selmon);
-	ocx = c->x;
-	ocy = c->y;
-	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-		None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
-		return;
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-	do {
-		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-		switch(ev.type) {
-		case ConfigureRequest:
-		case Expose:
-		case MapRequest:
-			handler[ev.type](&ev);
-			break;
-		case MotionNotify:
-			if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-				continue;
-			lasttime = ev.xmotion.time;
-
-			nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
-			nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-			if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
-			&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
-			{
-				if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-				&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
-					togglefloating(NULL);
-			}
-			if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-				resize(c, c->x, c->y, nw, nh, 1);
-			break;
-		}
-	} while (ev.type != ButtonRelease);
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-	XUngrabPointer(dpy, CurrentTime);
-	while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-	if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-		sendmon(c, m);
-		selmon = m;
-		focus(NULL);
-	}
+        int ocx, ocy, nw, nh;
+        Client *c;
+        Monitor *m;
+        XEvent ev;
+        Time lasttime = 0;
+
+        if (!(c = selmon->sel))
+                return;
+        if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
+                return;
+        restack(selmon);
+        ocx = c->x;
+        ocy = c->y;
+        if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
+                return;
+        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+        do {
+                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
+                switch(ev.type) {
+                case ConfigureRequest:
+                case Expose:
+                case MapRequest:
+                        handler[ev.type](&ev);
+                        break;
+                case MotionNotify:
+                        if ((ev.xmotion.time - lasttime) <= (1000 / 60))
+                                continue;
+                        lasttime = ev.xmotion.time;
+
+                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+                        if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
+                        && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
+                        {
+                                if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
+                                && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                                        togglefloating(NULL);
+                        }
+                        if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                                resize(c, c->x, c->y, nw, nh, 1);
+                        break;
+                }
+        } while (ev.type != ButtonRelease);
+        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+        XUngrabPointer(dpy, CurrentTime);
+        while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+        if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
+                sendmon(c, m);
+                selmon = m;
+                focus(NULL);
+        }
 }
 
 void
 restack(Monitor *m)
 {
-	Client *c;
-	XEvent ev;
-	XWindowChanges wc;
-
-	drawbar(m);
-	if (!m->sel)
-		return;
-	if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
-		XRaiseWindow(dpy, m->sel->win);
-	if (m->lt[m->sellt]->arrange) {
-		wc.stack_mode = Below;
-		wc.sibling = m->barwin;
-		for (c = m->stack; c; c = c->snext)
-			if (!c->isfloating && ISVISIBLE(c)) {
-				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
-				wc.sibling = c->win;
-			}
-	}
-	if (m == selmon && (m->tagset[m->seltags] & m->sel->tags) && m->lt[m->sellt]->arrange != &monocle)
-		warp(m->sel);
-	XSync(dpy, False);
-	while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+        Client *c;
+        XEvent ev;
+        XWindowChanges wc;
+
+        drawbar(m);
+        if (!m->sel)
+                return;
+        if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
+                XRaiseWindow(dpy, m->sel->win);
+        if (m->lt[m->sellt]->arrange) {
+                wc.stack_mode = Below;
+                wc.sibling = m->barwin;
+                for (c = m->cl->stack; c; c = c->snext)
+                        if (!c->isfloating && ISVISIBLE(c, m)) {
+                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+                                wc.sibling = c->win;
+                        }
+        }
+        if (m == selmon && (m->tagset[m->seltags] & m->sel->tags) && m->lt[m->sellt]->arrange != &monocle)
+                warp(m->sel);
+        XSync(dpy, False);
+        while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 run(void)
 {
-	XEvent ev;
-	/* main event loop */
-	XSync(dpy, False);
-	while (running && !XNextEvent(dpy, &ev))
-		if (handler[ev.type])
-			handler[ev.type](&ev); /* call handler */
+        XEvent ev;
+        /* main event loop */
+        XSync(dpy, False);
+        while (running && !XNextEvent(dpy, &ev))
+                if (handler[ev.type])
+                        handler[ev.type](&ev); /* call handler */
 }
 
 void
 scan(void)
 {
-	unsigned int i, num;
-	Window d1, d2, *wins = NULL;
-	XWindowAttributes wa;
-
-	if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
-		for (i = 0; i < num; i++) {
-			if (!XGetWindowAttributes(dpy, wins[i], &wa)
-			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
-				continue;
-			if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
-				manage(wins[i], &wa);
-		}
-		for (i = 0; i < num; i++) { /* now the transients */
-			if (!XGetWindowAttributes(dpy, wins[i], &wa))
-				continue;
-			if (XGetTransientForHint(dpy, wins[i], &d1)
-			&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
-				manage(wins[i], &wa);
-		}
-		if (wins)
-			XFree(wins);
-	}
+        unsigned int i, num;
+        Window d1, d2, *wins = NULL;
+        XWindowAttributes wa;
+
+        if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
+                for (i = 0; i < num; i++) {
+                        if (!XGetWindowAttributes(dpy, wins[i], &wa)
+                        || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+                                continue;
+                        if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+                                manage(wins[i], &wa);
+                }
+                for (i = 0; i < num; i++) { /* now the transients */
+                        if (!XGetWindowAttributes(dpy, wins[i], &wa))
+                                continue;
+                        if (XGetTransientForHint(dpy, wins[i], &d1)
+                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+                                manage(wins[i], &wa);
+                }
+                if (wins)
+                        XFree(wins);
+        }
 }
 
 void
 selectclient(const Arg *_arg)
 {
-	static const char* dmenuwincmd[] = { "dmenu", "-i", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_purple, "-sf", col_gray4, NULL };
-	Client *c;
-	int fds[4];		/* cin,sout,sin,cout */
-	const char ln = '\n';
-	char selected[257];
-	int ret;
-	struct sigaction sa;
-	Arg arg;
-
-	dmenumon[0] = '0' + selmon->num;
-	
-	if (pipe(fds))
-		return;
-	if (pipe(fds+2)) {
-		close(fds[0]);
-		close(fds[1]);
-		return;
-	}
-	if (fork() == 0) {
-		close(fds[1]);
-		close(fds[2]);
-		dup2(fds[0], 0);
-		dup2(fds[3], 1);
-
-		if (dpy)
-			close(ConnectionNumber(dpy));
-		setsid();
-
-		sigemptyset(&sa.sa_mask);
-		sa.sa_flags = 0;
-		sa.sa_handler = SIG_DFL;
-		sigaction(SIGCHLD, &sa, NULL);
-
-		execvp(((char **)dmenuwincmd)[0], (char **)dmenuwincmd);
-		die("dwm: execvp 'dmenu' for window select failed:");
-	}
-	close(fds[0]);
-	close(fds[3]);
-
-	for (c = selmon->clients; c; c = c->next) {
-		write(fds[1], c->name, strlen(c->name));
-		write(fds[1], &ln, 1);
-	}
-	close(fds[1]);
-	ret = read(fds[2], selected, 256);
-	for (int i = 0; i < 256 && (selected[i] != '\n' || (selected[i] = 0)); ++i);
-	close(fds[2]);
-	if (ret <= 0)
-		return;
-	for (c = selmon->clients; c; c = c->next) {
-		if (!strcmp(c->name, selected)) {
-			arg.ui = c->tags;
-			view(&arg);
-			focus(c);
-			return;
-		}
-
-	}
+        static const char* dmenuwincmd[] = { "dmenu", "-i", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_purple, "-sf", col_gray4, NULL };
+        Client *c;
+        int fds[4];             /* cin,sout,sin,cout */
+        const char ln = '\n';
+        char selected[257];
+        int ret;
+        struct sigaction sa;
+        Arg arg;
+
+        dmenumon[0] = '0' + selmon->num;
+
+        if (pipe(fds))
+                return;
+        if (pipe(fds+2)) {
+                close(fds[0]);
+                close(fds[1]);
+                return;
+        }
+        if (fork() == 0) {
+                close(fds[1]);
+                close(fds[2]);
+                dup2(fds[0], 0);
+                dup2(fds[3], 1);
+
+                if (dpy)
+                        close(ConnectionNumber(dpy));
+                setsid();
+
+                sigemptyset(&sa.sa_mask);
+                sa.sa_flags = 0;
+                sa.sa_handler = SIG_DFL;
+                sigaction(SIGCHLD, &sa, NULL);
+
+                execvp(((char **)dmenuwincmd)[0], (char **)dmenuwincmd);
+                die("dwm: execvp 'dmenu' for window select failed:");
+        }
+        close(fds[0]);
+        close(fds[3]);
+
+        for (c = selmon->cl->clients; c; c = c->next) {
+                write(fds[1], c->name, strlen(c->name));
+                write(fds[1], &ln, 1);
+        }
+        close(fds[1]);
+        ret = read(fds[2], selected, 256);
+        for (int i = 0; i < 256 && (selected[i] != '\n' || (selected[i] = 0)); ++i);
+        close(fds[2]);
+        if (ret <= 0)
+                return;
+        for (c = selmon->cl->clients; c; c = c->next) {
+                if (!strcmp(c->name, selected)) {
+                        arg.ui = c->tags;
+                        view(&arg);
+                        focus(c);
+                        return;
+                }
+
+        }
 }
 
 void
 sendmon(Client *c, Monitor *m)
 {
-	if (c->mon == m)
-		return;
-	unfocus(c, 1);
-	detach(c);
-	detachstack(c);
-	c->mon = m;
-	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-	attach(c);
-	attachstack(c);
-	focus(NULL);
-	arrange(NULL);
+        if (c->mon == m)
+                return;
+        unfocus(c, 1);
+        detachstack(c);
+        c->mon = m;
+        c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
+        attachstack(c);
+        focus(NULL);
+        arrange(NULL);
 }
 
 void
 setclientstate(Client *c, long state)
 {
-	long data[] = { state, None };
+        long data[] = { state, None };
 
-	XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
-		PropModeReplace, (unsigned char *)data, 2);
+        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
+                PropModeReplace, (unsigned char *)data, 2);
 }
 
 int
 sendevent(Client *c, Atom proto)
 {
-	int n;
-	Atom *protocols;
-	int exists = 0;
-	XEvent ev;
-
-	if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-		while (!exists && n--)
-			exists = protocols[n] == proto;
-		XFree(protocols);
-	}
-	if (exists) {
-		ev.type = ClientMessage;
-		ev.xclient.window = c->win;
-		ev.xclient.message_type = wmatom[WMProtocols];
-		ev.xclient.format = 32;
-		ev.xclient.data.l[0] = proto;
-		ev.xclient.data.l[1] = CurrentTime;
-		XSendEvent(dpy, c->win, False, NoEventMask, &ev);
-	}
-	return exists;
+        int n;
+        Atom *protocols;
+        int exists = 0;
+        XEvent ev;
+
+        if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+                while (!exists && n--)
+                        exists = protocols[n] == proto;
+                XFree(protocols);
+        }
+        if (exists) {
+                ev.type = ClientMessage;
+                ev.xclient.window = c->win;
+                ev.xclient.message_type = wmatom[WMProtocols];
+                ev.xclient.format = 32;
+                ev.xclient.data.l[0] = proto;
+                ev.xclient.data.l[1] = CurrentTime;
+                XSendEvent(dpy, c->win, False, NoEventMask, &ev);
+        }
+        return exists;
 }
 
 void
 setfocus(Client *c)
 {
-	if (!c->neverfocus) {
-		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		XChangeProperty(dpy, root, netatom[NetActiveWindow],
-			XA_WINDOW, 32, PropModeReplace,
-			(unsigned char *) &(c->win), 1);
-	}
-	sendevent(c, wmatom[WMTakeFocus]);
+        if (!c->neverfocus) {
+                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+                XChangeProperty(dpy, root, netatom[NetActiveWindow],
+                        XA_WINDOW, 32, PropModeReplace,
+                        (unsigned char *) &(c->win), 1);
+        }
+        sendevent(c, wmatom[WMTakeFocus]);
 }
 
 void
 setfullscreen(Client *c, int fullscreen)
 {
-	if (fullscreen && !c->isfullscreen) {
-		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-			PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
-		c->isfullscreen = 1;
-		c->oldstate = c->isfloating;
-		c->oldbw = c->bw;
-		c->bw = 0;
-		c->isfloating = 1;
-		resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
-		XRaiseWindow(dpy, c->win);
-	} else if (!fullscreen && c->isfullscreen){
-		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-			PropModeReplace, (unsigned char*)0, 0);
-		c->isfullscreen = 0;
-		c->isfloating = c->oldstate;
-		c->bw = c->oldbw;
-		c->x = c->oldx;
-		c->y = c->oldy;
-		c->w = c->oldw;
-		c->h = c->oldh;
-		resizeclient(c, c->x, c->y, c->w, c->h);
-		arrange(c->mon);
-	}
+        if (fullscreen && !c->isfullscreen) {
+                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                        PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+                c->isfullscreen = 1;
+                c->oldstate = c->isfloating;
+                c->oldbw = c->bw;
+                c->bw = 0;
+                c->isfloating = 1;
+                resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+                XRaiseWindow(dpy, c->win);
+        } else if (!fullscreen && c->isfullscreen){
+                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                        PropModeReplace, (unsigned char*)0, 0);
+                c->isfullscreen = 0;
+                c->isfloating = c->oldstate;
+                c->bw = c->oldbw;
+                c->x = c->oldx;
+                c->y = c->oldy;
+                c->w = c->oldw;
+                c->h = c->oldh;
+                resizeclient(c, c->x, c->y, c->w, c->h);
+                arrange(c->mon);
+        }
 }
 
 void
 setlayout(const Arg *arg)
 {
-	if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-		selmon->sellt ^= 1;
-	if (arg && arg->v)
-		selmon->lt[selmon->sellt] = (Layout *)arg->v;
-	strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
-	if (selmon->sel)
-		arrange(selmon);
-	else
-		drawbar(selmon);
+        if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+                selmon->sellt ^= 1;
+        if (arg && arg->v)
+                selmon->lt[selmon->sellt] = (Layout *)arg->v;
+        strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
+        if (selmon->sel)
+                arrange(selmon);
+        else
+                drawbar(selmon);
 }
 
 /* arg > 1.0 will set mfact absolutely */
 void
 setmfact(const Arg *arg)
 {
-	float f;
+        float f;
 
-	if (!arg || !selmon->lt[selmon->sellt]->arrange)
-		return;
-	f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
-	if (f < 0.05 || f > 0.95)
-		return;
-	selmon->mfact = f;
-	arrange(selmon);
+        if (!arg || !selmon->lt[selmon->sellt]->arrange)
+                return;
+        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+        if (f < 0.05 || f > 0.95)
+                return;
+        selmon->mfact = f;
+        arrange(selmon);
 }
 
 void
 setup(void)
 {
-	int i;
-	XSetWindowAttributes wa;
-	Atom utf8string;
-	struct sigaction sa;
-
-	/* do not transform children into zombies when they terminate */
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART;
-	sa.sa_handler = SIG_IGN;
-	sigaction(SIGCHLD, &sa, NULL);
-
-	/* clean up any zombies (inherited from .xinitrc etc) immediately */
-	while (waitpid(-1, NULL, WNOHANG) > 0);
-
-	/* init screen */
-	screen = DefaultScreen(dpy);
-	sw = DisplayWidth(dpy, screen);
-	sh = DisplayHeight(dpy, screen);
-	root = RootWindow(dpy, screen);
-	drw = drw_create(dpy, screen, root, sw, sh);
-	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
-		die("no fonts could be loaded.");
-	lrpad = drw->fonts->h;
-	bh = drw->fonts->h + 2;
-	updategeom();
-	/* init atoms */
-	utf8string = XInternAtom(dpy, "UTF8_STRING", False);
-	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
-	wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-	netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
-	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-	netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
-	netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
-	netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-	netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
-	netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
-	netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
-	/* init cursors */
-	cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
-	cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-	cursor[CurMove] = drw_cur_create(drw, XC_fleur);
-	/* init appearance */
-	scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
-	for (i = 0; i < LENGTH(colors); i++)
-		scheme[i] = drw_scm_create(drw, colors[i], 3);
-	/* init bars */
-	updatebars();
-	updatestatus();
-	/* supporting window for NetWMCheck */
-	wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
-	XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
-		PropModeReplace, (unsigned char *) &wmcheckwin, 1);
-	XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
-		PropModeReplace, (unsigned char *) "dwm", 3);
-	XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
-		PropModeReplace, (unsigned char *) &wmcheckwin, 1);
-	/* EWMH support per view */
-	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-		PropModeReplace, (unsigned char *) netatom, NetLast);
-	XDeleteProperty(dpy, root, netatom[NetClientList]);
-	/* select events */
-	wa.cursor = cursor[CurNormal]->cursor;
-	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
-		|ButtonPressMask|PointerMotionMask|EnterWindowMask
-		|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
-	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
-	XSelectInput(dpy, root, wa.event_mask);
-	grabkeys();
-	focus(NULL);
+        int i;
+        XSetWindowAttributes wa;
+        Atom utf8string;
+        struct sigaction sa;
+
+        /* do not transform children into zombies when they terminate */
+        sigemptyset(&sa.sa_mask);
+        sa.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART;
+        sa.sa_handler = SIG_IGN;
+        sigaction(SIGCHLD, &sa, NULL);
+
+        /* clean up any zombies (inherited from .xinitrc etc) immediately */
+        while (waitpid(-1, NULL, WNOHANG) > 0);
+
+        /* init screen */
+        screen = DefaultScreen(dpy);
+        sw = DisplayWidth(dpy, screen);
+        sh = DisplayHeight(dpy, screen);
+        if(!(cl = (Clientlist *)calloc(1, sizeof(Clientlist))))
+                die("fatal: could not malloc() %u bytes\n", sizeof(Clientlist));
+        root = RootWindow(dpy, screen);
+        drw = drw_create(dpy, screen, root, sw, sh);
+        if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+                die("no fonts could be loaded.");
+        lrpad = drw->fonts->h;
+        bh = drw->fonts->h + 2;
+        updategeom();
+        /* init atoms */
+        utf8string = XInternAtom(dpy, "UTF8_STRING", False);
+        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
+        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
+        wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+        netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
+        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
+        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
+        netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
+        netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
+        netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
+        netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
+        netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
+        netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
+        /* init cursors */
+        cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
+        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
+        cursor[CurMove] = drw_cur_create(drw, XC_fleur);
+        /* init appearance */
+        scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
+        for (i = 0; i < LENGTH(colors); i++)
+                scheme[i] = drw_scm_create(drw, colors[i], 3);
+        /* init bars */
+        updatebars();
+        updatestatus();
+        /* supporting window for NetWMCheck */
+        wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
+        XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
+                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
+        XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
+                PropModeReplace, (unsigned char *) "dwm", 3);
+        XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
+                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
+        /* EWMH support per view */
+        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                PropModeReplace, (unsigned char *) netatom, NetLast);
+        XDeleteProperty(dpy, root, netatom[NetClientList]);
+        /* select events */
+        wa.cursor = cursor[CurNormal]->cursor;
+        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+                |ButtonPressMask|PointerMotionMask|EnterWindowMask
+                |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
+        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+        XSelectInput(dpy, root, wa.event_mask);
+        grabkeys();
+        focus(NULL);
 }
 
 void
 seturgent(Client *c, int urg)
 {
-	XWMHints *wmh;
+        XWMHints *wmh;
 
-	c->isurgent = urg;
-	if (!(wmh = XGetWMHints(dpy, c->win)))
-		return;
-	wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
-	XSetWMHints(dpy, c->win, wmh);
-	XFree(wmh);
+        c->isurgent = urg;
+        if (!(wmh = XGetWMHints(dpy, c->win)))
+                return;
+        wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
+        XSetWMHints(dpy, c->win, wmh);
+        XFree(wmh);
 }
 
 void
 showhide(Client *c)
 {
-	if (!c)
-		return;
-	if (ISVISIBLE(c)) {
-		/* show clients top down */
-		XMoveWindow(dpy, c->win, c->x, c->y);
-		if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
-			resize(c, c->x, c->y, c->w, c->h, 0);
-		showhide(c->snext);
-	} else {
-		/* hide clients bottom up */
-		showhide(c->snext);
-		XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
-	}
+        if (!c)
+                return;
+        if (ISVISIBLE(c, c->mon)) {
+                /* show clients top down */
+                XMoveWindow(dpy, c->win, c->x, c->y);
+                if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
+                        resize(c, c->x, c->y, c->w, c->h, 0);
+                showhide(c->snext);
+        } else {
+                /* hide clients bottom up */
+                showhide(c->snext);
+                XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
+        }
 }
 
 void
 spawn(const Arg *arg)
 {
-	struct sigaction sa;
+        struct sigaction sa;
 
-	if (arg->v == dmenucmd)
-		dmenumon[0] = '0' + selmon->num;
-	if (fork() == 0) {
-		if (dpy)
-			close(ConnectionNumber(dpy));
-		setsid();
+        if (arg->v == dmenucmd)
+                dmenumon[0] = '0' + selmon->num;
+        if (fork() == 0) {
+                if (dpy)
+                        close(ConnectionNumber(dpy));
+                setsid();
 
-		sigemptyset(&sa.sa_mask);
-		sa.sa_flags = 0;
-		sa.sa_handler = SIG_DFL;
-		sigaction(SIGCHLD, &sa, NULL);
+                sigemptyset(&sa.sa_mask);
+                sa.sa_flags = 0;
+                sa.sa_handler = SIG_DFL;
+                sigaction(SIGCHLD, &sa, NULL);
 
-		execvp(((char **)arg->v)[0], (char **)arg->v);
-		die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]);
-	}
+                execvp(((char **)arg->v)[0], (char **)arg->v);
+                die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]);
+        }
 }
 
 void
 tag(const Arg *arg)
 {
-	if (selmon->sel && arg->ui & TAGMASK) {
-		selmon->sel->tags = arg->ui & TAGMASK;
-		focus(NULL);
-		arrange(selmon);
-	}
+        Monitor *m;
+        unsigned int newtags;
+        if (selmon->sel && arg->ui & TAGMASK) {
+                newtags = arg->ui & TAGMASK;
+                for (m = mons; m; m = m->next)
+                        /* if tag is visible on another monitor, move client to the new monitor */
+                        if (m != selmon && m->tagset[m->seltags] & newtags) {
+                                /* prevent moving client to all tags (MODKEY-Shift-0) when multiple monitors are connected */
+                                if(newtags & selmon->tagset[selmon->seltags])
+                                        return;
+                                selmon->sel->tags = newtags;
+                                selmon->sel->mon = m;
+                                arrange(m);
+                                break;
+                        }
+                /* workaround in case just one monitor is connected */
+
+                selmon->sel->tags = arg->ui & TAGMASK;
+                focus(NULL);
+                arrange(selmon);
+        }
 }
 
 void
 tagmon(const Arg *arg)
 {
-	if (!selmon->sel || !mons->next)
-		return;
-	sendmon(selmon->sel, dirtomon(arg->i));
+        if (!selmon->sel || !mons->next)
+                return;
+        sendmon(selmon->sel, dirtomon(arg->i));
 }
 
 void
 tile(Monitor *m)
 {
-	unsigned int i, n, h, mw, my, ty;
-	Client *c;
+        unsigned int i, n, h, mw, my, ty;
+        Client *c;
 
-	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-	if (n == 0)
-		return;
+        for (n = 0, c = nexttiled(m->cl->clients, m); c; c = nexttiled(c->next, m), n++);
+        if (n == 0)
+                return;
 
-	if (n > m->nmaster)
-		mw = m->nmaster ? m->ww * m->mfact : 0;
-	else
-		mw = m->ww;
-	for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-		if (i < m->nmaster) {
-			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
-			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
-			if (my + HEIGHT(c) < m->wh)
-				my += HEIGHT(c);
-		} else {
-			h = (m->wh - ty) / (n - i);
-			resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
-			if (ty + HEIGHT(c) < m->wh)
-				ty += HEIGHT(c);
-		}
+        if (n > m->nmaster)
+                mw = m->nmaster ? m->ww * m->mfact : 0;
+        else
+                mw = m->ww;
+        for (i = my = ty = 0, c = nexttiled(m->cl->clients, m); c; c = nexttiled(c->next, m), i++)
+                if (i < m->nmaster) {
+                        h = (m->wh - my) / (MIN(n, m->nmaster) - i);
+                        resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
+                        if (my + HEIGHT(c) < m->wh)
+                                my += HEIGHT(c);
+                } else {
+                        h = (m->wh - ty) / (n - i);
+                        resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
+                        if (ty + HEIGHT(c) < m->wh)
+                                ty += HEIGHT(c);
+                }
 }
 
 void
 togglebar(const Arg *arg)
 {
-	selmon->showbar = !selmon->showbar;
-	updatebarpos(selmon);
-	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
-	arrange(selmon);
+        selmon->showbar = !selmon->showbar;
+        updatebarpos(selmon);
+        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
+        arrange(selmon);
 }
 
 void
 togglefloating(const Arg *arg)
 {
-	if (!selmon->sel)
-		return;
-	if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
-		return;
-	selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
-	if (selmon->sel->isfloating)
-		resize(selmon->sel, selmon->sel->x, selmon->sel->y,
-			selmon->sel->w, selmon->sel->h, 0);
-	arrange(selmon);
+        if (!selmon->sel)
+                return;
+        if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
+                return;
+        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+        if (selmon->sel->isfloating)
+                resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+                        selmon->sel->w, selmon->sel->h, 0);
+        arrange(selmon);
 }
 
 void
 toggletag(const Arg *arg)
 {
-	unsigned int newtags;
+        Monitor *m;
+        unsigned int newtags;
 
-	if (!selmon->sel)
-		return;
-	newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
-	if (newtags) {
-		selmon->sel->tags = newtags;
-		focus(NULL);
-		arrange(selmon);
-	}
+        if (!selmon->sel)
+                return;
+        newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
+        if (newtags) {
+                /* prevent adding tags that are in use on other monitors */
+                for (m = mons; m; m = m->next)
+                        if (m != selmon && newtags & m->tagset[m->seltags])
+                                return;
+                selmon->sel->tags = newtags;
+                focus(NULL);
+                arrange(selmon);
+        }
 }
 
 void
 toggleview(const Arg *arg)
 {
-	unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+        Monitor *m;
+        unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+
+        if (newtagset) {
+                /* prevent displaying the same tags on multiple monitors */
+                for(m = mons; m; m = m->next)
+                        if(m != selmon && newtagset & m->tagset[m->seltags])
+                                return;
+                selmon->tagset[selmon->seltags] = newtagset;
+                attachclients(selmon);
+                arrange(selmon);
+                focus(NULL);
+
+                unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
 
-	if (newtagset) {
-		selmon->tagset[selmon->seltags] = newtagset;
-		focus(NULL);
-		arrange(selmon);
-	}
+                if (newtagset) {
+                        selmon->tagset[selmon->seltags] = newtagset;
+                        attachclients(selmon);
+                        arrange(selmon);
+                        focus(NULL);
+                }
+        }
 }
 
 void
 unfocus(Client *c, int setfocus)
 {
-	if (!c)
-		return;
-	grabbuttons(c, 0);
-	XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
-	if (setfocus) {
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-	}
+        if (!c)
+                return;
+        grabbuttons(c, 0);
+        XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
+        if (setfocus) {
+                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+        }
 }
 
 void
 unmanage(Client *c, int destroyed)
 {
-	Monitor *m = c->mon;
-	XWindowChanges wc;
-
-	detach(c);
-	detachstack(c);
-	if (!destroyed) {
-		wc.border_width = c->oldbw;
-		XGrabServer(dpy); /* avoid race conditions */
-		XSetErrorHandler(xerrordummy);
-		XSelectInput(dpy, c->win, NoEventMask);
-		XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-		setclientstate(c, WithdrawnState);
-		XSync(dpy, False);
-		XSetErrorHandler(xerror);
-		XUngrabServer(dpy);
-	}
-	free(c);
-	focus(NULL);
-	updateclientlist();
-	arrange(m);
+        Monitor *m = c->mon;
+        XWindowChanges wc;
+
+        detach(c);
+        detachstack(c);
+        if (!destroyed) {
+                wc.border_width = c->oldbw;
+                XGrabServer(dpy); /* avoid race conditions */
+                XSetErrorHandler(xerrordummy);
+                XSelectInput(dpy, c->win, NoEventMask);
+                XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+                XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+                setclientstate(c, WithdrawnState);
+                XSync(dpy, False);
+                XSetErrorHandler(xerror);
+                XUngrabServer(dpy);
+        }
+        free(c);
+        focus(NULL);
+        updateclientlist();
+        arrange(m);
 }
 
 void
 unmapnotify(XEvent *e)
 {
-	Client *c;
-	XUnmapEvent *ev = &e->xunmap;
+        Client *c;
+        XUnmapEvent *ev = &e->xunmap;
 
-	if ((c = wintoclient(ev->window))) {
-		if (ev->send_event)
-			setclientstate(c, WithdrawnState);
-		else
-			unmanage(c, 0);
-	}
+        if ((c = wintoclient(ev->window))) {
+                if (ev->send_event)
+                        setclientstate(c, WithdrawnState);
+                else
+                        unmanage(c, 0);
+        }
 }
 
 void
 updatebars(void)
 {
-	Monitor *m;
-	XSetWindowAttributes wa = {
-		.override_redirect = True,
-		.background_pixmap = ParentRelative,
-		.event_mask = ButtonPressMask|ExposureMask
-	};
-	XClassHint ch = {"dwm", "dwm"};
-	for (m = mons; m; m = m->next) {
-		if (m->barwin)
-			continue;
-		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-				CopyFromParent, DefaultVisual(dpy, screen),
-				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-		XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-		XMapRaised(dpy, m->barwin);
-		XSetClassHint(dpy, m->barwin, &ch);
-	}
+        Monitor *m;
+        XSetWindowAttributes wa = {
+                .override_redirect = True,
+                .background_pixmap = ParentRelative,
+                .event_mask = ButtonPressMask|ExposureMask
+        };
+        XClassHint ch = {"dwm", "dwm"};
+        for (m = mons; m; m = m->next) {
+                if (m->barwin)
+                        continue;
+                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
+                                CopyFromParent, DefaultVisual(dpy, screen),
+                                CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+                XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
+                XMapRaised(dpy, m->barwin);
+                XSetClassHint(dpy, m->barwin, &ch);
+        }
 }
 
 void
 updatebarpos(Monitor *m)
 {
-	m->wy = m->my;
-	m->wh = m->mh;
-	if (m->showbar) {
-		m->wh -= bh;
-		m->by = m->topbar ? m->wy : m->wy + m->wh;
-		m->wy = m->topbar ? m->wy + bh : m->wy;
-	} else
-		m->by = -bh;
+        m->wy = m->my;
+        m->wh = m->mh;
+        if (m->showbar) {
+                m->wh -= bh;
+                m->by = m->topbar ? m->wy : m->wy + m->wh;
+                m->wy = m->topbar ? m->wy + bh : m->wy;
+        } else
+                m->by = -bh;
 }
 
 void
 updateclientlist(void)
 {
-	Client *c;
-	Monitor *m;
+        Client *c;
+        Monitor *m;
 
-	XDeleteProperty(dpy, root, netatom[NetClientList]);
-	for (m = mons; m; m = m->next)
-		for (c = m->clients; c; c = c->next)
-			XChangeProperty(dpy, root, netatom[NetClientList],
-				XA_WINDOW, 32, PropModeAppend,
-				(unsigned char *) &(c->win), 1);
+        XDeleteProperty(dpy, root, netatom[NetClientList]);
+        for (m = mons; m; m = m->next)
+                for (c = m->cl->clients; c; c = c->next)
+                        XChangeProperty(dpy, root, netatom[NetClientList],
+                                XA_WINDOW, 32, PropModeAppend,
+                                (unsigned char *) &(c->win), 1);
 }
 
 int
 updategeom(void)
 {
-	int dirty = 0;
+        int dirty = 0;
 
 #ifdef XINERAMA
-	if (XineramaIsActive(dpy)) {
-		int i, j, n, nn;
-		Client *c;
-		Monitor *m;
-		XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
-		XineramaScreenInfo *unique = NULL;
-
-		for (n = 0, m = mons; m; m = m->next, n++);
-		/* only consider unique geometries as separate screens */
-		unique = ecalloc(nn, sizeof(XineramaScreenInfo));
-		for (i = 0, j = 0; i < nn; i++)
-			if (isuniquegeom(unique, j, &info[i]))
-				memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
-		XFree(info);
-		nn = j;
-
-		/* new monitors if nn > n */
-		for (i = n; i < nn; i++) {
-			for (m = mons; m && m->next; m = m->next);
-			if (m)
-				m->next = createmon();
-			else
-				mons = createmon();
-		}
-		for (i = 0, m = mons; i < nn && m; m = m->next, i++)
-			if (i >= n
-			|| unique[i].x_org != m->mx || unique[i].y_org != m->my
-			|| unique[i].width != m->mw || unique[i].height != m->mh)
-			{
-				dirty = 1;
-				m->num = i;
-				m->mx = m->wx = unique[i].x_org;
-				m->my = m->wy = unique[i].y_org;
-				m->mw = m->ww = unique[i].width;
-				m->mh = m->wh = unique[i].height;
-				updatebarpos(m);
-			}
-		/* removed monitors if n > nn */
-		for (i = nn; i < n; i++) {
-			for (m = mons; m && m->next; m = m->next);
-			while ((c = m->clients)) {
-				dirty = 1;
-				m->clients = c->next;
-				detachstack(c);
-				c->mon = mons;
-				attach(c);
-				attachstack(c);
-			}
-			if (m == selmon)
-				selmon = mons;
-			cleanupmon(m);
-		}
-		free(unique);
-	} else
+        if (XineramaIsActive(dpy)) {
+                int i, j, n, nn;
+                Client *c;
+                Monitor *m;
+                XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
+                XineramaScreenInfo *unique = NULL;
+
+                for (n = 0, m = mons; m; m = m->next, n++);
+                /* only consider unique geometries as separate screens */
+                unique = ecalloc(nn, sizeof(XineramaScreenInfo));
+                for (i = 0, j = 0; i < nn; i++)
+                        if (isuniquegeom(unique, j, &info[i]))
+                                memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
+                XFree(info);
+                nn = j;
+
+                /* new monitors if nn > n */
+                for (i = n; i < nn; i++) {
+                        for (m = mons; m && m->next; m = m->next);
+                        if (m) {
+                                m->next = createmon();
+                                attachclients(m->next);
+                        }
+                        else
+                                mons = createmon();
+                }
+                for (i = 0, m = mons; i < nn && m; m = m->next, i++)
+                        if (i >= n
+                        || unique[i].x_org != m->mx || unique[i].y_org != m->my
+                        || unique[i].width != m->mw || unique[i].height != m->mh)
+                        {
+                                dirty = 1;
+                                m->num = i;
+                                m->mx = m->wx = unique[i].x_org;
+                                m->my = m->wy = unique[i].y_org;
+                                m->mw = m->ww = unique[i].width;
+                                m->mh = m->wh = unique[i].height;
+                                updatebarpos(m);
+                        }
+                /* removed monitors if n > nn */
+                for (i = nn; i < n; i++) {
+                        for (m = mons; m && m->next; m = m->next);
+                        if (m == selmon)
+                                selmon = mons;
+                        for (c = m->cl->clients; c; c = c->next) {
+                                dirty = True;
+                                if (c->mon == m)
+                                        c->mon = selmon;
+                        }
+                        cleanupmon(m);
+                }
+                free(unique);
+        } else
 #endif /* XINERAMA */
-	{ /* default monitor setup */
-		if (!mons)
-			mons = createmon();
-		if (mons->mw != sw || mons->mh != sh) {
-			dirty = 1;
-			mons->mw = mons->ww = sw;
-			mons->mh = mons->wh = sh;
-			updatebarpos(mons);
-		}
-	}
-	if (dirty) {
-		selmon = mons;
-		selmon = wintomon(root);
-	}
-	return dirty;
+        { /* default monitor setup */
+                if (!mons)
+                        mons = createmon();
+                if (mons->mw != sw || mons->mh != sh) {
+                        dirty = 1;
+                        mons->mw = mons->ww = sw;
+                        mons->mh = mons->wh = sh;
+                        updatebarpos(mons);
+                }
+        }
+        if (dirty) {
+                selmon = mons;
+                selmon = wintomon(root);
+        }
+        return dirty;
 }
 
 void
 updatenumlockmask(void)
 {
-	unsigned int i, j;
-	XModifierKeymap *modmap;
+        unsigned int i, j;
+        XModifierKeymap *modmap;
 
-	numlockmask = 0;
-	modmap = XGetModifierMapping(dpy);
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < modmap->max_keypermod; j++)
-			if (modmap->modifiermap[i * modmap->max_keypermod + j]
-				== XKeysymToKeycode(dpy, XK_Num_Lock))
-				numlockmask = (1 << i);
-	XFreeModifiermap(modmap);
+        numlockmask = 0;
+        modmap = XGetModifierMapping(dpy);
+        for (i = 0; i < 8; i++)
+                for (j = 0; j < modmap->max_keypermod; j++)
+                        if (modmap->modifiermap[i * modmap->max_keypermod + j]
+                                == XKeysymToKeycode(dpy, XK_Num_Lock))
+                                numlockmask = (1 << i);
+        XFreeModifiermap(modmap);
 }
 
 void
 updatesizehints(Client *c)
 {
-	long msize;
-	XSizeHints size;
-
-	if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
-		/* size is uninitialized, ensure that size.flags aren't used */
-		size.flags = PSize;
-	if (size.flags & PBaseSize) {
-		c->basew = size.base_width;
-		c->baseh = size.base_height;
-	} else if (size.flags & PMinSize) {
-		c->basew = size.min_width;
-		c->baseh = size.min_height;
-	} else
-		c->basew = c->baseh = 0;
-	if (size.flags & PResizeInc) {
-		c->incw = size.width_inc;
-		c->inch = size.height_inc;
-	} else
-		c->incw = c->inch = 0;
-	if (size.flags & PMaxSize) {
-		c->maxw = size.max_width;
-		c->maxh = size.max_height;
-	} else
-		c->maxw = c->maxh = 0;
-	if (size.flags & PMinSize) {
-		c->minw = size.min_width;
-		c->minh = size.min_height;
-	} else if (size.flags & PBaseSize) {
-		c->minw = size.base_width;
-		c->minh = size.base_height;
-	} else
-		c->minw = c->minh = 0;
-	if (size.flags & PAspect) {
-		c->mina = (float)size.min_aspect.y / size.min_aspect.x;
-		c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
-	} else
-		c->maxa = c->mina = 0.0;
-	c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
-	c->hintsvalid = 1;
+        long msize;
+        XSizeHints size;
+
+        if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
+                /* size is uninitialized, ensure that size.flags aren't used */
+                size.flags = PSize;
+        if (size.flags & PBaseSize) {
+                c->basew = size.base_width;
+                c->baseh = size.base_height;
+        } else if (size.flags & PMinSize) {
+                c->basew = size.min_width;
+                c->baseh = size.min_height;
+        } else
+                c->basew = c->baseh = 0;
+        if (size.flags & PResizeInc) {
+                c->incw = size.width_inc;
+                c->inch = size.height_inc;
+        } else
+                c->incw = c->inch = 0;
+        if (size.flags & PMaxSize) {
+                c->maxw = size.max_width;
+                c->maxh = size.max_height;
+        } else
+                c->maxw = c->maxh = 0;
+        if (size.flags & PMinSize) {
+                c->minw = size.min_width;
+                c->minh = size.min_height;
+        } else if (size.flags & PBaseSize) {
+                c->minw = size.base_width;
+                c->minh = size.base_height;
+        } else
+                c->minw = c->minh = 0;
+        if (size.flags & PAspect) {
+                c->mina = (float)size.min_aspect.y / size.min_aspect.x;
+                c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
+        } else
+                c->maxa = c->mina = 0.0;
+        c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
+        c->hintsvalid = 1;
 }
 
 void
 updatestatus(void)
 {
-	if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
-		strcpy(stext, "dwm-"VERSION);
-	drawbar(selmon);
+        if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+                strcpy(stext, "dwm-"VERSION);
+        drawbar(selmon);
 }
 
 void
 updatetitle(Client *c)
 {
-	if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
-		gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
-	if (c->name[0] == '\0') /* hack to mark broken clients */
-		strcpy(c->name, broken);
+        if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
+                gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
+        if (c->name[0] == '\0') /* hack to mark broken clients */
+                strcpy(c->name, broken);
 }
 
 void
 updatewindowtype(Client *c)
 {
-	Atom state = getatomprop(c, netatom[NetWMState]);
-	Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
+        Atom state = getatomprop(c, netatom[NetWMState]);
+        Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
 
-	if (state == netatom[NetWMFullscreen])
-		setfullscreen(c, 1);
-	if (wtype == netatom[NetWMWindowTypeDialog])
-		c->isfloating = 1;
+        if (state == netatom[NetWMFullscreen])
+                setfullscreen(c, 1);
+        if (wtype == netatom[NetWMWindowTypeDialog])
+                c->isfloating = 1;
 }
 
 void
 updatewmhints(Client *c)
 {
-	XWMHints *wmh;
+        XWMHints *wmh;
 
-	if ((wmh = XGetWMHints(dpy, c->win))) {
-		if (c == selmon->sel && wmh->flags & XUrgencyHint) {
-			wmh->flags &= ~XUrgencyHint;
-			XSetWMHints(dpy, c->win, wmh);
-		} else
-			c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
-		if (wmh->flags & InputHint)
-			c->neverfocus = !wmh->input;
-		else
-			c->neverfocus = 0;
-		XFree(wmh);
-	}
+        if ((wmh = XGetWMHints(dpy, c->win))) {
+                if (c == selmon->sel && wmh->flags & XUrgencyHint) {
+                        wmh->flags &= ~XUrgencyHint;
+                        XSetWMHints(dpy, c->win, wmh);
+                } else
+                        c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
+                if (wmh->flags & InputHint)
+                        c->neverfocus = !wmh->input;
+                else
+                        c->neverfocus = 0;
+                XFree(wmh);
+        }
 }
 
 void
 view(const Arg *arg)
 {
-	if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
-		return;
-	selmon->seltags ^= 1; /* toggle sel tagset */
-	if (arg->ui & TAGMASK)
-		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-	focus(NULL);
-	arrange(selmon);
+        Monitor *m;
+        unsigned int newtagset = selmon->tagset[selmon->seltags ^ 1];
+        if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+                return;
+        /* swap tags when trying to display a tag from another monitor */
+        if (arg->ui & TAGMASK)
+                newtagset = arg->ui & TAGMASK;
+        for (m = mons; m; m = m->next)
+                if (m != selmon && newtagset & m->tagset[m->seltags]) {
+                        /* prevent displaying all tags (MODKEY-0) when multiple monitors
+                         * are connected */
+                        if (newtagset & selmon->tagset[selmon->seltags])
+                                return;
+                        m->sel = selmon->sel;
+                        m->seltags ^= 1;
+                        m->tagset[m->seltags] = selmon->tagset[selmon->seltags];
+                        attachclients(m);
+                        arrange(m);
+                        break;
+                }
+        selmon->seltags ^= 1; /* toggle sel tagset */
+        if (arg->ui & TAGMASK)
+                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+        attachclients(selmon);
+        arrange(selmon);
+        focus(NULL);
 }
 
 void
 warp(const Client *c)
 {
-	int x, y;
+        int x, y;
 
-	if (!c) {
-		XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx + selmon->ww / 2, selmon->wy + selmon->wh / 2);
-		return;
-	}
+        if (!c) {
+                XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx + selmon->ww / 2, selmon->wy + selmon->wh / 2);
+                return;
+        }
 
-	if (!getrootptr(&x, &y) ||
-		(x > c->x - c->bw &&
-		 y > c->y - c->bw &&
-		 x < c->x + c->w + c->bw*2 &&
-		 y < c->y + c->h + c->bw*2) ||
-		(y > c->mon->by && y < c->mon->by + bh) ||
-		(c->mon->topbar && !y))
-		return;
+        if (!getrootptr(&x, &y) ||
+                (x > c->x - c->bw &&
+                 y > c->y - c->bw &&
+                 x < c->x + c->w + c->bw*2 &&
+                 y < c->y + c->h + c->bw*2) ||
+                (y > c->mon->by && y < c->mon->by + bh) ||
+                (c->mon->topbar && !y))
+                return;
 
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
+        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
 }
 
 Client *
 wintoclient(Window w)
 {
-	Client *c;
-	Monitor *m;
+        Client *c;
+        Monitor *m;
 
-	for (m = mons; m; m = m->next)
-		for (c = m->clients; c; c = c->next)
-			if (c->win == w)
-				return c;
-	return NULL;
+        for (m = mons; m; m = m->next)
+                for (c = m->cl->clients; c; c = c->next)
+                        if (c->win == w)
+                                return c;
+        return NULL;
 }
 
 Monitor *
 wintomon(Window w)
 {
-	int x, y;
-	Client *c;
-	Monitor *m;
+        int x, y;
+        Client *c;
+        Monitor *m;
 
-	if (w == root && getrootptr(&x, &y))
-		return recttomon(x, y, 1, 1);
-	for (m = mons; m; m = m->next)
-		if (w == m->barwin)
-			return m;
-	if ((c = wintoclient(w)))
-		return c->mon;
-	return selmon;
+        if (w == root && getrootptr(&x, &y))
+                return recttomon(x, y, 1, 1);
+        for (m = mons; m; m = m->next)
+                if (w == m->barwin)
+                        return m;
+        if ((c = wintoclient(w)))
+                return c->mon;
+        return selmon;
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are
@@ -2207,25 +2345,25 @@ wintomon(Window w)
 int
 xerror(Display *dpy, XErrorEvent *ee)
 {
-	if (ee->error_code == BadWindow
-	|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
-	|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
-	|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
-	|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
-	|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
-	|| (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
-	|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
-	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
-		return 0;
-	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-		ee->request_code, ee->error_code);
-	return xerrorxlib(dpy, ee); /* may call exit */
+        if (ee->error_code == BadWindow
+        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
+        || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
+        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
+        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
+        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+        || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
+        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
+        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
+                return 0;
+        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
+                ee->request_code, ee->error_code);
+        return xerrorxlib(dpy, ee); /* may call exit */
 }
 
 int
 xerrordummy(Display *dpy, XErrorEvent *ee)
 {
-	return 0;
+        return 0;
 }
 
 /* Startup Error handler to check if another window manager
@@ -2233,45 +2371,45 @@ xerrordummy(Display *dpy, XErrorEvent *ee)
 int
 xerrorstart(Display *dpy, XErrorEvent *ee)
 {
-	die("dwm: another window manager is already running");
-	return -1;
+        die("dwm: another window manager is already running");
+        return -1;
 }
 
 void
 zoom(const Arg *arg)
 {
-	Client *c = selmon->sel;
+        Client *c = selmon->sel;
 
-	if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating)
-		return;
-	if (c == nexttiled(selmon->clients) && !(c = nexttiled(c->next)))
-		return;
-	pop(c);
+        if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating)
+                return;
+        if (c == nexttiled(selmon->cl->clients, selmon) && !(c = nexttiled(c->next, selmon)))
+                return;
+        pop(c);
 }
 
 int
 main(int argc, char *argv[])
 {
-	if (argc == 2 && !strcmp("-v", argv[1]))
-		die("dwm-"VERSION);
-	else if (argc != 1)
-		die("usage: dwm [-v]");
-	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		fputs("warning: no locale support\n", stderr);
-	if (!(dpy = XOpenDisplay(NULL)))
-		die("dwm: cannot open display");
-	checkotherwm();
-	setup();
+        if (argc == 2 && !strcmp("-v", argv[1]))
+                die("dwm-"VERSION);
+        else if (argc != 1)
+                die("usage: dwm [-v]");
+        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+                fputs("warning: no locale support\n", stderr);
+        if (!(dpy = XOpenDisplay(NULL)))
+                die("dwm: cannot open display");
+        checkotherwm();
+        setup();
 #ifdef __OpenBSD__
-	if (pledge("stdio rpath proc exec", NULL) == -1)
-		die("pledge");
+        if (pledge("stdio rpath proc exec", NULL) == -1)
+                die("pledge");
 #endif /* __OpenBSD__ */
-	scan();
-	run();
-	cleanup();
-	XCloseDisplay(dpy);
-	if (restart == 1) {
-		execlp("dwm", "dwm", NULL);
-	}
-	return EXIT_SUCCESS;
+        scan();
+        run();
+        cleanup();
+        XCloseDisplay(dpy);
+        if (restart == 1) {
+                execlp("dwm", "dwm", NULL);
+        }
+        return EXIT_SUCCESS;
 }