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

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 48f1f2a..d29a179 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -7,24 +7,23 @@
 #include <string.h>
 #include <X11/Xutil.h>
 
 #include <string.h>
 #include <X11/Xutil.h>
 

-/********** CUSTOMIZE **********/
-
-char *tags[TLast] = {
-       [Tscratch] = "scratch",
-       [Tdev] = "dev",
-       [Twww] = "www",
-       [Twork] = "work",
-};
+/* static */

 
 

+/* CUSTOMIZE */ 

 static Rule rule[] = {
        /* class                        instance        tags                                            isfloat */
        { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
 };
 
 static Rule rule[] = {
        /* class                        instance        tags                                            isfloat */
        { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
 };
 

-/********** CUSTOMIZE **********/
-
-/* extern functions */
+/* extern */

 
 

+/* CUSTOMIZE */
+char *tags[TLast] = {
+       [Tscratch] = "scratch",
+       [Tdev] = "dev",
+       [Twww] = "www",
+       [Twork] = "work",
+};

 void (*arrange)(Arg *) = dotile;
 
 void
 void (*arrange)(Arg *) = dotile;
 
 void


@@ -44,13 +43,15 @@ 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);
        }
        if(sel && !sel->tags[tsel]) {
                else
                        ban(c);
        }
        if(sel && !sel->tags[tsel]) {

-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {

                        higher(sel);
                        focus(sel);
                }
                        higher(sel);
                        focus(sel);
                }


@@ -76,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);


@@ -83,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++;


@@ -107,7 +109,7 @@ dotile(Arg *arg)
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {

-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {

                        higher(sel);
                        focus(sel);
                }
                        higher(sel);
                        focus(sel);
                }


@@ -116,12 +118,31 @@ dotile(Arg *arg)
 }
 
 Client *
 }
 
 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;
 }
 
        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)
 {
 void
 replacetag(Arg *arg)
 {