cleaned up settags-handling

[dwm.git] / client.c

diff --git a/client.c b/client.c
index ed19d9c..882b8ee 100644 (file)
--- a/client.c
+++ b/client.c
@@ -7,6 +7,8 @@
 
 /* static */
 
+static char config[128];
+
 static void
 attachstack(Client *c) {
        c->snext = stack;
@@ -179,8 +181,31 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
+Bool
+loadconfig(Client *c) {
+       unsigned int i;
+       Bool result = False;
+       XTextProperty name;
+
+       /* check if window has set a property */
+       name.nitems = 0;
+       XGetTextProperty(dpy, c->win, &name, dwmconfig);
+       if(name.nitems && name.encoding == XA_STRING) {
+               strncpy(config, (char *)name.value, sizeof config - 1);
+               config[sizeof config - 1] = '\0';
+               XFree(name.value);
+               for(i = 0; i < ntags && i < sizeof config - 1 && config[i] != '\0'; i++)
+                       if((c->tags[i] = config[i] == '1'))
+                               result = True;
+               if(i < sizeof config - 1 && config[i] != '\0')
+                       c->isfloating = config[i] == '1';
+       }
+       return result;
+}
+
 void
 manage(Window w, XWindowAttributes *wa) {
+       unsigned int i;
        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
@@ -221,15 +246,18 @@ manage(Window w, XWindowAttributes *wa) {
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
-       settags(c, t);
+       if(t)
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = t->tags[i];
+       if(!loadconfig(c))
+               applyrules(c);
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
+       saveconfig(c);
        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-       setclientstate(c, IconicState);
-       c->isbanned = True;
-       focus(c);
+       ban(c);
        arrange();
 }
 
@@ -297,13 +325,16 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
-togglefloating(const char *arg) {
-       if(!sel || isfloating())
-               return;
-       sel->isfloating = !sel->isfloating;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-       arrange();
+saveconfig(Client *c) {
+       unsigned int i;
+
+       for(i = 0; i < ntags && i < sizeof config - 1; i++)
+               config[i] = c->tags[i] ? '1' : '0';
+       if(i < sizeof config - 1)
+               config[i++] = c->isfloating ? '1' : '0';
+       config[i] = '\0';
+       XChangeProperty(dpy, c->win, dwmconfig, XA_STRING, 8,
+                       PropModeReplace, (unsigned char *)config, i);
 }
 
 void
@@ -316,7 +347,7 @@ unban(Client *c) {
 }
 
 void
-unmanage(Client *c) {
+unmanage(Client *c, long state) {
        XWindowChanges wc;
 
        wc.border_width = c->oldborder;
@@ -329,13 +360,14 @@ unmanage(Client *c) {
        if(sel == c)
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       setclientstate(c, WithdrawnState);
+       setclientstate(c, state);
        free(c->tags);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
-       arrange();
+       if(state != NormalState)
+               arrange();
 }
 
 void