Custom changes to multihead functionality

2 files changed, 14 insertions, 7 deletions

diff --git a/config.h b/config.h
index 7286cbf..e006e61 100644
--- a/config.h
+++ b/config.h
@@ -107,13 +107,10 @@ static const Key keys[] = {
 	{ MODKEY,            XK_d,                     incnmaster,        {.i = -1 } },
 	{ MODKEY|ShiftMask,  XK_d,                     incnmaster,        {.i = +1 } },
   { MODKEY,            XK_z,                     zoom,              {0} },
-	{ MODKEY,            XK_Tab,                   view,              {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 } },
+	{ MODKEY,            XK_Tab,                   focusmon,          {.i = +1 } },
+	{ MODKEY|ShiftMask,  XK_Tab,                   tagmon,            {.i = +1 } },
 	{ MODKEY,            XK_b,                     togglebar,         {0} },
 	{ MODKEY|ShiftMask,  XK_b,                     tabmode,           {-1} },
 
diff --git a/dwm.c b/dwm.c
index bce09fd..6470b69 100644
--- a/dwm.c
+++ b/dwm.c
@@ -2072,15 +2072,25 @@ sendmon(Client *c, Monitor *m)
 {
 	if (c->mon == m)
 		return;
+
+  int hadfocus = (c == selmon->sel);
+
 	unfocus(c, 1);
 	detach(c);
 	detachstack(c);
+  arrange(c->mon);
 	c->mon = m;
 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
 	attach(c);
 	attachstack(c);
-	focus(NULL);
-	arrange(NULL);
+  arrange(m);
+
+  if (hadfocus) {
+    focus(c);
+    restack(m);
+  } else {
+    focus(NULL);
+  }
 }
 
 void