made shortcuts like proposed by Sander, renamed viewextend to toggleview (more clear)

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 448ed2a..9904dd1 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -5,21 +5,31 @@
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <X11/Xutil.h>
 
-/* static */
 
 typedef struct {
-       const char *pattern;
-       Bool tags[TLast];
+       const char *clpattern;
+       const char *tpattern;
        Bool isfloat;
 } Rule;
 
+typedef struct {
+       regex_t *clregex;
+       regex_t *tregex;
+} RReg;
+
+/* static */
+
 TAGS
 RULES
 
+static RReg *rreg = NULL;
+static unsigned int len = 0;
+
 void (*arrange)(Arg *) = DEFMODE;
 
 /* extern */
@@ -41,20 +51,18 @@ dofloat(Arg *arg)
 
        for(c = clients; c; c = c->next) {
                c->ismax = False;
-               if(c->tags[tsel]) {
+               if(isvisible(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))) {
+               higher(sel);
+               focus(sel);
        }
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        drawall();
 }
 
@@ -66,7 +74,7 @@ dotile(Arg *arg)
 
        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)
@@ -76,7 +84,7 @@ dotile(Arg *arg)
 
        for(i = 0, c = clients; c; c = c->next) {
                c->ismax = False;
-               if(c->tags[tsel]) {
+               if(isvisible(c)) {
                        if(c->isfloat) {
                                higher(c);
                                resize(c, True, TopLeft);
@@ -98,7 +106,10 @@ dotile(Arg *arg)
                                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;
@@ -112,31 +123,69 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
-               }
-               else
-                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       if((sel = getnext(clients))) {
+               higher(sel);
+               focus(sel);
        }
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        drawall();
 }
 
 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)
 {
-       for(; c && !c->tags[tsel]; c = c->prev);
+       for(; c && !isvisible(c); c = c->prev);
        return c;
 }
 
+void
+initrregs()
+{
+       unsigned int i;
+       regex_t *reg;
+
+       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
 replacetag(Arg *arg)
 {
@@ -145,7 +194,7 @@ replacetag(Arg *arg)
        if(!sel)
                return;
 
-       for(i = 0; i < TLast; i++)
+       for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        appendtag(arg);
 }
@@ -154,9 +203,7 @@ void
 settags(Client *c)
 {
        char classinst[256];
-       static unsigned int len = sizeof(rule) / sizeof(rule[0]);
        unsigned int i, j;
-       regex_t regex;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
@@ -165,26 +212,24 @@ settags(Client *c)
                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;
+               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)
-               c->tags[tsel] = True;
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = seltag[i];
 }
 
 void
@@ -197,7 +242,24 @@ togglemode(Arg *arg)
 void
 view(Arg *arg)
 {
-       tsel = arg->i;
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltag[i] = False;
+       seltag[arg->i] = True;
+       arrange(NULL);
+       drawall();
+}
+
+void
+toggleview(Arg *arg)
+{
+       unsigned int i;
+
+       seltag[arg->i] = !seltag[arg->i];
+       for(i = 0; !seltag[i] && i < ntags; i++);
+       if(i == ntags)
+               seltag[arg->i] = True; /* cannot toggle last view */
        arrange(NULL);
        drawall();
 }
@@ -205,13 +267,19 @@ view(Arg *arg)
 void
 viewnext(Arg *arg)
 {
-       arg->i = (tsel < TLast-1) ? tsel+1 : 0;
+       unsigned int i;
+
+       for(i = 0; !seltag[i]; i++);
+       arg->i = (i < ntags-1) ? i+1 : 0;
        view(arg);
 }
 
 void
 viewprev(Arg *arg)
 {
-       arg->i = (tsel > 0) ? tsel-1 : TLast-1;
+       unsigned int i;
+
+       for(i = 0; !seltag[i]; i++);
+       arg->i = (i > 0) ? i-1 : ntags-1;
        view(arg);
 }