X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=aa3bff5de42fa0b124f371d65c01b3bba7a53c87;hb=0c6062041035105c6266f6bedb286c1990516fa7;hp=46e82c2ad834b943ecabd8b932a1a6b7b602522c;hpb=04dec4c94390fdf57893615de5b5872dd5abbce4;p=dwm.git

diff --git a/layout.c b/layout.c
index 46e82c2..aa3bff5 100644
--- a/layout.c
+++ b/layout.c
@@ -1,6 +1,9 @@
 /* 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 */
 
@@ -10,7 +13,8 @@ typedef struct {
 } Layout;
 
 unsigned int blw = 0;
-static Layout *lt = NULL;
+static char prop[128];
+static unsigned int ltidx = 0; /* default */
 
 static void
 floating(void) { /* default floating layout */
@@ -36,7 +40,7 @@ arrange(void) {
 			unban(c);
 		else
 			ban(c);
-	lt->arrange();
+	layouts[ltidx].arrange();
 	focus(NULL);
 	restack();
 }
@@ -76,25 +80,25 @@ 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 = &layouts[0];
+	/* TODO deserialize ltidx if present */
 	nlayouts = sizeof layouts / sizeof layouts[0];
 	for(blw = i = 0; i < nlayouts; i++) {
 		w = textw(layouts[i].symbol);
@@ -103,6 +107,28 @@ initlayouts(void) {
 	}
 }
 
+void
+loaddwmprops(void) {
+	unsigned int i;
+	XTextProperty name;
+
+	/* check if window has set a property */
+	name.nitems = 0;
+	XGetTextProperty(dpy, root, &name, dwmprops);
+	if(name.nitems && name.encoding == XA_STRING) {
+		strncpy(prop, (char *)name.value, sizeof prop - 1);
+		prop[sizeof prop - 1] = '\0';
+		XFree(name.value);
+		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') {
+			i = prop[i] - '0';
+			if(i < nlayouts)
+				ltidx = i;
+		}
+	}
+}
+
 Client *
 nexttiled(Client *c) {
 	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
@@ -118,9 +144,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) {
@@ -139,24 +165,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 == layouts + nlayouts)
-			lt = layouts;
+		if(++ltidx == nlayouts)
+			ltidx = 0;;
 	}
 	else {
 		i = atoi(arg);
 		if(i < 0 || i >= nlayouts)
 			return;
-		lt = &layouts[i];
+		ltidx = i;
 	}
 	if(sel)
 		arrange();
 	else
 		drawstatus();
+	savedwmprops();
 }
 
 void
@@ -173,7 +212,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;