hmm I doubt the usefulness of storing this information...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index d4dfe6e..d11ef7f 100644 (file)
--- a/client.c
+++ b/client.c
@@ -7,6 +7,8 @@
 
 /* static */
 
 
 /* static */
 

+static char prop[128];
+

 static void
 attachstack(Client *c) {
        c->snext = stack;
 static void
 attachstack(Client *c) {
        c->snext = stack;


@@ -179,8 +181,31 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

+Bool
+loadprops(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, 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++)
+                       if((c->tags[i] = prop[i] == '1'))
+                               result = True;
+               if(i < sizeof prop - 1 && prop[i] != '\0')
+                       c->isfloating = prop[i] == '1';
+       }
+       return result;
+}
+

 void
 manage(Window w, XWindowAttributes *wa) {
 void
 manage(Window w, XWindowAttributes *wa) {

+       unsigned int i;

        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
        Client *c, *t = NULL;
        Window trans;
        Status rettrans;


@@ -221,31 +246,32 @@ manage(Window w, XWindowAttributes *wa) {
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        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(!loadprops(c))
+               applyrules(c);

        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;

+       saveprops(c);

        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
        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);
-       lt->arrange();
+       ban(c);
+       arrange();

 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {

-       float dx, dy, max, min, ratio;
-       XWindowChanges wc;
+       double dx, dy, max, min, ratio;
+       XWindowChanges wc; 

 
 

-       if(w <= 0 || h <= 0)
-               return;

        if(sizehints) {
        if(sizehints) {

-               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) {
-                       dx = (float)(w - c->basew);
-                       dy = (float)(h - c->baseh);
-                       min = (float)(c->minax) / (float)(c->minay);
-                       max = (float)(c->maxax) / (float)(c->maxay);
+               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
+                       dx = (double)(w - c->basew);
+                       dy = (double)(h - c->baseh);
+                       min = (double)(c->minax) / (double)(c->minay);
+                       max = (double)(c->maxax) / (double)(c->maxay);

                        ratio = dx / dy;
                        if(max > 0 && min > 0 && ratio > 0) {
                                if(ratio < min) {
                        ratio = dx / dy;
                        if(max > 0 && min > 0 && ratio > 0) {
                                if(ratio < min) {


@@ -299,13 +325,16 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
 }
 
 void

-togglefloating(const char *arg) {
-       if(!sel || lt->arrange == floating)
-               return;
-       sel->isfloating = !sel->isfloating;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-       lt->arrange();
+saveprops(Client *c) {
+       unsigned int i;
+
+       for(i = 0; i < ntags && i < sizeof prop - 1; i++)
+               prop[i] = c->tags[i] ? '1' : '0';
+       if(i < sizeof prop - 1)
+               prop[i++] = c->isfloating ? '1' : '0';
+       prop[i] = '\0';
+       XChangeProperty(dpy, c->win, dwmprops, XA_STRING, 8,
+                       PropModeReplace, (unsigned char *)prop, i);

 }
 
 void
 }
 
 void


@@ -318,7 +347,7 @@ unban(Client *c) {
 }
 
 void
 }
 
 void

-unmanage(Client *c) {
+unmanage(Client *c, long state) {

        XWindowChanges wc;
 
        wc.border_width = c->oldborder;
        XWindowChanges wc;
 
        wc.border_width = c->oldborder;


@@ -331,13 +360,14 @@ unmanage(Client *c) {
        if(sel == c)
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        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);
        free(c->tags);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       lt->arrange();
+       if(state != NormalState)
+               arrange();

 }
 
 void
 }
 
 void