X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=47e9e49f17a01fb8e5ff3f33b5bf7f6d5131f578;hb=81658eaab3a0e1532543ab08a415cab3a044c0dd;hp=26e9de6cba1e1d2e340a79d8a11956932684a53d;hpb=37e062b0ed475fb6d9030f05b353c4fb79b7c6e5;p=dwm.git

diff --git a/layout.c b/layout.c
index 26e9de6..47e9e49 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,7 +216,10 @@ setlayout(const char *arg) {
 
 void
 togglebar(const char *arg) {
-	bpos = (bpos == BarOff) ? BARPOS : BarOff;
+	if(bpos == BarOff)
+		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+	else
+		bpos = BarOff;
 	updatebarpos();
 	lt->arrange();
 }