applied pertag

diff --git a/dwm.c b/dwm.c
index 7b8c1cc..04742a3 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -113,6 +113,7 @@ typedef struct {
        void (*arrange)(Monitor *);
 } Layout;
 
+typedef struct Pertag Pertag;
 struct Monitor {
        char ltsymbol[16];
        float mfact;
@@ -133,6 +134,7 @@ struct Monitor {
        Monitor *next;
        Window barwin;
        const Layout *lt[2];
+       Pertag *pertag;
 };
 
 typedef struct {
@@ -298,6 +300,15 @@ static Window root, wmcheckwin;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
+struct Pertag {
+       unsigned int curtag, prevtag; /* current and previous tag */
+       int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
+       float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
+       unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
+       const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes  */
+       int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
+};
+
 /* compile-time check if all tags fit into an unsigned int bit array. */
 struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
 
@@ -658,6 +669,7 @@ Monitor *
 createmon(void)
 {
        Monitor *m;
+       unsigned int i;
 
        m = ecalloc(1, sizeof(Monitor));
        m->tagset[0] = m->tagset[1] = 1;
@@ -669,6 +681,20 @@ createmon(void)
        m->lt[0] = &layouts[0];
        m->lt[1] = &layouts[1 % LENGTH(layouts)];
        strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+       m->pertag = ecalloc(1, sizeof(Pertag));
+       m->pertag->curtag = m->pertag->prevtag = 1;
+
+       for (i = 0; i <= LENGTH(tags); i++) {
+               m->pertag->nmasters[i] = m->nmaster;
+               m->pertag->mfacts[i] = m->mfact;
+
+               m->pertag->ltidxs[i][0] = m->lt[0];
+               m->pertag->ltidxs[i][1] = m->lt[1];
+               m->pertag->sellts[i] = m->sellt;
+
+               m->pertag->showbars[i] = m->showbar;
+       }
+
        return m;
 }
 
@@ -994,7 +1020,16 @@ grabkeys(void)
 void
 incnmaster(const Arg *arg)
 {
+       unsigned int i;
        selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+       for(i=0; i<LENGTH(tags); ++i)
+               if(selmon->tagset[selmon->seltags] & 1<<i)
+                       selmon->pertag->nmasters[i+1] = selmon->nmaster;
+
+       if(selmon->pertag->curtag == 0)
+       {
+               selmon->pertag->nmasters[0] = selmon->nmaster;
+       }
        arrange(selmon);
 }
 
@@ -1615,11 +1650,26 @@ setgaps(const Arg *arg)
 void
 setlayout(const Arg *arg)
 {
+       unsigned int i;
        if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
                selmon->sellt ^= 1;
        if (arg && arg->v)
                selmon->lt[selmon->sellt] = (Layout *)arg->v;
        strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
+
+       for(i=0; i<LENGTH(tags); ++i)
+               if(selmon->tagset[selmon->seltags] & 1<<i)
+               {
+                       selmon->pertag->ltidxs[i+1][selmon->sellt] = selmon->lt[selmon->sellt];
+                       selmon->pertag->sellts[i+1] = selmon->sellt;
+               }
+
+       if(selmon->pertag->curtag == 0)
+       {
+               selmon->pertag->ltidxs[0][selmon->sellt] = selmon->lt[selmon->sellt];
+               selmon->pertag->sellts[0] = selmon->sellt;
+       }
+
        if (selmon->sel)
                arrange(selmon);
        else
@@ -1631,13 +1681,24 @@ void
 setmfact(const Arg *arg)
 {
        float f;
+       unsigned int i;
 
        if (!arg || !selmon->lt[selmon->sellt]->arrange)
                return;
        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+       if (arg->f == 0.0)
+               f = mfact;
        if (f < 0.05 || f > 0.95)
                return;
        selmon->mfact = f;
+       for(i=0; i<LENGTH(tags); ++i)
+               if(selmon->tagset[selmon->seltags] & 1<<i)
+                       selmon->pertag->mfacts[i+1] = f;
+
+       if(selmon->pertag->curtag == 0)
+       {
+               selmon->pertag->mfacts[0] = f;
+       }
        arrange(selmon);
 }
 
@@ -1820,7 +1881,16 @@ tile(Monitor *m)
 void
 togglebar(const Arg *arg)
 {
+       unsigned int i;
        selmon->showbar = !selmon->showbar;
+       for(i=0; i<LENGTH(tags); ++i)
+               if(selmon->tagset[selmon->seltags] & 1<<i)
+                       selmon->pertag->showbars[i+1] = selmon->showbar;
+
+       if(selmon->pertag->curtag == 0)
+       {
+               selmon->pertag->showbars[0] = selmon->showbar;
+       }
        updatebarpos(selmon);
        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh);
        arrange(selmon);
@@ -1859,9 +1929,33 @@ void
 toggleview(const Arg *arg)
 {
        unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+       int i;
 
        if (newtagset) {
                selmon->tagset[selmon->seltags] = newtagset;
+
+               if (newtagset == ~0) {
+                       selmon->pertag->prevtag = selmon->pertag->curtag;
+                       selmon->pertag->curtag = 0;
+               }
+
+               /* test if the user did not select the same tag */
+               if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
+                       selmon->pertag->prevtag = selmon->pertag->curtag;
+                       for (i = 0; !(newtagset & 1 << i); i++) ;
+                       selmon->pertag->curtag = i + 1;
+               }
+
+               /* apply settings for this view */
+               selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
+               selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
+               selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+               selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
+               selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
+
+               if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
+                       togglebar(NULL);
+
                focus(NULL);
                arrange(selmon);
        }
@@ -2156,11 +2250,37 @@ updatewmhints(Client *c)
 void
 view(const Arg *arg)
 {
+       int i;
+       unsigned int tmptag;
+
        if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
                return;
        selmon->seltags ^= 1; /* toggle sel tagset */
-       if (arg->ui & TAGMASK)
+       if (arg->ui & TAGMASK) {
                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+               selmon->pertag->prevtag = selmon->pertag->curtag;
+
+               if (arg->ui == ~0)
+                       selmon->pertag->curtag = 0;
+               else {
+                       for (i = 0; !(arg->ui & 1 << i); i++) ;
+                       selmon->pertag->curtag = i + 1;
+               }
+       } else {
+               tmptag = selmon->pertag->prevtag;
+               selmon->pertag->prevtag = selmon->pertag->curtag;
+               selmon->pertag->curtag = tmptag;
+       }
+
+       selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
+       selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
+       selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+       selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
+       selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
+
+       if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
+               togglebar(NULL);
+
        focus(NULL);
        arrange(selmon);
 }