added pertag patch
authorGabriel Pérez-Cerezo <gabriel@gpcf.eu>
Sat, 21 Jan 2017 11:45:48 +0000 (12:45 +0100)
committerGabriel Pérez-Cerezo <gabriel@gpcf.eu>
Sat, 21 Jan 2017 11:45:48 +0000 (12:45 +0100)
config.def.h
dwm.c

index 9713920..4bcf89e 100644 (file)
@@ -4,8 +4,8 @@
 static const char font[]            = "Latin Modern Mono 9";
 static const char normbordercolor[] = "#444444";
 static const char normbgcolor[]     = "#000022";
-static const char normfgcolor[]     = "#ddff00";
-static const char selbordercolor[]  = "#000088";
+static const char normfgcolor[]     = "#ddaaff";
+static const char selbordercolor[]  = "#aa00aa";
 static const char selbgcolor[]      = "#000022";
 static const char selfgcolor[]      = "#ffffff";
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
@@ -15,14 +15,16 @@ static const Bool topbar            = True;     /* False means bottom bar */
 static const Bool statusmarkup      = True;     /* True means use pango markup in status message */
 
 /* tagging */
-static const char *tags[] = { "one",  "two", "three", "four", "five" };
+static const char *tags[] = { "1",  "2", "3", "4", "5", "6", "7", "8", "9" };
 
 static const Rule rules[] = {
-       /* class      instance    title       tags mask     isfloating   monitor */
-       { "Gimp",       NULL,       NULL,       1 << 3,            True,        -1 },
-       { "Iceweasel",  NULL,       NULL,       1 << 4,       False,       -1 },
-       { "Firefox",    NULL,       NULL,       1 << 4,       False,       -1 },
-       { "Emacs",      NULL,       NULL,       1,            False,       -1 },
+  /* class      instance    title       tags mask     isfloating   monitor */
+  { "Gimp",       NULL,       NULL,       1 << 3,       False,        -1 },
+  { "fontforge",  NULL,       NULL,       1 << 2,       True,        -1 },
+  { "Iceweasel",  NULL,       NULL,       1 << 4,       False,       -1 },
+  { "Firefox",    NULL,       NULL,       1 << 4,       False,       -1 },
+  { "Emacs",      NULL,       NULL,       1,            False,       -1 },
+  { "Pidgin",     NULL,       NULL,       1 << 5,       False,       -1 },
 };
 
 /* layout(s) */
@@ -59,46 +61,47 @@ static const char *getmail[]   = { "/home/gpcf/software/mail/getmail.sh", NULL};
 static const char *sendmail[] = { "/home/gpcf/software/mail/sendmail.sh", NULL};
 
 static Key keys[] = {
-       /* modifier                     key        function        argument */
-        { MODKEY,                       XK_a,      spawn,          {.v = sshadd} },
-       { MODKEY,                       XK_s,      spawn,          {.v = sendmail} },
-       { MODKEY,                       XK_g,      spawn,          {.v = getmail} },
-       { MODKEY,                       XK_x,      spawn,          {.v = dmenucmd } },
-       { MODKEY|ShiftMask,             XK_l,      spawn,          {.v = lockcmd } },
-       { MODKEY,                       XK_e,      findwindow,     {.v= "Emacs"} },
-       { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-       { MODKEY,                       XK_b,      togglebar,      {0} },
-       { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-       { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-       { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-       { MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
-       { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-       { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-       { MODKEY,                       XK_Return, zoom,           {0} },
-       { MODKEY,                       XK_Tab,    view,           {0} },
-       { MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-       { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[1]} },
-       { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
-       { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[0]} },
-       { MODKEY,                       XK_space,  setlayout,      {0} },
-       { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-       { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-       { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-       { MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
-       { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-       { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-       { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-       { MODKEY,                       XK_w,      list_clients,   {0} },
-       TAGKEYS(                        XK_1,                      0)
-       TAGKEYS(                        XK_2,                      1)
-       TAGKEYS(                        XK_3,                      2)
-       TAGKEYS(                        XK_4,                      3)
-       TAGKEYS(                        XK_5,                      4)
-       TAGKEYS(                        XK_6,                      5)
-       TAGKEYS(                        XK_7,                      6)
-       TAGKEYS(                        XK_8,                      7)
-       TAGKEYS(                        XK_9,                      8)
-       { MODKEY|ShiftMask,             XK_q,      quit,           {0} },
+  /* modifier                     key        function        argument */
+  { MODKEY,                       XK_a,      spawn,          {.v = sshadd} },
+  { MODKEY,                       XK_s,      spawn,          {.v = sendmail} },
+  { MODKEY,                       XK_g,      spawn,          {.v = getmail} },
+  { MODKEY,                       XK_x,      spawn,          {.v = dmenucmd } },
+  { MODKEY|ShiftMask,             XK_l,      spawn,          {.v = lockcmd } },
+  { MODKEY,                       XK_e,      findwindow,     {.v= "Emacs"} },
+  { MODKEY,                       XK_p,      findwindow,     {.v= "Pidgin"} },
+  { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+  { MODKEY,                       XK_b,      togglebar,      {0} },
+  { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+  { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+  { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+  { MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
+  { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+  { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
+  { MODKEY,                       XK_Return, zoom,           {0} },
+  { MODKEY,                       XK_Tab,    view,           {0} },
+  { MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
+  { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[1]} },
+  { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
+  { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[0]} },
+  { MODKEY,                       XK_space,  setlayout,      {0} },
+  { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
+  { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+  { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+  { MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+  { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+  { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+  { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
+  { MODKEY,                       XK_w,      list_clients,   {0} },
+  TAGKEYS(                        XK_1,                      0)
+  TAGKEYS(                        XK_2,                      1)
+  TAGKEYS(                        XK_3,                      2)
+  TAGKEYS(                        XK_4,                      3)
+  TAGKEYS(                        XK_5,                      4)
+  TAGKEYS(                        XK_6,                      5)
+  TAGKEYS(                        XK_7,                      6)
+  TAGKEYS(                        XK_8,                      7)
+  TAGKEYS(                        XK_9,                      8)
+  { MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 };
 
 /* button definitions */
diff --git a/dwm.c b/dwm.c
index 560144a..a9e8198 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -135,6 +135,7 @@ typedef struct {
        void (*arrange)(Monitor *);
 } Layout;
 
+typedef struct Pertag Pertag;
 struct Monitor {
        char ltsymbol[16];
        float mfact;
@@ -154,6 +155,7 @@ struct Monitor {
        Monitor *next;
        Window barwin;
        const Layout *lt[2];
+       Pertag *pertag;
 };
 
 typedef struct {
@@ -301,6 +303,15 @@ static Window root;
 /* 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  */
+       Bool 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]; };
 
@@ -666,6 +677,7 @@ configurerequest(XEvent *e) {
 Monitor *
 createmon(void) {
        Monitor *m;
+       int i;
 
        if(!(m = (Monitor *)calloc(1, sizeof(Monitor))))
                die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
@@ -677,6 +689,24 @@ createmon(void) {
        m->lt[0] = &layouts[0];
        m->lt[1] = &layouts[1 % LENGTH(layouts)];
        strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+       if(!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))
+               die("fatal: could not malloc() %u bytes\n", sizeof(Pertag));
+       m->pertag->curtag = m->pertag->prevtag = 1;
+       for(i=0; i <= LENGTH(tags); i++) {
+               /* init nmaster */
+               m->pertag->nmasters[i] = m->nmaster;
+
+               /* init mfacts */
+               m->pertag->mfacts[i] = m->mfact;
+
+               /* init layouts */
+               m->pertag->ltidxs[i][0] = m->lt[0];
+               m->pertag->ltidxs[i][1] = m->lt[1];
+               m->pertag->sellts[i] = m->sellt;
+
+               /* init showbar */
+               m->pertag->showbars[i] = m->showbar;
+       }
        return m;
 }
 
@@ -1082,7 +1112,7 @@ grabkeys(void) {
 
 void
 incnmaster(const Arg *arg) {
-       selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+       selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
        arrange(selmon);
 }
 
@@ -1615,10 +1645,13 @@ setfullscreen(Client *c, Bool fullscreen) {
 
 void
 setlayout(const Arg *arg) {
-       if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-               selmon->sellt ^= 1;
+       if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) {
+               selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
+               selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+       }
        if(arg && arg->v)
-               selmon->lt[selmon->sellt] = (Layout *)arg->v;
+               selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
+       selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
        strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
        if(selmon->sel)
                arrange(selmon);
@@ -1636,7 +1669,7 @@ setmfact(const Arg *arg) {
        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
        if(f < 0.1 || f > 0.9)
                return;
-       selmon->mfact = f;
+       selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
        arrange(selmon);
 }
 
@@ -1790,7 +1823,7 @@ tile(Monitor *m) {
 
 void
 togglebar(const Arg *arg) {
-       selmon->showbar = !selmon->showbar;
+       selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
        updatebarpos(selmon);
        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
        arrange(selmon);
@@ -1824,9 +1857,29 @@ toggletag(const Arg *arg) {
 void
 toggleview(const Arg *arg) {
        unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+       int i;
 
        if(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;
+               }
                selmon->tagset[selmon->seltags] = newtagset;
+
+               /* 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);
        }
@@ -2104,11 +2157,33 @@ 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->pertag->prevtag = selmon->pertag->curtag;
                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+               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);
 }