X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/fcd98308ba65c8872b485ac7f1800841b0a29e5c..c8a12a0852a9befbf5a073910e8b0291914f80ab:/client.c

diff --git a/client.c b/client.c
index 510ec59..7ccad39 100644
--- a/client.c
+++ b/client.c
@@ -79,31 +79,28 @@ configure(Client *c) {
 
 void
 focus(Client *c) {
-	Client *old = sel;
-
 	if(c && !isvisible(c))
 		return;
-
-	if(old && old != c) {
-		grabbuttons(old, False);
-		XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
+	if(sel && sel != c) {
+		grabbuttons(sel, False);
+		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 	}
 	if(c) {
-		if(issel) {
-			detachstack(c);
-			c->snext = stack;
-			stack = c;
-			grabbuttons(c, True);
-			XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
-			XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		}
-		else
-			XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
+		grabbuttons(c, True);
 	}
-	else if(issel)
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	sel = c;
 	drawstatus();
+	if(!activescreen)
+		return;
+	if(c) {
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
 Client *
@@ -160,6 +157,7 @@ manage(Window w, XWindowAttributes *wa) {
 		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 	XGetTransientForHint(dpy, c->win, &trans);
 	grabbuttons(c, False);
+	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
 	updatetitle(c);
 	settags(c, getclient(trans));
 	if(!c->isfloat)