X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=layout.c;h=030c282ff4f6eb7a0b1fe6ae2541a010cd7ffbc7;hb=50be6c8b67c500ee4aa07919609fa80785fd389d;hp=c4670801b35db635a19cee0d00e78dfe2bcfa965;hpb=10bc0ce912eb99fec49d954c80d92e04429ed0ee;p=dwm.git

diff --git a/layout.c b/layout.c
index c467080..030c282 100644
--- a/layout.c
+++ b/layout.c
@@ -10,7 +10,7 @@ typedef struct {
 } Layout;
 
 unsigned int blw = 0;
-static Layout *lt = NULL;
+static unsigned int ltidx = 0; /* default */
 
 static void
 floating(void) { /* default floating layout */
@@ -36,7 +36,7 @@ arrange(void) {
 			unban(c);
 		else
 			ban(c);
-	lt->arrange();
+	layouts[ltidx].arrange();
 	focus(NULL);
 	restack();
 }
@@ -76,28 +76,28 @@ focusprev(const char *arg) {
 const char *
 getsymbol(void)
 {
-	return lt->symbol;
+	return layouts[ltidx].symbol;
 }
 
 Bool
 isfloating(void) {
-	return lt->arrange == floating;
+	return layouts[ltidx].arrange == floating;
 }
 
 Bool
 isarrange(void (*func)())
 {
-	return func == lt->arrange;
+	return func == layouts[ltidx].arrange;
 }
 
 void
 initlayouts(void) {
 	unsigned int i, w;
 
-	lt = &layout[0];
-	nlayouts = sizeof layout / sizeof layout[0];
+	/* TODO deserialize ltidx if present */
+	nlayouts = sizeof layouts / sizeof layouts[0];
 	for(blw = i = 0; i < nlayouts; i++) {
-		w = textw(layout[i].symbol);
+		w = textw(layouts[i].symbol);
 		if(w > blw)
 			blw = w;
 	}
@@ -118,9 +118,9 @@ restack(void) {
 	drawstatus();
 	if(!sel)
 		return;
-	if(sel->isfloating || lt->arrange == floating)
+	if(sel->isfloating || isfloating())
 		XRaiseWindow(dpy, sel->win);
-	if(lt->arrange != floating) {
+	if(!isfloating()) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
 		if(!sel->isfloating) {
@@ -143,15 +143,14 @@ setlayout(const char *arg) {
 	int i;
 
 	if(!arg) {
-		lt++;
-		if(lt == layout + nlayouts)
-			lt = layout;
+		if(++ltidx == nlayouts)
+			ltidx = 0;;
 	}
 	else {
 		i = atoi(arg);
 		if(i < 0 || i >= nlayouts)
 			return;
-		lt = &layout[i];
+		ltidx = i;
 	}
 	if(sel)
 		arrange();
@@ -173,7 +172,7 @@ void
 togglemax(const char *arg) {
 	XEvent ev;
 
-	if(!sel || (lt->arrange != floating && !sel->isfloating) || sel->isfixed)
+	if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)
 		return;
 	if((sel->ismax = !sel->ismax)) {
 		sel->rx = sel->x;