X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=573de575c62934ac64ea928892867e8d195957dc;hb=55d8dda9f45503f25804a9dbfeb4c878284a6576;hp=a660fd7dd93c9527b64288d4a4b9da85685270a4;hpb=77044e876511f51c34bde379d89e2de754707ee6;p=dwm.git

diff --git a/layout.c b/layout.c
index a660fd7..573de57 100644
--- a/layout.c
+++ b/layout.c
@@ -2,18 +2,18 @@
 #include "dwm.h"
 #include <stdlib.h>
 
+/* static */
+
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
 } Layout;
 
 unsigned int blw = 0;
-static Layout *lt = NULL;
-
-/* static */
+static unsigned int sellayout = 0; /* default */
 
 static void
-floating(void) {
+floating(void) { /* default floating layout */
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -36,28 +36,36 @@ arrange(void) {
 			unban(c);
 		else
 			ban(c);
-	lt->arrange();
+	layouts[sellayout].arrange();
 	focus(NULL);
 	restack();
 }
 
 void
-focusclient(const char *arg) {
+focusnext(const char *arg) {
 	Client *c;
-   
-	if(!sel || !arg)
+
+	if(!sel)
 		return;
-	if(atoi(arg) < 0) {
-		for(c = sel->prev; c && !isvisible(c); c = c->prev);
-		if(!c) {
-			for(c = clients; c && c->next; c = c->next);
-			for(; c && !isvisible(c); c = c->prev);
-		}
+	for(c = sel->next; c && !isvisible(c); c = c->next);
+	if(!c)
+		for(c = clients; c && !isvisible(c); c = c->next);
+	if(c) {
+		focus(c);
+		restack();
 	}
-	else {
-		for(c = sel->next; c && !isvisible(c); c = c->next);
-		if(!c)
-			for(c = clients; c && !isvisible(c); c = c->next);
+}
+
+void
+focusprev(const char *arg) {
+	Client *c;
+
+	if(!sel)
+		return;
+	for(c = sel->prev; c && !isvisible(c); c = c->prev);
+	if(!c) {
+		for(c = clients; c && c->next; c = c->next);
+		for(; c && !isvisible(c); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -68,28 +76,28 @@ focusclient(const char *arg) {
 const char *
 getsymbol(void)
 {
-	return lt->symbol;
+	return layouts[sellayout].symbol;
 }
 
 Bool
 isfloating(void) {
-	return lt->arrange == floating;
+	return layouts[sellayout].arrange == floating;
 }
 
 Bool
 isarrange(void (*func)())
 {
-	return func == lt->arrange;
+	return func == layouts[sellayout].arrange;
 }
 
 void
 initlayouts(void) {
 	unsigned int i, w;
 
-	lt = &layout[0];
-	nlayouts = sizeof layout / sizeof layout[0];
+	/* TODO deserialize sellayout 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;
 	}
@@ -110,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) {
@@ -135,15 +143,14 @@ setlayout(const char *arg) {
 	int i;
 
 	if(!arg) {
-		lt++;
-		if(lt == layout + nlayouts)
-			lt = layout;
+		if(++sellayout == nlayouts)
+			sellayout = 0;;
 	}
 	else {
 		i = atoi(arg);
 		if(i < 0 || i >= nlayouts)
 			return;
-		lt = &layout[i];
+		sellayout = i;
 	}
 	if(sel)
 		arrange();
@@ -165,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;