X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/598e22907e6a3bcfbc35f913dae24d031d6f9170..5a9af492ae9fc6d28dc80bf3599d7eebda9136dd:/layout.c

diff --git a/layout.c b/layout.c
index 0f17b69..abdf30f 100644
--- a/layout.c
+++ b/layout.c
@@ -189,7 +189,6 @@ restack(void) {
 			XLowerWindow(dpy, c->win);
 		}
 	}
-	XRaiseWindow(dpy, barwin);
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
@@ -199,11 +198,9 @@ setlayout(const char *arg) {
 	int i;
 
 	if(!arg) {
-		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-		if(i == nlayouts - 1)
-			lt = &layout[0];
-		else
-			lt = &layout[++i];
+		lt++;
+		if(lt == layout + nlayouts)
+			lt = layout;
 	}
 	else {
 		i = atoi(arg);
@@ -250,7 +247,7 @@ void
 zoom(const char *arg) {
 	Client *c;
 
-	if(!sel || lt->arrange != tile || sel->isfloating)
+	if(!sel || lt->arrange == floating || sel->isfloating)
 		return;
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))