X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=7ccad39fd1df10206b06f557027cf606b50f8b0c;hb=c8a12a0852a9befbf5a073910e8b0291914f80ab;hp=177eb940d44711e42f5660e99ab5506f8994331a;hpb=b233089815367983e07939b2aabb999fdc359f91;p=dwm.git

diff --git a/client.c b/client.c
index 177eb94..7ccad39 100644
--- a/client.c
+++ b/client.c
@@ -79,27 +79,28 @@ configure(Client *c) {
 
 void
 focus(Client *c) {
-	Client *old = sel;
-
-	if(!issel || (c && !isvisible(c)))
+	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) {
 		detachstack(c);
 		c->snext = stack;
 		stack = c;
 		grabbuttons(c, True);
+	}
+	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);
-	sel = c;
-	drawstatus();
 }
 
 Client *
@@ -156,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)