X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/a2a359097922111d13a1db7fd3da132cad84deaa..e3f0445df1dcdd34189c9d48cbad67dd32764575:/dwm.c

diff --git a/dwm.c b/dwm.c
index e3afc9a..6459512 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1502,10 +1502,12 @@ tagmon(const Arg *arg) {
 			detach(c);
 			detachstack(c);
 			c->mon = m;
+			c->tags = selmon->seltags; /* assign tags of target monitor */
 			attach(c);
 			attachstack(c);
-			selmon->sel = selmon->stack;
 			m->sel = c;
+			for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+			selmon->sel = c;
 			arrange();
 			break;
 		}
@@ -1620,7 +1622,10 @@ unmanage(Client *c) {
 	detach(c);
 	detachstack(c);
 	if(c->mon->sel == c) {
-		c->mon->sel = c->mon->stack;
+		/* TODO: consider separate the next code into a function or into detachstack? */
+		Client *tc;
+		for(tc = c->mon->stack; tc && !ISVISIBLE(tc); tc = tc->snext);
+		c->mon->sel = tc;
 		focus(NULL);
 	}
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);