add pertag patch

config.def.h

@@ -34,7 +34,7 @@ static char *colors[][3]         = {
 };
 
 /* tagging */
-static const char *tags[] = { "", "", "", "", "", "", "", "", "", "?" };
+static const char *tags[] = { "", "", "", "", "", "", "", "", "", "0", "-", "=" };
 
 static const Rule rules[] = {
 	/* xprop(1):
@@ -65,7 +65,7 @@ static const Rule rules[] = {
 	{ "firefox",			NULL,		NULL,		1 << 8,		0,			-1 },
 	// ----- OTHER -----
 	{ "xwinwrap",			NULL,		NULL,		1 << 9,		0,			-1 },
-	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
+//	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
 };
 
 /* layout(s) */
@@ -149,8 +149,6 @@ static const Key keys[] = {
 	{ SUPERKEY,						XK_period,					focusmon,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_comma,					tagmon,				{.i = -1 } },
 	{ SUPERKEY|ShiftMask,			XK_period,					tagmon,				{.i = +1 } },
-	{ SUPERKEY,						XK_minus,					setgaps,			{.i = -1 } },
-	{ SUPERKEY,						XK_equal,					setgaps,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_equal,					setgaps,			{.i = 0  } },
 	{ SUPERKEY|ShiftMask,			XK_t,						togglealwaysontop,	{0} },
 	{ SUPERKEY|ShiftMask,			XK_f,						togglefullscr,		{0} },
@@ -165,6 +163,8 @@ static const Key keys[] = {
 	TAGKEYS(						XK_8,											7)
 	TAGKEYS(						XK_9,											8)
 	TAGKEYS(						XK_0,											9)
+	TAGKEYS(						XK_minus,										10)
+	TAGKEYS(						XK_equal,										11)
 	{ SUPERKEY|ShiftMask,			XK_q,						quitprompt,			{0} },
 };
 

config.h

@@ -34,7 +34,7 @@ static char *colors[][3]         = {
 };
 
 /* tagging */
-static const char *tags[] = { "", "", "", "", "", "", "", "", "", "?" };
+static const char *tags[] = { "", "", "", "", "", "", "", "", "", "0", "-", "=" };
 
 static const Rule rules[] = {
 	/* xprop(1):
@@ -65,7 +65,7 @@ static const Rule rules[] = {
 	{ "firefox",			NULL,		NULL,		1 << 8,		0,			-1 },
 	// ----- OTHER -----
 	{ "xwinwrap",			NULL,		NULL,		1 << 9,		0,			-1 },
-	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
+//	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
 };
 
 /* layout(s) */
@@ -145,14 +145,10 @@ static const Key keys[] = {
 	{ SUPERKEY,						XK_g,						setlayout,			{.v = &layouts[0]} },
 /*	{ SUPERKEY,						XK_space,					setlayout,			{0} }, */
 	{ SUPERKEY|ShiftMask,			XK_space,					togglefloating,		{0} },
-	{ SUPERKEY,						XK_0,						view,				{.ui = ~0 } },
-	{ SUPERKEY|ShiftMask,			XK_0,						tag,				{.ui = ~0 } },
 	{ SUPERKEY,						XK_comma,					focusmon,			{.i = -1 } },
 	{ SUPERKEY,						XK_period,					focusmon,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_comma,					tagmon,				{.i = -1 } },
 	{ SUPERKEY|ShiftMask,			XK_period,					tagmon,				{.i = +1 } },
-	{ SUPERKEY,						XK_minus,					setgaps,			{.i = -1 } },
-	{ SUPERKEY,						XK_equal,					setgaps,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_equal,					setgaps,			{.i = 0  } },
 	{ SUPERKEY|ShiftMask,			XK_t,						togglealwaysontop,	{0} },
 	{ SUPERKEY|ShiftMask,			XK_f,						togglefullscr,		{0} },
@@ -166,6 +162,9 @@ static const Key keys[] = {
 	TAGKEYS(						XK_7,											6)
 	TAGKEYS(						XK_8,											7)
 	TAGKEYS(						XK_9,											8)
+	TAGKEYS(						XK_0,											9)
+	TAGKEYS(						XK_minus,										10)
+	TAGKEYS(						XK_equal,										11)
 	{ SUPERKEY|ShiftMask,			XK_q,						quitprompt,			{0} },
 };
 

dwm.c

@@ -128,6 +128,7 @@ typedef struct {
 	void (*arrange)(Monitor *);
 } Layout;
 
+typedef struct Pertag Pertag;
 struct Monitor {
 	char ltsymbol[16];
 	float mfact;
@@ -151,6 +152,7 @@ struct Monitor {
 	Window barwin;
 	Window extrabarwin;
 	const Layout *lt[2];
+	Pertag *pertag;
 };
 
 typedef struct {
@@ -302,6 +304,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]; };
 
@@ -667,6 +678,7 @@ Monitor *
 createmon(void)
 {
 	Monitor *m;
+	unsigned int i;
 
 	m = ecalloc(1, sizeof(Monitor));
 	m->tagset[0] = m->tagset[1] = 1;
@@ -679,6 +691,19 @@ 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;
 }
 
@@ -1230,7 +1255,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);
 }
 
@@ -1845,9 +1870,9 @@ void
 setlayout(const Arg *arg)
 {
 	if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-		selmon->sellt ^= 1;
+		selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
 	if (arg && arg->v)
-		selmon->lt[selmon->sellt] = (Layout *)arg->v;
+		selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
 	strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
 	if (selmon->sel)
 		arrange(selmon);
@@ -1866,7 +1891,7 @@ setmfact(const Arg *arg)
 	f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
 	if (f < 0.05 || f > 0.95)
 		return;
-	selmon->mfact = f;
+	selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
 	arrange(selmon);
 }
 
@@ -2016,7 +2041,7 @@ void
 togglebar(const Arg *arg)
 {
     if (arg->i == 1 || arg->i == 0) {
-       	selmon->showbar = !selmon->showbar;
+       	selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
        	updatebarpos(selmon);
     	XMoveResizeWindow(dpy, selmon->barwin,      selmon->wx + hpb, selmon->by + vpb,  selmon->ww - 2 * hpb, bh);
     }
@@ -2094,9 +2119,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);
 	}
@@ -2426,31 +2475,37 @@ updatewmhints(Client *c)
 void
 view(const Arg *arg)
 {
+	int i;
+	unsigned int tmptag;
+
 	if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
 		return;
-
-    if (arg->ui != -2)
-        selmon->tagset[selmon->seltags ^ 1] = selmon->tagset[selmon->seltags];
-
-    if (arg->ui == 0) {
-        if (selmon->tagset[selmon->seltags] << 1 > TAGMASK)
-            selmon->tagset[selmon->seltags] = 1;
-        else
-            selmon->tagset[selmon->seltags] <<= 1;
-    }
-    else if (arg->ui == -1) {
-        if (selmon->tagset[selmon->seltags] >> 1 < 1)
-            selmon->tagset[selmon->seltags] = (TAGMASK + 1) >> 1;
-        else
-            selmon->tagset[selmon->seltags] >>= 1;
-    }
-    else if (arg->ui == -2) {
-        selmon->tagset[selmon->seltags] += selmon->tagset[selmon->seltags ^ 1];
-        selmon->tagset[selmon->seltags ^ 1] = selmon->tagset[selmon->seltags] - selmon->tagset[selmon->seltags ^ 1];
-        selmon->tagset[selmon->seltags] -= selmon->tagset[selmon->seltags ^ 1];
-    }
-	else if (arg->ui & TAGMASK)
+	selmon->seltags ^= 1; /* toggle sel tagset */
+	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);