X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=abdf30fdb8c2493dd9824c455ff0cc755a2ece9c;hb=8439369db9e340bf260efb1c29282ccb5d224194;hp=5bb6e97348593facf5473ca4737575298580a7a2;hpb=5ad2828c579937afc3dc6da9987587e0eb2473dc;p=dwm.git

diff --git a/layout.c b/layout.c
index 5bb6e97..abdf30f 100644
--- a/layout.c
+++ b/layout.c
@@ -198,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);
@@ -218,10 +216,8 @@ setlayout(const char *arg) {
 
 void
 togglebar(const char *arg) {
-	if(bpos == BarOff) {
-		if((bpos = BARPOS) == BarOff)
-			bpos = BarTop;
-	}
+	if(bpos == BarOff)
+		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
 	else
 		bpos = BarOff;
 	updatebarpos();
@@ -251,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)))