X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=2763d2c86c464331a694924ce87ea619a7d9f257;hb=96d7fe16eaf6b656800f08da3156bacd75ca3b08;hp=408a2a39406cbead25521b5ee14d0e8949cda653;hpb=2d81b78b853565a3e34a8a9190e2362a6fdde739;p=dwm.git

diff --git a/layout.c b/layout.c
index 408a2a3..2763d2c 100644
--- a/layout.c
+++ b/layout.c
@@ -1,11 +1,29 @@
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdlib.h>
+#include <string.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+
+/* static */
+
+typedef struct {
+	const char *symbol;
+	void (*arrange)(void);
+} Layout;
 
 unsigned int blw = 0;
-Layout *lt = NULL;
+static char prop[128];
+static unsigned int ltidx = 0; /* default */
 
-/* static */
+static void
+floating(void) { /* default floating layout */
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(isvisible(c))
+			resize(c, c->x, c->y, c->w, c->h, True);
+}
 
 static unsigned int nlayouts = 0;
 
@@ -14,22 +32,44 @@ LAYOUTS
 /* extern */
 
 void
-focusclient(const char *arg) {
+arrange(void) {
 	Client *c;
-   
-	if(!sel || !arg)
+
+	for(c = clients; c; c = c->next)
+		if(isvisible(c))
+			unban(c);
+		else
+			ban(c);
+	layouts[ltidx].arrange();
+	focus(NULL);
+	restack();
+}
+
+void
+focusnext(const char *arg) {
+	Client *c;
+
+	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);
@@ -37,19 +77,49 @@ focusclient(const char *arg) {
 	}
 }
 
+const char *
+getsymbol(void)
+{
+	return layouts[ltidx].symbol;
+}
+
+Bool
+isfloating(void) {
+	return layouts[ltidx].arrange == floating;
+}
+
+Bool
+isarrange(void (*func)())
+{
+	return func == layouts[ltidx].arrange;
+}
+
 void
 initlayouts(void) {
 	unsigned int i, w;
 
-	lt = &layout[0];
-	nlayouts = sizeof layout / sizeof layout[0];
+	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;
 	}
 }
 
+void
+loaddwmprops(void) {
+	unsigned int i;
+
+	if(gettextprop(root, dwmprops, prop, sizeof prop)) {
+		for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
+			seltags[i] = prop[i] == '1';
+		if(i < sizeof prop - 1 && prop[i] != '\0') {
+			if(prop[i] < nlayouts)
+				ltidx = prop[i];
+		}
+	}
+}
+
 Client *
 nexttiled(Client *c) {
 	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
@@ -65,9 +135,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) {
@@ -86,24 +156,37 @@ restack(void) {
 }
 
 void
+savedwmprops(void) {
+	unsigned int i;
+
+	for(i = 0; i < ntags && i < sizeof prop - 1; i++)
+		prop[i] = seltags[i] ? '1' : '0';
+	if(i < sizeof prop - 1)
+		prop[i++] = (char)ltidx;
+	prop[i] = '\0';
+	XChangeProperty(dpy, root, dwmprops, XA_STRING, 8,
+			PropModeReplace, (unsigned char *)prop, i);
+}
+
+void
 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)
-		lt->arrange();
+		arrange();
 	else
 		drawstatus();
+	savedwmprops();
 }
 
 void
@@ -113,5 +196,24 @@ togglebar(const char *arg) {
 	else
 		bpos = BarOff;
 	updatebarpos();
-	lt->arrange();
+	arrange();
+}
+
+void
+togglemax(const char *arg) {
+	XEvent ev;
+
+	if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)
+		return;
+	if((sel->ismax = !sel->ismax)) {
+		sel->rx = sel->x;
+		sel->ry = sel->y;
+		sel->rw = sel->w;
+		sel->rh = sel->h;
+		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
+	}
+	else
+		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
+	drawstatus();
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }