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

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index e9d6445..685308a 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -23,9 +23,51 @@ RULES
 
 static Regs *regs = NULL;
 static unsigned int nrules = 0;
 
 static Regs *regs = NULL;
 static unsigned int nrules = 0;

+static char prop[512];
+
+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 */
 
 
 /* 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;


@@ -33,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;


@@ -58,95 +100,75 @@ 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) {
-       char prop[512];
-       unsigned int i, j;
-       regmatch_t tmp;
-       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_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];
-}
-

 void
 tag(const char *arg) {
 void
 tag(const char *arg) {

-       int i;
+       unsigned int i;

 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = arg == NULL;
 
        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;
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;

-       lt->arrange(NULL);
+       saveprops(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);
+               saveprops(sel);
+       }
+       arrange();

 }
 
 void
 toggletag(const char *arg) {
 }
 
 void
 toggletag(const char *arg) {

-       int i, j;
+       unsigned int i, j;

 
        if(!sel)
                return;
 
        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;
        sel->tags[i] = !sel->tags[i];
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;

-       lt->arrange(NULL);
+       saveprops(sel);
+       arrange();

 }
 
 void
 toggleview(const char *arg) {
 }
 
 void
 toggleview(const char *arg) {

-       int i, j;
+       unsigned int i, j;

 
 

-       i = arg ? atoi(arg) : 0;
-       seltag[i] = !seltag[i];
-       for(j = 0; j < ntags && !seltag[j]; j++);
+       i = idxoftag(arg);
+       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 */
-       lt->arrange(NULL);
+               seltags[i] = True; /* cannot toggle last view */
+       savedwmprops();
+       arrange();

 }
 
 void
 view(const char *arg) {
 }
 
 void
 view(const char *arg) {

-       int i;
+       unsigned int i;

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

-               seltag[i] = arg == NULL;
-       i = arg ? atoi(arg) : 0;
+               seltags[i] = arg == NULL;
+       i = idxoftag(arg);

        if(i >= 0 && i < ntags)
        if(i >= 0 && i < ntags)

-               seltag[i] = True;
-       lt->arrange(NULL);
+               seltags[i] = True;
+       savedwmprops();
+       arrange();

 }
 }