some more refactoring

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index f6c33ea..d3065d5 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,218 +1,121 @@
-/*
- * (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"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

 #include <regex.h>
 #include <stdio.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
 

-void (*arrange)(Arg *) = DEFMODE;
+static RReg *rreg = NULL;
+static unsigned int len = 0;

 
 /* extern */
 
 void
 
 /* extern */
 
 void

-appendtag(Arg *arg)
-{
-       if(!sel)
-               return;
-
-       sel->tags[arg->i] = tags[arg->i];
-       arrange(NULL);
-}
+compileregexps(void) {
+       unsigned int i;
+       regex_t *reg;

 
 

-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 && !sel->tags[tsel]) {
-               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->border;
-                               c->h = sh - 2 * c->border - bh;
-                       }
-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
-                       }
-                       else if(h > bh) {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
-                       }
-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
-                               c->y = sy + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
-                       }
-                       resize(c, False, TopLeft);
-                       i++;
+       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, REG_EXTENDED))
+                               free(reg);
+                       else
+                               rreg[i].clregex = reg;

                }
                }

-               else
-                       ban(c);
-       }
-       if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
+               if(rule[i].tpattern) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rule[i].tpattern, REG_EXTENDED))
+                               free(reg);
+                       else
+                               rreg[i].tregex = reg;

                }
                }

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

        }
        }

-       drawall();
-}
-
-Client *
-getnext(Client *c)
-{
-       for(; c && !c->tags[tsel]; c = c->next);
-       return c;
-}
-
-Client *
-getprev(Client *c)
-{
-       for(; c && !c->tags[tsel]; c = c->prev);
-       return c;

 }
 
 void
 }
 
 void

-replacetag(Arg *arg)
-{
-       int i;
-
-       if(!sel)
-               return;
-
-       for(i = 0; i < TLast; i++)
-               sel->tags[i] = NULL;
-       appendtag(arg);
-}
-
-void
-settags(Client *c)
-{
-       char classinst[256];
-       static unsigned int len = sizeof(rule) / sizeof(rule[0]);
+settags(Client *c, Client *trans) {
+       char prop[512];

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

-       regex_t regex;

        regmatch_t tmp;
        regmatch_t tmp;

-       Bool matched = False;
-       XClassHint ch;
-
-       if(XGetClassHint(dpy, c->win, &ch)) {
-               snprintf(classinst, sizeof(classinst), "%s:%s",
+       Bool matched = trans != NULL;
+       XClassHint ch = { 0 };
+
+       if(matched)
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = trans->tags[i];
+       else {
+               XGetClassHint(dpy, c->win, &ch);
+               snprintf(prop, sizeof prop, "%s:%s:%s",

                                ch.res_class ? ch.res_class : "",
                                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];
+                               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)) {
+                                               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
 }
 
 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
 }
 
 void

-viewnext(Arg *arg)
-{
-       arg->i = (tsel < TLast-1) ? tsel+1 : 0;
-       view(arg);
-}
+toggletag(Arg *arg) {
+       unsigned int i;

 
 

-void
-viewprev(Arg *arg)
-{
-       arg->i = (tsel > 0) ? tsel-1 : TLast-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();

 }
 }