added heretag command which allows to tag a client of a foreign tag with current tag

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 8951dd8..3837fbd 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -7,24 +7,23 @@
 #include <string.h>
 #include <X11/Xutil.h>
 
-/********** CUSTOMIZE **********/
+/* static */
 
+/* CUSTOMIZE */ 
+static Rule rule[] = {
+       /* class                        instance        tags                                            isfloat */
+       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
+};
+
+/* extern */
+
+/* CUSTOMIZE */
 char *tags[TLast] = {
        [Tscratch] = "scratch",
        [Tdev] = "dev",
        [Twww] = "www",
        [Twork] = "work",
 };
-
-static Rule rule[] = {
-       /* class                        instance        tags                                            dofloat */
-       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
-};
-
-/********** CUSTOMIZE **********/
-
-/* extern functions */
-
 void (*arrange)(Arg *) = dotile;
 
 void
@@ -50,7 +49,7 @@ dofloat(Arg *arg)
                        ban(c);
        }
        if(sel && !sel->tags[tsel]) {
-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {
                        higher(sel);
                        focus(sel);
                }
@@ -67,7 +66,7 @@ dotile(Arg *arg)
        w = sw - mw;
        arrange = dotile;
        for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel] && !c->dofloat)
+               if(c->tags[tsel] && !c->isfloat)
                        n++;
 
        if(n > 1)
@@ -77,7 +76,7 @@ dotile(Arg *arg)
 
        for(i = 0, c = clients; c; c = c->next) {
                if(c->tags[tsel]) {
-                       if(c->dofloat) {
+                       if(c->isfloat) {
                                higher(c);
                                resize(c, True);
                                continue;
@@ -107,7 +106,7 @@ dotile(Arg *arg)
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
+               if((sel = getnext(clients, tsel))) {
                        higher(sel);
                        focus(sel);
                }
@@ -116,13 +115,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];
+       arrange(NULL);
+       focus(c);
+}
+
+void
 replacetag(Arg *arg)
 {
        int i;
@@ -155,7 +173,7 @@ settags(Client *c)
                                {
                                        for(j = 0; j < TLast; j++)
                                                c->tags[j] = rule[i].tags[j];
-                                       c->dofloat = rule[i].dofloat;
+                                       c->isfloat = rule[i].isfloat;
                                        matched = True;
                                        break;
                                }