applied Jukka Salmi's setmwfact patch

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 19c63b1..a0ddb0d 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,6 +3,8 @@
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 /* static */
@@ -23,6 +25,30 @@ RULES
 
 static Regs *regs = NULL;
 static unsigned int nrules = 0;
+static char prop[512];
+
+static void
+persistconfig(Client *c) {
+       unsigned int i;
+
+       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);
+}
+
+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 */
 
@@ -33,19 +59,19 @@ compileregs(void) {
 
        if(regs)
                return;
-       nrules = sizeof rule / sizeof rule[0];
+       nrules = sizeof rules / sizeof rules[0];
        regs = emallocz(nrules * sizeof(Regs));
        for(i = 0; i < nrules; i++) {
-               if(rule[i].prop) {
+               if(rules[i].prop) {
                        reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rule[i].prop, REG_EXTENDED))
+                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))
                                free(reg);
                        else
                                regs[i].propregex = reg;
                }
-               if(rule[i].tags) {
+               if(rules[i].tags) {
                        reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))
                                free(reg);
                        else
                                regs[i].tagregex = reg;
@@ -65,23 +91,40 @@ isvisible(Client *c) {
 
 void
 settags(Client *c, Client *trans) {
-       char prop[512];
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
        XClassHint ch = { 0 };
+       XTextProperty name;
 
-       if(matched)
+       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);
                for(i = 0; i < nrules; i++)
                        if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
-                               c->isfloating = rule[i].isfloating;
+                               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;
@@ -97,74 +140,71 @@ settags(Client *c, Client *trans) {
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
-}
-
-void 
-shiftview(const char *arg) {
-       int i, j;
-
-       for(i = 0; !seltag[i]; i++);
-       for(j = i + 1; j < ntags && !seltag[j]; j++);
-       if(j < ntags)
-               return; /* more then one tag selected */
-       seltag[i] = False;
-       i += arg ? atoi(arg) : 0;
-       if(i < 0)
-               i = ntags - 1;
-       else if(i >= ntags)
-               i = 0;
-       seltag[i] = True;
-       lt->arrange();
+       persistconfig(c);
 }
 
 void
 tag(const char *arg) {
-       int i;
+       unsigned int i;
 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = arg == NULL;
-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;
-       lt->arrange();
+       persistconfig(sel);
+       arrange();
+}
+
+void
+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) {
-       int i, j;
+       unsigned int i, j;
 
        if(!sel)
                return;
-       i = arg ? atoi(arg) : 0;
+       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;
-       lt->arrange();
+       persistconfig(sel);
+       arrange();
 }
 
 void
 toggleview(const char *arg) {
-       int i, j;
+       unsigned int i, j;
 
-       i = arg ? atoi(arg) : 0;
+       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 */
-       lt->arrange();
+       arrange();
 }
 
 void
 view(const char *arg) {
-       int i;
+       unsigned int i;
 
        for(i = 0; i < ntags; i++)
                seltag[i] = arg == NULL;
-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                seltag[i] = True;
-       lt->arrange();
+       arrange();
 }