applied sanders tag()/toggletag() fixes

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index f4ddfd9..a718ebd 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -5,35 +5,35 @@
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 #include <sys/types.h>
 #include <X11/Xutil.h>
 
 #include <string.h>
 #include <sys/types.h>
 #include <X11/Xutil.h>
 

-/* static */

 
 typedef struct {
 
 typedef struct {

-       const char *pattern;
-       char *tags[TLast];
+       const char *clpattern;
+       const char *tpattern;

        Bool isfloat;
 } Rule;
 
        Bool isfloat;
 } Rule;
 

+typedef struct {
+       regex_t *clregex;
+       regex_t *tregex;
+} RReg;
+
+/* static */
+

 TAGS
 RULES
 
 TAGS
 RULES
 

+static RReg *rreg = NULL;
+static unsigned int len = 0;
+

 void (*arrange)(Arg *) = DEFMODE;
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
 /* extern */
 

-void
-appendtag(Arg *arg)
-{
-       if(!sel)
-               return;
-
-       sel->tags[arg->i] = tags[arg->i];
-       arrange(NULL);
-}
-

 void
 dofloat(Arg *arg)
 {
 void
 dofloat(Arg *arg)
 {


@@ -41,32 +41,29 @@ dofloat(Arg *arg)
 
        for(c = clients; c; c = c->next) {
                c->ismax = False;
 
        for(c = clients; c; c = c->next) {
                c->ismax = False;

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

                        resize(c, True, TopLeft);
                }
                else
                        ban(c);
        }
                        resize(c, True, TopLeft);
                }
                else
                        ban(c);
        }

-       if(sel && !sel->tags[tsel]) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
-               }
-               else
-                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       if((sel = getnext(clients))) {
+               focus(sel);
+               restack();

        }
        }

-       drawall();
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

 }
 
 void
 dotile(Arg *arg)
 {
 }
 
 void
 dotile(Arg *arg)
 {

-       int n, i, w, h;
+       int h, i, n, w;

        Client *c;
 
        w = sw - mw;
        for(n = 0, c = clients; c; c = c->next)
        Client *c;
 
        w = sw - mw;
        for(n = 0, c = clients; c; c = c->next)

-               if(c->tags[tsel] && !c->isfloat)
+               if(isvisible(c) && !c->isfloat)

                        n++;
 
        if(n > 1)
                        n++;
 
        if(n > 1)


@@ -76,9 +73,8 @@ dotile(Arg *arg)
 
        for(i = 0, c = clients; c; c = c->next) {
                c->ismax = False;
 
        for(i = 0, c = clients; c; c = c->next) {
                c->ismax = False;

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

                        if(c->isfloat) {
                        if(c->isfloat) {

-                               higher(c);

                                resize(c, True, TopLeft);
                                continue;
                        }
                                resize(c, True, TopLeft);
                                continue;
                        }


@@ -98,7 +94,10 @@ dotile(Arg *arg)
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
                                c->w = w - 2;
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
                                c->w = w - 2;

-                               c->h = h - 2;
+                               if(i + 1 == n)
+                                       c->h = sh - c->y - 2;
+                               else
+                                       c->h = h - 2;

                        }
                        else { /* fallback if h < bh */
                                c->x = sx + mw;
                        }
                        else { /* fallback if h < bh */
                                c->x = sx + mw;


@@ -112,51 +111,124 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
                else
                        ban(c);
        }

-       if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
-               }
-               else
-                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-       }
-       drawall();
+       if((sel = getnext(clients)))
+               focus(sel);
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       restack();

 }
 
 Client *
 getnext(Client *c)
 {
 }
 
 Client *
 getnext(Client *c)
 {

-       for(; c && !c->tags[tsel]; c = c->next);
+       for(; c && !isvisible(c); c = c->next);

        return c;
 }
 
 Client *
 getprev(Client *c)
 {
        return c;
 }
 
 Client *
 getprev(Client *c)
 {

-       for(; c && !c->tags[tsel]; c = c->prev);
+       for(; c && !isvisible(c); c = c->prev);

        return c;
 }
 
 void
        return c;
 }
 
 void

-replacetag(Arg *arg)
+initrregs()

 {
 {

-       int i;
+       unsigned int i;
+       regex_t *reg;

 
 

-       if(!sel)
+       if(rreg)
+               return;
+       len = sizeof(rule) / sizeof(rule[0]);
+       rreg = emallocz(len * sizeof(RReg));
+
+       for(i = 0; i < len; i++) {
+               if(rule[i].clpattern) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rule[i].clpattern, 0))
+                               free(reg);
+                       else
+                               rreg[i].clregex = reg;
+               }
+               if(rule[i].tpattern) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rule[i].tpattern, 0))
+                               free(reg);
+                       else
+                               rreg[i].tregex = reg;
+               }
+       }
+}
+
+Bool
+isvisible(Client *c)
+{
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(c->tags[i] && seltag[i])
+                       return True;
+       return False;
+}
+
+void
+restack()
+{
+       static unsigned int nwins = 0;
+       static Window *wins = NULL;
+       unsigned int f, fi, m, mi, n;
+       Client *c;
+       XEvent ev;
+
+       for(f = 0, m = 0, c = clients; c; c = c->next)
+               if(isvisible(c)) {
+                       if(c->isfloat || arrange == dofloat)
+                               f++;
+                       else
+                               m++;
+               }
+       if(!(n = 2 * (f + m))) {
+               drawstatus();

                return;
                return;

+       }
+       if(nwins < n) {
+               nwins = n;
+               wins = erealloc(wins, nwins * sizeof(Window));
+       }

 
 

-       for(i = 0; i < TLast; i++)
-               sel->tags[i] = NULL;
-       appendtag(arg);
+       fi = 0;
+       mi = 2 * f;
+       if(sel->isfloat || arrange == dofloat) {
+               wins[fi++] = sel->title;
+               wins[fi++] = sel->win;
+       }
+       else {
+               wins[mi++] = sel->title;
+               wins[mi++] = sel->win;
+       }
+       for(c = clients; c; c = c->next)
+               if(isvisible(c) && c != sel) {
+                       if(c->isfloat || arrange == dofloat) {
+                               wins[fi++] = c->title;
+                               wins[fi++] = c->win;
+                       }
+                       else {
+                               wins[mi++] = c->title;
+                               wins[mi++] = c->win;
+                       }
+               }
+       XRestackWindows(dpy, wins, n);
+       drawall();
+       XSync(dpy, False);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 void
 settags(Client *c)
 {
        char classinst[256];
 }
 
 void
 settags(Client *c)
 {
        char classinst[256];

-       static unsigned int len = sizeof(rule) / sizeof(rule[0]);

        unsigned int i, j;
        unsigned int i, j;

-       regex_t regex;

        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;


@@ -165,26 +237,40 @@ settags(Client *c)
                snprintf(classinst, sizeof(classinst), "%s:%s",
                                ch.res_class ? ch.res_class : "",
                                ch.res_name ? ch.res_name : "");
                snprintf(classinst, sizeof(classinst), "%s:%s",
                                ch.res_class ? ch.res_class : "",
                                ch.res_name ? ch.res_name : "");

-               for(i = 0; !matched && i < len; i++) {
-                       if(!regcomp(&regex, rule[i].pattern, 0)) {
-                               if(!regexec(&regex, classinst, 1, &tmp, 0)) {
-                                       for(j = 0; j < TLast; j++) {
-                                               if(rule[i].tags[j])
-                                                       matched = True;
-                                               c->tags[j] = rule[i].tags[j];
+               for(i = 0; !matched && i < len; i++)
+                       if(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 1, &tmp, 0)) {
+                               c->isfloat = rule[i].isfloat;
+                               for(j = 0; rreg[i].tregex && j < ntags; j++) {
+                                       if(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) {
+                                               matched = True;
+                                               c->tags[j] = True;

                                        }
                                        }

-                                       c->isfloat = rule[i].isfloat;

                                }
                                }

-                               regfree(&regex);

                        }
                        }

-               }

                if(ch.res_class)
                        XFree(ch.res_class);
                if(ch.res_name)
                        XFree(ch.res_name);
        }
        if(!matched)
                if(ch.res_class)
                        XFree(ch.res_class);
                if(ch.res_name)
                        XFree(ch.res_name);
        }
        if(!matched)

-               c->tags[tsel] = tags[tsel];
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = seltag[i];
+}
+
+void
+tag(Arg *arg)
+{
+       unsigned int i;
+
+       if(!sel)
+               return;
+
+       for(i = 0; i < ntags; i++)
+               sel->tags[i] = False;
+       sel->tags[arg->i] = True;
+       settitle(sel);
+       if(!isvisible(sel))
+               arrange(NULL);

 }
 
 void
 }
 
 void


@@ -195,23 +281,42 @@ togglemode(Arg *arg)
 }
 
 void
 }
 
 void

-view(Arg *arg)
+toggletag(Arg *arg)

 {
 {

-       tsel = arg->i;
-       arrange(NULL);
-       drawall();
+       unsigned int i;
+
+       if(!sel)
+               return;
+
+       sel->tags[arg->i] = !sel->tags[arg->i];
+       for(i = 0; i < ntags && !sel->tags[i]; i++);
+       if(i == ntags)
+               sel->tags[arg->i] = True;
+       settitle(sel);
+       if(!isvisible(sel))
+               arrange(NULL);

 }
 
 }
 

+

 void
 void

-viewnext(Arg *arg)
+toggleview(Arg *arg)

 {
 {

-       arg->i = (tsel < TLast-1) ? tsel+1 : 0;
-       view(arg);
+       unsigned int i;
+
+       seltag[arg->i] = !seltag[arg->i];
+       for(i = 0; i < ntags && !seltag[i]; i++);
+       if(i == ntags)
+               seltag[arg->i] = True; /* cannot toggle last view */
+       arrange(NULL);

 }
 
 void
 }
 
 void

-viewprev(Arg *arg)
+view(Arg *arg)

 {
 {

-       arg->i = (tsel > 0) ? tsel-1 : TLast-1;
-       view(arg);
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltag[i] = False;
+       seltag[arg->i] = True;
+       arrange(NULL);

 }
 }