JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
corrections
[dwm.git] / tag.c
diff --git a/tag.c b/tag.c
index 72d87d3..2a06bc9 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -30,141 +29,40 @@ RULES
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 
-void (*arrange)(Arg *) = DEFMODE;
-
 /* extern */
 
-void
-appendtag(Arg *arg)
-{
-       if(!sel)
-               return;
-
-       sel->tags[arg->i] = True;
-       arrange(NULL);
-}
-
-void
-dofloat(Arg *arg)
-{
-       Client *c;
-
-       for(c = clients; c; c = c->next) {
-               c->ismax = False;
-               if(c->tags[tsel]) {
-                       resize(c, True, TopLeft);
-               }
-               else
-                       ban(c);
-       }
-       if((sel = getnext(clients))) {
-               higher(sel);
-               focus(sel);
-       }
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-       drawall();
-}
-
-void
-dotile(Arg *arg)
-{
-       int n, i, w, h;
-       Client *c;
-
-       w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel] && !c->isfloat)
-                       n++;
-
-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
-
-       for(i = 0, c = clients; c; c = c->next) {
-               c->ismax = False;
-               if(c->tags[tsel]) {
-                       if(c->isfloat) {
-                               higher(c);
-                               resize(c, True, TopLeft);
-                               continue;
-                       }
-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       else if(h > bh) {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2;
-                               c->h = h - 2;
-                       }
-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
-                               c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       resize(c, False, TopLeft);
-                       i++;
-               }
-               else
-                       ban(c);
-       }
-       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);
+getnext(Client *c) {
+       for(; c && !isvisible(c); c = c->next);
        return c;
 }
 
 Client *
-getprev(Client *c)
-{
-       for(; c && !c->tags[tsel]; c = c->prev);
+getprev(Client *c) {
+       for(; c && !isvisible(c); c = c->prev);
        return c;
 }
 
 void
-initrregs()
-{
+initrregs(void) {
        unsigned int i;
        regex_t *reg;
 
        if(rreg)
                return;
-       len = sizeof(rule) / sizeof(rule[0]);
+       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))
+                       if(regcomp(reg, rule[i].clpattern, REG_EXTENDED))
                                free(reg);
                        else
                                rreg[i].clregex = reg;
                }
                if(rule[i].tpattern) {
                        reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rule[i].tpattern, 0))
+                       if(regcomp(reg, rule[i].tpattern, REG_EXTENDED))
                                free(reg);
                        else
                                rreg[i].tregex = reg;
@@ -173,33 +71,23 @@ initrregs()
 }
 
 void
-replacetag(Arg *arg)
-{
-       int i;
-
-       if(!sel)
-               return;
-
-       for(i = 0; i < ntags; i++)
-               sel->tags[i] = False;
-       appendtag(arg);
-}
-
-void
-settags(Client *c)
-{
-       char classinst[256];
+settags(Client *c, Client *trans) {
+       char prop[512];
        unsigned int i, j;
        regmatch_t tmp;
-       Bool matched = False;
+       Bool matched = trans != NULL;
        XClassHint ch;
 
-       if(XGetClassHint(dpy, c->win, &ch)) {
-               snprintf(classinst, sizeof(classinst), "%s:%s",
+       if(matched) {
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = trans->tags[i];
+       }
+       else if(XGetClassHint(dpy, c->win, &ch)) {
+               snprintf(prop, sizeof prop, "%s:%s:%s",
                                ch.res_class ? ch.res_class : "",
-                               ch.res_name ? ch.res_name : "");
-               for(i = 0; !matched && i < len; i++)
-                       if(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 1, &tmp, 0)) {
+                               ch.res_name ? ch.res_name : "", c->name);
+               for(i = 0; i < len; i++)
+                       if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 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)) {
@@ -214,34 +102,32 @@ settags(Client *c)
                        XFree(ch.res_name);
        }
        if(!matched)
-               c->tags[tsel] = True;
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = seltag[i];
 }
 
 void
-togglemode(Arg *arg)
-{
-       arrange = arrange == dofloat ? dotile : dofloat;
-       arrange(NULL);
-}
+tag(Arg *arg) {
+       unsigned int i;
 
-void
-view(Arg *arg)
-{
-       tsel = arg->i;
-       arrange(NULL);
-       drawall();
+       if(!sel)
+               return;
+       for(i = 0; i < ntags; i++)
+               sel->tags[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               sel->tags[arg->i] = True;
+       arrange();
 }
 
 void
-viewnext(Arg *arg)
-{
-       arg->i = (tsel < ntags-1) ? tsel+1 : 0;
-       view(arg);
-}
+toggletag(Arg *arg) {
+       unsigned int i;
 
-void
-viewprev(Arg *arg)
-{
-       arg->i = (tsel > 0) ? tsel-1 : ntags-1;
-       view(arg);
+       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;
+       arrange();
 }