fixing c->weight handling

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index a718ebd..5337d25 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -30,94 +30,8 @@ RULES
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 

-void (*arrange)(Arg *) = DEFMODE;
-

 /* extern */
 
 /* extern */
 

-void
-dofloat(Arg *arg)
-{
-       Client *c;
-
-       for(c = clients; c; c = c->next) {
-               c->ismax = False;
-               if(isvisible(c)) {
-                       resize(c, True, TopLeft);
-               }
-               else
-                       ban(c);
-       }
-       if((sel = getnext(clients))) {
-               focus(sel);
-               restack();
-       }
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-}
-
-void
-dotile(Arg *arg)
-{
-       int h, i, n, w;
-       Client *c;
-
-       w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
-
-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
-
-       for(i = 0, c = clients; c; c = c->next) {
-               c->ismax = False;
-               if(isvisible(c)) {
-                       if(c->isfloat) {
-                               resize(c, True, TopLeft);
-                               continue;
-                       }
-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       else if(h > bh) {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2;
-                               if(i + 1 == n)
-                                       c->h = sh - c->y - 2;
-                               else
-                                       c->h = h - 2;
-                       }
-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
-                               c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       resize(c, False, TopLeft);
-                       i++;
-               }
-               else
-                       ban(c);
-       }
-       if((sel = getnext(clients)))
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-       restack();
-}
-

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


@@ -161,84 +75,21 @@ initrregs()
        }
 }
 
        }
 }
 

-Bool
-isvisible(Client *c)
-{
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltag[i])
-                       return True;
-       return False;
-}
-
-void
-restack()
-{
-       static unsigned int nwins = 0;
-       static Window *wins = NULL;
-       unsigned int f, fi, m, mi, n;
-       Client *c;
-       XEvent ev;
-
-       for(f = 0, m = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       if(c->isfloat || arrange == dofloat)
-                               f++;
-                       else
-                               m++;
-               }
-       if(!(n = 2 * (f + m))) {
-               drawstatus();
-               return;
-       }
-       if(nwins < n) {
-               nwins = n;
-               wins = erealloc(wins, nwins * sizeof(Window));
-       }
-
-       fi = 0;
-       mi = 2 * f;
-       if(sel->isfloat || arrange == dofloat) {
-               wins[fi++] = sel->title;
-               wins[fi++] = sel->win;
-       }
-       else {
-               wins[mi++] = sel->title;
-               wins[mi++] = sel->win;
-       }
-       for(c = clients; c; c = c->next)
-               if(isvisible(c) && c != sel) {
-                       if(c->isfloat || arrange == dofloat) {
-                               wins[fi++] = c->title;
-                               wins[fi++] = c->win;
-                       }
-                       else {
-                               wins[mi++] = c->title;
-                               wins[mi++] = c->win;
-                       }
-               }
-       XRestackWindows(dpy, wins, n);
-       drawall();
-       XSync(dpy, False);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-

 void
 settags(Client *c)
 {
 void
 settags(Client *c)
 {

-       char classinst[256];
+       char prop[512];

        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 
        if(XGetClassHint(dpy, c->win, &ch)) {
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 
        if(XGetClassHint(dpy, c->win, &ch)) {

-               snprintf(classinst, sizeof(classinst), "%s:%s",
+               snprintf(prop, sizeof(prop), "%s:%s:%s",

                                ch.res_class ? ch.res_class : "",
                                ch.res_class ? ch.res_class : "",

-                               ch.res_name ? ch.res_name : "");
+                               ch.res_name ? ch.res_name : "", c->name);

                for(i = 0; !matched && i < len; i++)
                for(i = 0; !matched && i < len; i++)

-                       if(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 1, &tmp, 0)) {
+                       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)) {
                                c->isfloat = rule[i].isfloat;
                                for(j = 0; rreg[i].tregex && j < ntags; j++) {
                                        if(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) {


@@ -255,6 +106,7 @@ settags(Client *c)
        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];

+       for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);

 }
 
 void
 }
 
 void


@@ -268,15 +120,7 @@ tag(Arg *arg)
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;

-       settitle(sel);
-       if(!isvisible(sel))
-               arrange(NULL);
-}
-
-void
-togglemode(Arg *arg)
-{
-       arrange = arrange == dofloat ? dotile : dofloat;
+       sel->weight = arg->i;

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


@@ -292,31 +136,6 @@ toggletag(Arg *arg)
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;

-       settitle(sel);
-       if(!isvisible(sel))
-               arrange(NULL);
-}
-
-
-void
-toggleview(Arg *arg)
-{
-       unsigned int i;
-
-       seltag[arg->i] = !seltag[arg->i];
-       for(i = 0; i < ntags && !seltag[i]; i++);
-       if(i == ntags)
-               seltag[arg->i] = True; /* cannot toggle last view */
-       arrange(NULL);
-}
-
-void
-view(Arg *arg)
-{
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               seltag[i] = False;
-       seltag[arg->i] = True;
+       for(sel->weight = 0; sel->weight < ntags && !sel->tags[sel->weight]; sel->weight++);

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