prepared merging layout.c and tag.c into screen.c

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index cf983b8..685308a 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,8 +3,6 @@
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>
-#include <X11/Xatom.h>

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


@@ -27,19 +25,6 @@ static Regs *regs = NULL;
 static unsigned int nrules = 0;
 static char prop[512];
 
 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;
 static unsigned int
 idxoftag(const char *tag) {
        unsigned int i;


@@ -52,6 +37,37 @@ idxoftag(const char *tag) {
 
 /* extern */
 
 
 /* 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
 compileregs(void) {
        unsigned int i;
 void
 compileregs(void) {
        unsigned int i;


@@ -59,19 +75,19 @@ compileregs(void) {
 
        if(regs)
                return;
 
        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++) {
        regs = emallocz(nrules * sizeof(Regs));
        for(i = 0; i < nrules; i++) {

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

                        reg = emallocz(sizeof(regex_t));
                        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;
                }
                                free(reg);
                        else
                                regs[i].propregex = reg;
                }

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

                        reg = emallocz(sizeof(regex_t));
                        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;
                                free(reg);
                        else
                                regs[i].tagregex = reg;


@@ -84,65 +100,11 @@ isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               if(c->tags[i] && seltag[i])
+               if(c->tags[i] && seltags[i])

                        return True;
        return False;
 }
 
                        return True;
        return False;
 }
 

-void
-settags(Client *c, Client *trans) {
-       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 {
-               /* 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;
-                               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] = seltag[i];
-       persistconfig(c);
-}
-

 void
 tag(const char *arg) {
        unsigned int i;
 void
 tag(const char *arg) {
        unsigned int i;


@@ -154,7 +116,7 @@ tag(const char *arg) {
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;

-       persistconfig(sel);
+       saveprops(sel);

        arrange();
 }
 
        arrange();
 }
 


@@ -165,7 +127,7 @@ togglefloating(const char *arg) {
        sel->isfloating = !sel->isfloating;
        if(sel->isfloating) {
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        sel->isfloating = !sel->isfloating;
        if(sel->isfloating) {
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);

-               persistconfig(sel);
+               saveprops(sel);

        }
        arrange();
 }
        }
        arrange();
 }


@@ -181,7 +143,7 @@ toggletag(const char *arg) {
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;

-       persistconfig(sel);
+       saveprops(sel);

        arrange();
 }
 
        arrange();
 }
 


@@ -190,10 +152,11 @@ toggleview(const char *arg) {
        unsigned int i, j;
 
        i = idxoftag(arg);
        unsigned int i, j;
 
        i = idxoftag(arg);

-       seltag[i] = !seltag[i];
-       for(j = 0; j < ntags && !seltag[j]; j++);
+       seltags[i] = !seltags[i];
+       for(j = 0; j < ntags && !seltags[j]; j++);

        if(j == ntags)
        if(j == ntags)

-               seltag[i] = True; /* cannot toggle last view */
+               seltags[i] = True; /* cannot toggle last view */
+       savedwmprops();

        arrange();
 }
 
        arrange();
 }
 


@@ -202,9 +165,10 @@ view(const char *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               seltag[i] = arg == NULL;
+               seltags[i] = arg == NULL;

        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)

-               seltag[i] = True;
+               seltags[i] = True;
+       savedwmprops();

        arrange();
 }
        arrange();
 }