implemened distinguishing float/managed geometries of clients (works quite well)

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 3837fbd..d29a179 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -43,8 +43,10 @@ dofloat(Arg *arg)
 
        arrange = dofloat;
        for(c = clients; c; c = c->next) {
 
        arrange = dofloat;
        for(c = clients; c; c = c->next) {

-               if(c->tags[tsel])
+               setgeom(c);
+               if(c->tags[tsel]) {

                        resize(c, True);
                        resize(c, True);

+               }

                else
                        ban(c);
        }
                else
                        ban(c);
        }


@@ -75,6 +77,7 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {

+               setgeom(c);

                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);
                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);


@@ -82,22 +85,22 @@ dotile(Arg *arg)
                                continue;
                        }
                        if(n == 1) {
                                continue;
                        }
                        if(n == 1) {

-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               *c->x = sx;
+                               *c->y = sy + bh;
+                               *c->w = sw - 2 * c->border;
+                               *c->h = sh - 2 * c->border - bh;

                        }
                        else if(i == 0) {
                        }
                        else if(i == 0) {

-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               *c->x = sx;
+                               *c->y = sy + bh;
+                               *c->w = mw - 2 * c->border;
+                               *c->h = sh - 2 * c->border - bh;

                        }
                        else {
                        }
                        else {

-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
+                               *c->x = sx + mw;
+                               *c->y = sy + (i - 1) * h + bh;
+                               *c->w = w - 2 * c->border;
+                               *c->h = h - 2 * c->border;

                        }
                        resize(c, False);
                        i++;
                        }
                        resize(c, False);
                        i++;


@@ -136,7 +139,7 @@ heretag(Arg *arg)
        for(i = 0; i < TLast; i++)
                c->tags[i] = NULL;
        c->tags[tsel] = tags[tsel];
        for(i = 0; i < TLast; i++)
                c->tags[i] = NULL;
        c->tags[tsel] = tags[tsel];

-       arrange(NULL);
+       pop(c);

        focus(c);
 }
 
        focus(c);
 }