prepared merging layout.c and tag.c into screen.c

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index 030c282..2763d2c 100644 (file)
--- 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,6 +13,7 @@ typedef struct {
 } Layout;
 
 unsigned int blw = 0;
+static char prop[128];
 static unsigned int ltidx = 0; /* default */
 
 static void
@@ -94,7 +98,6 @@ void
 initlayouts(void) {
        unsigned int i, w;
 
-       /* 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 +106,20 @@ initlayouts(void) {
        }
 }
 
+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);
@@ -138,6 +155,19 @@ restack(void) {
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
+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;
@@ -156,6 +186,7 @@ setlayout(const char *arg) {
                arrange();
        else
                drawstatus();
+       savedwmprops();
 }
 
 void