Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
fixed the issue observed by various people, that clients appeared on empty tags
[dwm.git] / tag.c
diff --git a/tag.c b/tag.c
index bc731c9..cf983b8 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,97 +1,132 @@
-/* (C)opyright MMVI-MMVII 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 void
+persistconfig(Client *c) {
+       unsigned int i;
 
 
-Client *
-getnext(Client *c) {
-       for(; c && !isvisible(c); c = c->next);
-       return c;
+       for(i = 0; i < ntags && i < sizeof prop - 1; i++)
+               prop[i] = c->tags[i] ? '1' : '0';
+       if(i < sizeof prop - 1)
+               prop[i++] = c->isfloating ? '1' : '0';
+       prop[i] = '\0';
+       XChangeProperty(dpy, c->win, dwmconfig, XA_STRING, 8,
+                       PropModeReplace, (unsigned char *)prop, i);
 }
 
 }
 
-Client *
-getprev(Client *c) {
-       for(; c && !isvisible(c); c = c->prev);
-       return c;
+static unsigned int
+idxoftag(const char *tag) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(tags[i] == tag)
+                       return i;
+       return 0;
 }
 
 }
 
+/* extern */
+
 void
 void
-initrregs(void) {
+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 rule / sizeof rule[0];
+       regs = emallocz(nrules * sizeof(Regs));
+       for(i = 0; i < nrules; i++) {
+               if(rule[i].prop) {
                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rule[i].clpattern, REG_EXTENDED))
+                       if(regcomp(reg, rule[i].prop, REG_EXTENDED))
                                free(reg);
                        else
                                free(reg);
                        else
-                               rreg[i].clregex = reg;
+                               regs[i].propregex = reg;
                }
                }
-               if(rule[i].tpattern) {
+               if(rule[i].tags) {
                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rule[i].tpattern, REG_EXTENDED))
+                       if(regcomp(reg, rule[i].tags, REG_EXTENDED))
                                free(reg);
                        else
                                free(reg);
                        else
-                               rreg[i].tregex = reg;
+                               regs[i].tagregex = 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
 settags(Client *c, Client *trans) {
 void
 settags(Client *c, Client *trans) {
-       char prop[512];
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
        XClassHint ch = { 0 };
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
        XClassHint ch = { 0 };
+       XTextProperty name;
 
        if(matched) {
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
        }
        else {
 
        if(matched) {
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
        }
        else {
+               /* check if window has set a property */
+               name.nitems = 0;
+               XGetTextProperty(dpy, c->win, &name, dwmconfig);
+               if(name.nitems && name.encoding == XA_STRING) {
+                       strncpy(prop, (char *)name.value, sizeof prop - 1);
+                       prop[sizeof prop - 1] = '\0';
+                       XFree(name.value);
+                       for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
+                               if((c->tags[i] = prop[i] == '1'))
+                                       matched = True;
+                       if(i < sizeof prop - 1 && prop[i] != '\0')
+                               c->isfloating = prop[i] == '1';
+               }
+       }
+       if(!matched) {
+               /* 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);
                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 < 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)) {
+               for(i = 0; i < nrules; i++)
+                       if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
+                               c->isfloating = rule[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;
                                        }
                                                matched = True;
                                                c->tags[j] = True;
                                        }
@@ -105,30 +140,71 @@ settags(Client *c, Client *trans) {
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
+       persistconfig(c);
 }
 
 void
 }
 
 void
-tag(Arg *arg) {
+tag(const char *arg) {
        unsigned int i;
 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        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;
+               sel->tags[i] = arg == NULL;
+       i = idxoftag(arg);
+       if(i >= 0 && i < ntags)
+               sel->tags[i] = True;
+       persistconfig(sel);
        arrange();
 }
 
 void
        arrange();
 }
 
 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);
+               persistconfig(sel);
+       }
+       arrange();
+}
+
+void
+toggletag(const char *arg) {
+       unsigned int i, j;
 
        if(!sel)
                return;
 
        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;
+       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;
+       persistconfig(sel);
+       arrange();
+}
+
+void
+toggleview(const char *arg) {
+       unsigned int i, j;
+
+       i = idxoftag(arg);
+       seltag[i] = !seltag[i];
+       for(j = 0; j < ntags && !seltag[j]; j++);
+       if(j == ntags)
+               seltag[i] = True; /* cannot toggle last view */
+       arrange();
+}
+
+void
+view(const char *arg) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltag[i] = arg == NULL;
+       i = idxoftag(arg);
+       if(i >= 0 && i < ntags)
+               seltag[i] = True;
        arrange();
 }
        arrange();
 }