cleaned up settags-handling

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index bc36f08..1dd542b 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,142 +1,174 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */

 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <sys/types.h>
+#include <X11/Xatom.h>

 #include <X11/Xutil.h>
 
 #include <X11/Xutil.h>
 

+/* static */

 
 typedef struct {
 
 typedef struct {

-       const char *clpattern;
-       const char *tpattern;
-       Bool isfloat;
+       const char *prop;
+       const char *tags;
+       Bool isfloating;

 } Rule;
 
 typedef struct {
 } Rule;
 
 typedef struct {

-       regex_t *clregex;
-       regex_t *tregex;
-} RReg;
-
-/* static */
+       regex_t *propregex;
+       regex_t *tagregex;
+} Regs;

 
 TAGS
 RULES
 
 
 TAGS
 RULES
 

-static RReg *rreg = NULL;
-static unsigned int len = 0;
+static Regs *regs = NULL;
+static unsigned int nrules = 0;
+static char prop[512];

 
 

-/* extern */
+static unsigned int
+idxoftag(const char *tag) {
+       unsigned int i;

 
 

-Client *
-getnext(Client *c)
-{
-       for(; c && !isvisible(c); c = c->next);
-       return c;
+       for(i = 0; i < ntags; i++)
+               if(tags[i] == tag)
+                       return i;
+       return 0;

 }
 
 }
 

-Client *
-getprev(Client *c)
-{
-       for(; c && !isvisible(c); c = c->prev);
-       return c;
+/* extern */
+
+void
+applyrules(Client *c) {
+       unsigned int i, j;
+       regmatch_t tmp;
+       Bool matched = False;
+       XClassHint ch = { 0 };
+
+       /* rule matching */
+       XGetClassHint(dpy, c->win, &ch);
+       snprintf(prop, sizeof prop, "%s:%s:%s",
+                       ch.res_class ? ch.res_class : "",
+                       ch.res_name ? ch.res_name : "", c->name);
+       for(i = 0; i < nrules; i++)
+               if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
+                       c->isfloating = rules[i].isfloating;
+                       for(j = 0; regs[i].tagregex && j < ntags; j++) {
+                               if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
+                                       matched = True;
+                                       c->tags[j] = True;
+                               }
+                       }
+               }
+       if(ch.res_class)
+               XFree(ch.res_class);
+       if(ch.res_name)
+               XFree(ch.res_name);
+       if(!matched)
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = seltags[i];

 }
 
 void
 }
 
 void

-initrregs()
-{
+compileregs(void) {

        unsigned int i;
        regex_t *reg;
 
        unsigned int i;
        regex_t *reg;
 

-       if(rreg)
+       if(regs)

                return;
                return;

-       len = sizeof(rule) / sizeof(rule[0]);
-       rreg = emallocz(len * sizeof(RReg));
-
-       for(i = 0; i < len; i++) {
-               if(rule[i].clpattern) {
+       nrules = sizeof rules / sizeof rules[0];
+       regs = emallocz(nrules * sizeof(Regs));
+       for(i = 0; i < nrules; i++) {
+               if(rules[i].prop) {

                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));

-                       if(regcomp(reg, rule[i].clpattern, 0))
+                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))

                                free(reg);
                        else
                                free(reg);
                        else

-                               rreg[i].clregex = reg;
+                               regs[i].propregex = reg;

                }
                }

-               if(rule[i].tpattern) {
+               if(rules[i].tags) {

                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));

-                       if(regcomp(reg, rule[i].tpattern, 0))
+                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))

                                free(reg);
                        else
                                free(reg);
                        else

-                               rreg[i].tregex = reg;
+                               regs[i].tagregex = reg;

                }
        }
 }
 
                }
        }
 }
 

-void
-settags(Client *c)
-{
-       char classinst[256];
-       unsigned int i, j;
-       regmatch_t tmp;
-       Bool matched = False;
-       XClassHint ch;
-
-       if(XGetClassHint(dpy, c->win, &ch)) {
-               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(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;
-                                       }
-                               }
-                       }
-               if(ch.res_class)
-                       XFree(ch.res_class);
-               if(ch.res_name)
-                       XFree(ch.res_name);
-       }
-       if(!matched)
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = seltag[i];
+Bool
+isvisible(Client *c) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(c->tags[i] && seltags[i])
+                       return True;
+       return False;

 }
 
 void
 }
 
 void

-tag(Arg *arg)
-{
+tag(const char *arg) {

        unsigned int i;
 
        if(!sel)
                return;
        unsigned int i;
 
        if(!sel)
                return;

-

        for(i = 0; i < ntags; i++)
        for(i = 0; i < ntags; i++)

-               sel->tags[i] = False;
-       sel->tags[arg->i] = True;
-       settitle(sel);
-       if(!isvisible(sel))
-               arrange(NULL);
+               sel->tags[i] = arg == NULL;
+       i = idxoftag(arg);
+       if(i >= 0 && i < ntags)
+               sel->tags[i] = True;
+       saveconfig(sel);
+       arrange();

 }
 
 void
 }
 
 void

-toggletag(Arg *arg)
-{
-       unsigned int i;
+togglefloating(const char *arg) {
+       if(!sel || isfloating())
+               return;
+       sel->isfloating = !sel->isfloating;
+       if(sel->isfloating) {
+               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+               saveconfig(sel);
+       }
+       arrange();
+}
+
+void
+toggletag(const char *arg) {
+       unsigned int i, j;

 
        if(!sel)
                return;
 
        if(!sel)
                return;

+       i = idxoftag(arg);
+       sel->tags[i] = !sel->tags[i];
+       for(j = 0; j < ntags && !sel->tags[j]; j++);
+       if(j == ntags)
+               sel->tags[i] = True;
+       saveconfig(sel);
+       arrange();
+}
+
+void
+toggleview(const char *arg) {
+       unsigned int i, j;

 
 

-       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);
+       i = idxoftag(arg);
+       seltags[i] = !seltags[i];
+       for(j = 0; j < ntags && !seltags[j]; j++);
+       if(j == ntags)
+               seltags[i] = True; /* cannot toggle last view */
+       arrange();
+}
+
+void
+view(const char *arg) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltags[i] = arg == NULL;
+       i = idxoftag(arg);
+       if(i >= 0 && i < ntags)
+               seltags[i] = True;
+       arrange();

 }
 }