using double-linked list in order to get correct prev focus handling

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 8509867..21eb9fa 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -20,22 +20,24 @@ typedef struct {
 
 /* CUSTOMIZE */ 
 static Rule rule[] = {
-       /* class                        instance        tags            isfloat */
-       { "Firefox.*",  { [Twww] = "www" },                     False },
-       { "Gimp.*",             { 0 },                                          True},
+       /* class:instance       tags                            isfloat */
+       { "Firefox.*",          { [Twww] = "www" },             False },
+       { "Gimp.*",             { 0 },                          True},
 };
 
-/* extern */
-
-/* CUSTOMIZE */
 char *tags[TLast] = {
        [Tscratch] = "scratch",
        [Tdev] = "dev",
        [Twww] = "www",
        [Twork] = "work",
 };
+
 void (*arrange)(Arg *) = dotile;
 
+/* END CUSTOMIZE */
+
+/* extern */
+
 void
 appendtag(Arg *arg)
 {
@@ -51,8 +53,8 @@ dofloat(Arg *arg)
 {
        Client *c;
 
-       arrange = dofloat;
        for(c = clients; c; c = c->next) {
+               c->ismax = False;
                if(c->tags[tsel]) {
                        resize(c, True, TopLeft);
                }
@@ -71,11 +73,10 @@ dofloat(Arg *arg)
 void
 dotile(Arg *arg)
 {
-       Client *c;
        int n, i, w, h;
+       Client *c;
 
        w = sw - mw;
-       arrange = dotile;
        for(n = 0, c = clients; c; c = c->next)
                if(c->tags[tsel] && !c->isfloat)
                        n++;
@@ -86,6 +87,7 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
+               c->ismax = False;
                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);
@@ -138,6 +140,13 @@ getnext(Client *c, unsigned int t)
        return c;
 }
 
+Client *
+getprev(Client *c)
+{
+       for(; c && !c->tags[tsel]; c = c->prev);
+       return c;
+}
+
 void
 heretag(Arg *arg)
 {
@@ -161,6 +170,7 @@ void
 replacetag(Arg *arg)
 {
        int i;
+
        if(!sel)
                return;
 
@@ -212,6 +222,13 @@ settags(Client *c)
 }
 
 void
+togglemode(Arg *arg)
+{
+       arrange = arrange == dofloat ? dotile : dofloat;
+       arrange(NULL);
+}
+
+void
 view(Arg *arg)
 {
        tsel = arg->i;