fix client position in list also on tag and toggletag

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 0861128..7bc4da0 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -2,170 +2,149 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */

-
-#include <stdlib.h>
+#include "dwm.h"
+#include <regex.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

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

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

-#include "dwm.h"

 
 

-static Rule rule[] = {
-       /* class                        instance        tags                                            dofloat */
-       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
-};
+typedef struct {
+       const char *clpattern;
+       const char *tpattern;
+       Bool isfloat;
+} Rule;
+
+typedef struct {
+       regex_t *clregex;
+       regex_t *tregex;
+} RReg;
+
+/* static */
+
+TAGS
+RULES

 
 

-void (*arrange)(Arg *) = dotile;
+static RReg *rreg = NULL;
+static unsigned int len = 0;
+
+/* extern */

 
 Client *
 getnext(Client *c)
 {
 
 Client *
 getnext(Client *c)
 {

-       for(; c && !c->tags[tsel]; c = c->next);
+       for(; c && !isvisible(c); c = c->next);

        return c;
 }
 
        return c;
 }
 

-void
-settags(Client *c)
+Client *
+getprev(Client *c)

 {
 {

-       XClassHint ch;
-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-       unsigned int i, j;
-       Bool matched = False;
-
-       if(!len) {
-               c->tags[tsel] = tags[tsel];
-               return;
-       }
-
-       if(XGetClassHint(dpy, c->win, &ch)) {
-               if(ch.res_class && ch.res_name) {
-                       for(i = 0; i < len; i++)
-                               if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
-                                       && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
-                               {
-                                       for(j = 0; j < TLast; j++)
-                                               c->tags[j] = rule[i].tags[j];
-                                       c->dofloat = rule[i].dofloat;
-                                       matched = True;
-                                       break;
-                               }
-               }
-               if(ch.res_class)
-                       XFree(ch.res_class);
-               if(ch.res_name)
-                       XFree(ch.res_name);
-       }
-
-       if(!matched)
-               c->tags[tsel] = tags[tsel];
+       for(; c && !isvisible(c); c = c->prev);
+       return c;

 }
 
 void
 }
 
 void

-view(Arg *arg)
+initrregs()

 {
 {

-       tsel = arg->i;
-       arrange(NULL);
-       drawall();
-}
+       unsigned int i;
+       regex_t *reg;

 
 

-void
-dofloat(Arg *arg)
-{
-       Client *c;
-
-       arrange = dofloat;
-       for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
-                       resize(c, True);
-               else
-                       ban(c);
-       }
-       if(sel && !sel->tags[tsel]) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
+       if(rreg)
+               return;
+       len = sizeof(rule) / sizeof(rule[0]);
+       rreg = emallocz(len * sizeof(RReg));
+
+       for(i = 0; i < len; i++) {
+               if(rule[i].clpattern) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rule[i].clpattern, 0))
+                               free(reg);
+                       else
+                               rreg[i].clregex = reg;
+               }
+               if(rule[i].tpattern) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rule[i].tpattern, 0))
+                               free(reg);
+                       else
+                               rreg[i].tregex = reg;

                }
        }
                }
        }

-       drawall();

 }
 
 void
 }
 
 void

-dotile(Arg *arg)
+settags(Client *c)

 {
 {

-       Client *c;
-       int n, i, w, h;
-
-       w = sw - mw;
-       arrange = dotile;
-       for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel] && !c->dofloat)
-                       n++;
+       char prop[512];
+       unsigned int i, j;
+       regmatch_t tmp;
+       Bool matched = False;
+       XClassHint ch;

 
 

-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
-
-       for(i = 0, c = clients; c; c = c->next) {
-               if(c->tags[tsel]) {
-                       if(c->dofloat) {
-                               higher(c);
-                               resize(c, True);
-                               continue;
-                       }
-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
-                       }
-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
-                       }
-                       else {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
+       if(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; !matched && 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)) {
+                                               matched = True;
+                                               c->tags[j] = True;
+                                       }
+                               }

                        }
                        }

-                       resize(c, False);
-                       i++;
-               }
-               else
-                       ban(c);
-       }
-       if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
-               }
+               if(ch.res_class)
+                       XFree(ch.res_class);
+               if(ch.res_name)
+                       XFree(ch.res_name);

        }
        }

-       drawall();
+       if(!matched)
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = seltag[i];

 }
 
 void
 }
 
 void

-appendtag(Arg *arg)
+tag(Arg *arg)

 {
 {

+       unsigned int i;
+

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

-       sel->tags[arg->i] = tags[arg->i];
-       arrange(NULL);
+       for(i = 0; i < ntags; i++)
+               sel->tags[i] = False;
+       sel->tags[arg->i] = True;
+       settitle(sel);
+       detach(sel);
+       attach(sel);
+       if(!isvisible(sel))
+               arrange(NULL);
+       else
+               drawstatus();

 }
 
 void
 }
 
 void

-replacetag(Arg *arg)
+toggletag(Arg *arg)

 {
 {

-       int i;
+       unsigned int i;
+

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

-       for(i = 0; i < TLast; i++)
-               sel->tags[i] = NULL;
-       appendtag(arg);
+       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);
+       detach(sel);
+       attach(sel);
+       if(!isvisible(sel))
+               arrange(NULL);
+       else
+               drawstatus();

 }
 }

-