changed screenshot command

config.h

@@ -77,11 +77,11 @@ static const Key keys[] = {
 	{ MODKEY,				XK_Up,	  		focusstack,	 	{.i = -1 } 			},
 	{ MODKEY|ShiftMask,		XK_Down,	  	movestack,	 	{.i = +1 } 			},
 	{ MODKEY|ShiftMask,		XK_Up,	  		movestack,	 	{.i = -1 } 			},
+	{ MODKEY|ShiftMask,		XK_Left,	  	setmfact,	   	{.f = -0.05} 		},
+	{ MODKEY|ShiftMask,		XK_Right,	 	setmfact,	   	{.f = +0.05} 		},
 	{ MODKEY,				XK_F12,	  		incnmaster,	 	{.i = +1 } 			},
 	{ MODKEY,				XK_F11,	  		incnmaster,	 	{.i = -1 } 			},
 	{ MODKEY,				XK_exclam,	  	zoom,	 		{0} 				},
-	{ MODKEY,				XK_Left,	  	setmfact,	   	{.f = -0.05} 		},
-	{ MODKEY,				XK_Right,	 	setmfact,	   	{.f = +0.05} 		},
 	{ MODKEY|ShiftMask,		XK_a,	  		killclient,	 	{0} 				},
 	{ MODKEY,				XK_Tab,	  		view,		   	{.ui = ~0 } 		},
 	{ MODKEY|ShiftMask,		XK_Tab,	  		tag,			{.ui = ~0 } 		},
@@ -99,7 +99,7 @@ static const Key keys[] = {
 	{ MODKEY,			 	XK_F7, 			spawn,		  	SHCMD("~/nixos/scripts/susuwatari/client.sh") 	},
 	{ MODKEY,			 	XK_F8, 			spawn,		  	SHCMD("~/nixos/scripts/hdmi_paint.sh") 	},
 	{ MODKEY,			 	XK_F9, 			spawn,		  	SHCMD("~/nixos/scripts/screen_sleep.sh") 	},
-	{ MODKEY,				XK_Print,		spawn,			SHCMD("maim --select \"/home/penwing/Pictures/screenshots/$(date '+%Y_%m_%d %H:%M:%S').png\"")		},
+	{ MODKEY,				XK_Print,		spawn,			SHCMD("~/nixos/scripts/screenshot.sh")		},
 	TAGKEYS(	XK_ampersand,	0)
 	TAGKEYS(	XK_eacute,		1)
 	TAGKEYS(	XK_quotedbl,	2)

dwm-6.1-pertag_without_bar.diff

@@ -1,161 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index 0362114..e44bb24 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -111,6 +111,7 @@ typedef struct {
- 	void (*arrange)(Monitor *);
- } Layout;
- 
-+typedef struct Pertag Pertag;
- struct Monitor {
- 	char ltsymbol[16];
- 	float mfact;
-@@ -130,6 +131,7 @@ struct Monitor {
- 	Monitor *next;
- 	Window barwin;
- 	const Layout *lt[2];
-+	Pertag *pertag;
- };
- 
- typedef struct {
-@@ -270,6 +272,14 @@ 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  */
-+};
-+
- /* compile-time check if all tags fit into an unsigned int bit array. */
- struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
- 
-@@ -640,6 +650,7 @@ Monitor *
- createmon(void)
- {
- 	Monitor *m;
-+	int i;
- 
- 	m = ecalloc(1, sizeof(Monitor));
- 	m->tagset[0] = m->tagset[1] = 1;
-@@ -650,6 +661,21 @@ 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;
-+	}
- 	return m;
- }
- 
-@@ -981,7 +1007,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);
- }
- 
-@@ -1517,10 +1543,13 @@ setfullscreen(Client *c, int 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);
-@@ -1539,7 +1568,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);
- }
- 
-@@ -1731,9 +1760,27 @@ 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];
- 		focus(NULL);
- 		arrange(selmon);
- 	}
-@@ -2031,11 +2078,31 @@ 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];
- 	focus(NULL);
- 	arrange(selmon);
- }