prepared 0.3

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 5da5711..c9eec90 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -12,7 +12,7 @@
 /* CUSTOMIZE */ 
 static Rule rule[] = {
        /* class                        instance        tags                                            isfloat */
-       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
+       { "Firefox-bin",        "firefox-bin",  { [Twww] = "www" },                     False },
 };
 
 /* extern */
@@ -43,13 +43,15 @@ dofloat(Arg *arg)
 
        arrange = dofloat;
        for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
-                       resize(c, True);
+               setgeom(c);
+               if(c->tags[tsel]) {
+                       resize(c, True, TopLeft);
+               }
                else
                        ban(c);
        }
        if(sel && !sel->tags[tsel]) {
-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {
                        higher(sel);
                        focus(sel);
                }
@@ -75,38 +77,45 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
+               setgeom(c);
                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);
-                               resize(c, True);
+                               resize(c, True, TopLeft);
                                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) {
-                               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 {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
+                       else if(h > bh) {
+                               *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);
+                       else { /* fallback if h < bh */
+                               *c->x = sx + mw;
+                               *c->y = sy + bh;
+                               *c->w = w - 2 * c->border;
+                               *c->h = sh - 2 * c->border - bh;
+                       }
+                       resize(c, False, TopLeft);
                        i++;
                }
                else
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {
                        higher(sel);
                        focus(sel);
                }
@@ -115,13 +124,32 @@ dotile(Arg *arg)
 }
 
 Client *
-getnext(Client *c)
+getnext(Client *c, unsigned int t)
 {
-       for(; c && !c->tags[tsel]; c = c->next);
+       for(; c && !c->tags[t]; c = c->next);
        return c;
 }
 
 void
+heretag(Arg *arg)
+{
+       int i;
+       Client *c;
+
+       if(arg->i == tsel)
+               return;
+
+       if(!(c = getnext(clients, arg->i)))
+               return;
+
+       for(i = 0; i < TLast; i++)
+               c->tags[i] = NULL;
+       c->tags[tsel] = tags[tsel];
+       pop(c);
+       focus(c);
+}
+
+void
 replacetag(Arg *arg)
 {
        int i;