X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=14edf7c3ac71b4aefac8f1bcba6c436320ca2afa;hb=78b050c13c8ea660ed801c21bddd2957a2bc3f40;hp=8ec8ffb6836c8e69cd0877d68629a87b7b6a8be2;hpb=9fce8215b7c1b95903adbfd0cb7d6e2822ea063f;p=dwm.git

diff --git a/client.c b/client.c
index 8ec8ffb..14edf7c 100644
--- a/client.c
+++ b/client.c
@@ -24,7 +24,7 @@ resizetitle(Client *c)
 		c->tw = c->w + 2;
 	c->tx = c->x + c->w - c->tw + 2;
 	c->ty = c->y;
-	if(c->tags[tsel])
+	if(isvisible(c))
 		XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
 	else
 		XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
@@ -49,18 +49,17 @@ ban(Client *c)
 void
 focus(Client *c)
 {
-	if (!issel)
-		return;
 	Client *old = sel;
-	XEvent ev;
 
+	if (!issel)
+		return;
+	if(sel && sel->ismax)
+		togglemax(NULL);
 	sel = c;
 	if(old && old != c)
 		drawtitle(old);
 	drawtitle(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
@@ -71,14 +70,11 @@ focusnext(Arg *arg)
 	if(!sel)
 		return;
 
-	if(sel->ismax)
-		togglemax(NULL);
-
 	if(!(c = getnext(sel->next)))
 		c = getnext(clients);
 	if(c) {
-		higher(c);
 		focus(c);
+		restack();
 	}
 }
 
@@ -90,16 +86,13 @@ focusprev(Arg *arg)
 	if(!sel)
 		return;
 
-	if(sel->ismax)
-		togglemax(NULL);
-
 	if(!(c = getprev(sel->prev))) {
 		for(c = clients; c && c->next; c = c->next);
 		c = getprev(c);
 	}
 	if(c) {
-		higher(c);
 		focus(c);
+		restack();
 	}
 }
 
@@ -180,13 +173,6 @@ gravitate(Client *c, Bool invert)
 	c->y += dy;
 }
 
-void
-higher(Client *c)
-{
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
-}
-
 void
 killclient(Arg *arg)
 {
@@ -271,12 +257,13 @@ manage(Window w, XWindowAttributes *wa)
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
 	settitle(c);
-	arrange(NULL);
 
-	/* mapping the window now prevents flicker */
-	XMapRaised(dpy, c->win);
-	XMapRaised(dpy, c->title);
-	if(c->tags[tsel])
+	if(isvisible(c))
+		sel = c;
+	arrange(NULL);
+	XMapWindow(dpy, c->win);
+	XMapWindow(dpy, c->title);
+	if(isvisible(c))
 		focus(c);
 }
 
@@ -410,7 +397,7 @@ togglemax(Arg *arg)
 		sel->w = sw - 2;
 		sel->h = sh - 2 - bh;
 
-		higher(sel);
+		restack();
 		resize(sel, arrange == dofloat, TopLeft);
 
 		sel->x = ox;
@@ -438,22 +425,17 @@ unmanage(Client *c)
 		c->next->prev = c->prev;
 	if(c == clients)
 		clients = c->next;
-	if(sel == c) {
-		sel = getnext(c->next);
-		if(!sel)
-			sel = getprev(c->prev);
-		if(!sel)
-			sel = clients;
-	}
+	if(sel == c)
+		sel = getnext(clients);
 	free(c->tags);
 	free(c);
 
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	arrange(NULL);
 	if(sel)
 		focus(sel);
+	arrange(NULL);
 }
 
 void
@@ -472,15 +454,13 @@ zoom(Arg *arg)
 	}
 
 	/* pop */
-	if(sel->prev)
-		sel->prev->next = sel->next;
+	sel->prev->next = sel->next;
 	if(sel->next)
 		sel->next->prev = sel->prev;
 	sel->prev = NULL;
-	if(clients)
-		clients->prev = sel;
+	clients->prev = sel;
 	sel->next = clients;
 	clients = sel;
-	arrange(NULL);
 	focus(sel);
+	arrange(NULL);
 }