X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=b54ccd4f30e9c068be1453b62fb4caf9e45075cc;hp=e3afc9a5cff2d8a2114694b939d085b4a9b78af7;hb=ab06f7444bf558d4a58e6ca617b1b4f55c6b00c7;hpb=a2a359097922111d13a1db7fd3da132cad84deaa

diff --git a/dwm.c b/dwm.c
index e3afc9a..b54ccd4 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1504,8 +1504,9 @@ tagmon(const Arg *arg) {
 			c->mon = m;
 			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 +1621,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);