From ac610f623678ca8a97aa74262e00deaf8c0e6096 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Tue, 29 Aug 2023 11:44:35 +0200
Subject: [PATCH] Add starting tagset

---
 dwl_patches/montagset.patch | 28 ++++++++++++++++++++++++++++
 modules/dwl/config.h        | 14 +++++++-------
 overlays/default.nix        |  1 +
 3 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 dwl_patches/montagset.patch

diff --git a/dwl_patches/montagset.patch b/dwl_patches/montagset.patch
new file mode 100644
index 0000000..9b5b772
--- /dev/null
+++ b/dwl_patches/montagset.patch
@@ -0,0 +1,28 @@
+diff --git a/dwl.c b/dwl.c
+index e32e58f..a7c2e28 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -211,6 +211,7 @@ typedef struct {
+ 	const Layout *lt;
+ 	enum wl_output_transform rr;
+ 	int x, y;
++	unsigned tagset;
+ } MonitorRule;
+ 
+ struct pointer_constraint {
+@@ -997,7 +998,6 @@ createmon(struct wl_listener *listener, void *data)
+ 	m->gappiv = gappiv;
+ 	m->gappoh = gappoh;
+ 	m->gappov = gappov;
+-	m->tagset[0] = m->tagset[1] = (1<<getunusedtag()) & TAGMASK;
+ 	for (r = monrules; r < END(monrules); r++) {
+ 		if (!r->name || strstr(wlr_output->name, r->name)) {
+ 			m->mfact = r->mfact;
+@@ -1008,6 +1008,7 @@ createmon(struct wl_listener *listener, void *data)
+ 			wlr_output_set_transform(wlr_output, r->rr);
+ 			m->m.x = r->x;
+ 			m->m.y = r->y;
++			m->tagset[0] = m->tagset[1] = (r->tagset ? r->tagset : (1<<getunusedtag())) & TAGMASK;
+ 			break;
+ 		}
+ 	}
diff --git a/modules/dwl/config.h b/modules/dwl/config.h
index 783b09f..de0cae1 100644
--- a/modules/dwl/config.h
+++ b/modules/dwl/config.h
@@ -33,12 +33,12 @@ static const char *const autostart[] = {
 static const int allow_constrain      = 1;
 
 static const Rule rules[] = {
-	/* app_id     title       tags mask     isfloating   monitor */
+	/* app_id           title       tags mask     isfloating   monitor */
 	/* examples:
-	{ "Gimp",     NULL,       0,            1,           -1 },
+	{ "Gimp",           NULL,       0,            1,           -1 },
 	*/
-	{ "discord",  NULL,       1 << 2,       0,           -1 },
-	{ "youtube-music",  NULL, 1 << 1,       0,           -1 },
+	{ "discord",        NULL,       1 << 2,       0,           -1 },
+	{ "YouTube Music",  NULL,       1 << 0,       0,           -1 },
 };
 
 /* layout(s) */
@@ -52,11 +52,11 @@ static const Layout layouts[] = {
 
 /* monitors */
 static const MonitorRule monrules[] = {
-	/* name       mfact nmaster scale layout       rotate/reflect                x    y */
+	/* name       mfact nmaster scale layout       rotate/reflect                x    y   tagset*/
 	/* example of a HiDPI laptop monitor: */
-	{ "eDP-1",    0.55, 1,   1.75,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
+	{ "eDP-1",    0.55, 1,   1.75,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1, 1 << 3 },
 	/* defaults */
-	{ NULL,       0.55, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
+	{ NULL,       0.55, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1, 0},
 };
 
 /* keyboard */
diff --git a/overlays/default.nix b/overlays/default.nix
index 3b69136..5c51b31 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -33,6 +33,7 @@ in {
         ../dwl_patches/togglelayout.patch
         ../dwl_patches/toggletag.patch
         ../dwl_patches/singletagset.patch
+        ../dwl_patches/montagset.patch
       ];
     });