added patch file

dwl.c

@@ -100,7 +100,6 @@ typedef struct {
 	const Arg arg;
 } Button;
 
-typedef struct Pertag Pertag;
 typedef struct Monitor Monitor;
 typedef struct {
 	/* Must keep this field first */
@@ -198,7 +197,6 @@ struct Monitor {
 	struct wlr_box w; /* window area, layout-relative */
 	struct wl_list layers[4]; /* LayerSurface.link */
 	const Layout *lt[2];
-	Pertag *pertag;
 	unsigned int seltags;
 	unsigned int sellt;
 	uint32_t tagset[2];
@@ -349,6 +347,7 @@ static void urgent(struct wl_listener *listener, void *data);
 static void view(const Arg *arg);
 static void virtualkeyboard(struct wl_listener *listener, void *data);
 static void virtualpointer(struct wl_listener *listener, void *data);
+static void warpcursor(const Client *c);
 static Monitor *xytomon(double x, double y);
 static void xytonode(double x, double y, struct wlr_surface **psurface,
 		Client **pc, LayerSurface **pl, double *nx, double *ny);
@@ -457,14 +456,6 @@ static struct wlr_xwayland *xwayland;
 /* attempt to encapsulate suck into one file */
 #include "client.h"
 
-struct Pertag {
-	unsigned int curtag, prevtag; /* current and previous tag */
-	int nmasters[TAGCOUNT + 1]; /* number of windows in master area */
-	float mfacts[TAGCOUNT + 1]; /* mfacts per tag */
-	unsigned int sellts[TAGCOUNT + 1]; /* selected layouts */
-	const Layout *ltidxs[TAGCOUNT + 1][2]; /* matrix of tags and layouts indexes  */
-};
-
 /* function implementations */
 void
 applybounds(Client *c, struct wlr_box *bbox)
@@ -550,6 +541,7 @@ arrange(Monitor *m)
 		m->lt[m->sellt]->arrange(m);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 	checkidleinhibitor(NULL);
+	warpcursor(focustop(selmon));
 }
 
 void
@@ -753,7 +745,6 @@ cleanupmon(struct wl_listener *listener, void *data)
 	wlr_output_layout_remove(output_layout, m->wlr_output);
 	wlr_scene_output_destroy(m->scene_output);
 
-	free(m->pertag);
 	closemon(m);
 	wlr_scene_node_destroy(&m->fullscreen_bg->node);
 	free(m);
@@ -1099,18 +1090,6 @@ createmon(struct wl_listener *listener, void *data)
 	wl_list_insert(&mons, &m->link);
 	printstatus();
 
-	m->pertag = calloc(1, sizeof(Pertag));
-	m->pertag->curtag = m->pertag->prevtag = 1;
-
-	for (i = 0; i <= TAGCOUNT; 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;
-	}
-
 	/* The xdg-protocol specifies:
 	 *
 	 * If the fullscreened surface is not opaque, the compositor must make
@@ -1430,6 +1409,10 @@ focusclient(Client *c, int lift)
 	if (locked)
 		return;
 
+	/* Warp cursor to center of client if it is outside */
+	if (lift)
+		warpcursor(c);
+
 	/* Raise client in stacking order if requested */
 	if (c && lift)
 		wlr_scene_node_raise_to_top(&c->scene->node);
@@ -1591,7 +1574,7 @@ incnmaster(const Arg *arg)
 {
 	if (!arg || !selmon)
 		return;
-	selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
+	selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
 	arrange(selmon);
 }
 
@@ -2392,9 +2375,9 @@ setlayout(const Arg *arg)
 	if (!selmon)
 		return;
 	if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-		selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
+		selmon->sellt ^= 1;
 	if (arg && arg->v)
-		selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
+		selmon->lt[selmon->sellt] = (Layout *)arg->v;
 	strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
 	arrange(selmon);
 	printstatus();
@@ -2411,7 +2394,7 @@ setmfact(const Arg *arg)
 	f = arg->f < 1.0f ? arg->f + selmon->mfact : arg->f - 1.0f;
 	if (f < 0.1 || f > 0.9)
 		return;
-	selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
+	selmon->mfact = f;
 	arrange(selmon);
 }
 
@@ -2796,29 +2779,9 @@ void
 toggleview(const Arg *arg)
 {
 	uint32_t newtagset;
-	size_t i;
 	if (!(newtagset = selmon ? selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK) : 0))
 		return;
 
-	if (newtagset == (uint32_t)~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];
-
 	selmon->tagset[selmon->seltags] = newtagset;
 	focusclient(focustop(selmon), 1);
 	arrange(selmon);
@@ -3007,33 +2970,11 @@ urgent(struct wl_listener *listener, void *data)
 void
 view(const Arg *arg)
 {
-	size_t i, tmptag;
-
 	if (!selmon || (arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
 		return;
 	selmon->seltags ^= 1; /* toggle sel tagset */
-	if (arg->ui & ~0) {
+	if (arg->ui & TAGMASK)
 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-		selmon->pertag->prevtag = selmon->pertag->curtag;
-
-		if (arg->ui == TAGMASK)
-			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];
-
 	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
@@ -3064,6 +3005,27 @@ virtualpointer(struct wl_listener *listener, void *data)
 		wlr_cursor_map_input_to_output(cursor, device, event->suggested_output);
 }
 
+void
+warpcursor(const Client *c) {
+	if (cursor_mode != CurNormal) {
+		return;
+	}
+	if (!c && selmon) {
+		wlr_cursor_warp_closest(cursor,
+			  NULL,
+			  selmon->w.x + selmon->w.width / 2.0 ,
+			  selmon->w.y + selmon->w.height / 2.0);
+	}
+	else if ( c && (cursor->x < c->geom.x ||
+		cursor->x > c->geom.x + c->geom.width ||
+		cursor->y < c->geom.y ||
+		cursor->y > c->geom.y + c->geom.height))
+		wlr_cursor_warp_closest(cursor,
+			  NULL,
+			  c->geom.x + c->geom.width / 2.0,
+			  c->geom.y + c->geom.height / 2.0);
+}
+
 Monitor *
 xytomon(double x, double y)
 {

pertag.patch

@@ -1,170 +0,0 @@
-From d3b551ffe3ec85e16341962e322150b81af6722f Mon Sep 17 00:00:00 2001
-From: wochap <gean.marroquin@gmail.com>
-Date: Wed, 31 Jul 2024 08:27:26 -0500
-Subject: [PATCH] makes layout, mwfact and nmaster individual for every tag
-
-inspiration: https://github.com/djpohly/dwl/wiki/pertag
----
- dwl.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 70 insertions(+), 5 deletions(-)
-
-diff --git a/dwl.c b/dwl.c
-index 145fd01..2f364bc 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -102,6 +102,7 @@ typedef struct {
- 	const Arg arg;
- } Button;
- 
-+typedef struct Pertag Pertag;
- typedef struct Monitor Monitor;
- typedef struct {
- 	/* Must keep these three elements in this order */
-@@ -199,6 +200,7 @@ struct Monitor {
- 	struct wlr_box w; /* window area, layout-relative */
- 	struct wl_list layers[4]; /* LayerSurface.link */
- 	const Layout *lt[2];
-+	Pertag *pertag;
- 	unsigned int seltags;
- 	unsigned int sellt;
- 	uint32_t tagset[2];
-@@ -427,6 +429,14 @@ static xcb_atom_t netatom[NetLast];
- /* attempt to encapsulate suck into one file */
- #include "client.h"
- 
-+struct Pertag {
-+	unsigned int curtag, prevtag; /* current and previous tag */
-+	int nmasters[TAGCOUNT + 1]; /* number of windows in master area */
-+	float mfacts[TAGCOUNT + 1]; /* mfacts per tag */
-+	unsigned int sellts[TAGCOUNT + 1]; /* selected layouts */
-+	const Layout *ltidxs[TAGCOUNT + 1][2]; /* matrix of tags and layouts indexes  */
-+};
-+
- /* function implementations */
- void
- applybounds(Client *c, struct wlr_box *bbox)
-@@ -712,6 +722,7 @@ cleanupmon(struct wl_listener *listener, void *data)
- 	wlr_output_layout_remove(output_layout, m->wlr_output);
- 	wlr_scene_output_destroy(m->scene_output);
- 
-+	free(m->pertag);
- 	closemon(m);
- 	wlr_scene_node_destroy(&m->fullscreen_bg->node);
- 	free(m);
-@@ -983,6 +994,18 @@ createmon(struct wl_listener *listener, void *data)
- 	wl_list_insert(&mons, &m->link);
- 	printstatus();
- 
-+	m->pertag = calloc(1, sizeof(Pertag));
-+	m->pertag->curtag = m->pertag->prevtag = 1;
-+
-+	for (i = 0; i <= TAGCOUNT; 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;
-+	}
-+
- 	/* The xdg-protocol specifies:
- 	 *
- 	 * If the fullscreened surface is not opaque, the compositor must make
-@@ -1472,7 +1495,7 @@ incnmaster(const Arg *arg)
- {
- 	if (!arg || !selmon)
- 		return;
--	selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-+	selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
- 	arrange(selmon);
- }
- 
-@@ -2305,9 +2328,9 @@ setlayout(const Arg *arg)
- 	if (!selmon)
- 		return;
- 	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, LENGTH(selmon->ltsymbol));
- 	arrange(selmon);
- 	printstatus();
-@@ -2324,7 +2347,7 @@ setmfact(const Arg *arg)
- 	f = arg->f < 1.0f ? arg->f + selmon->mfact : arg->f - 1.0f;
- 	if (f < 0.1 || f > 0.9)
- 		return;
--	selmon->mfact = f;
-+	selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
- 	arrange(selmon);
- }
- 
-@@ -2701,9 +2724,29 @@ void
- toggleview(const Arg *arg)
- {
- 	uint32_t newtagset;
-+	size_t i;
- 	if (!(newtagset = selmon ? selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK) : 0))
- 		return;
- 
-+	if (newtagset == (uint32_t)~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];
-+
- 	selmon->tagset[selmon->seltags] = newtagset;
- 	focusclient(focustop(selmon), 1);
- 	arrange(selmon);
-@@ -2892,11 +2935,33 @@ urgent(struct wl_listener *listener, void *data)
- void
- view(const Arg *arg)
- {
-+	size_t i, tmptag;
-+
- 	if (!selmon || (arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
- 		return;
- 	selmon->seltags ^= 1; /* toggle sel tagset */
--	if (arg->ui & TAGMASK)
-+	if (arg->ui & ~0) {
- 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-+		selmon->pertag->prevtag = selmon->pertag->curtag;
-+
-+		if (arg->ui == TAGMASK)
-+			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];
-+
- 	focusclient(focustop(selmon), 1);
- 	arrange(selmon);
- 	printstatus();
--- 
-2.45.2
-

warpcursor.patch

@@ -0,0 +1,71 @@
+From 4951ccc89dac2b557994b2f6c3aacb2398e2d1b1 Mon Sep 17 00:00:00 2001
+From: Ben Collerson <benc@benc.cc>
+Date: Thu, 4 Jan 2024 20:30:01 +1000
+Subject: [PATCH] warpcursor
+
+---
+ dwl.c | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/dwl.c b/dwl.c
+index 145fd018..f7ad6c13 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -347,6 +347,7 @@ static void urgent(struct wl_listener *listener, void *data);
+ static void view(const Arg *arg);
+ static void virtualkeyboard(struct wl_listener *listener, void *data);
+ static void virtualpointer(struct wl_listener *listener, void *data);
++static void warpcursor(const Client *c);
+ static Monitor *xytomon(double x, double y);
+ static void xytonode(double x, double y, struct wlr_surface **psurface,
+ 		Client **pc, LayerSurface **pl, double *nx, double *ny);
+@@ -514,6 +515,7 @@ arrange(Monitor *m)
+ 		m->lt[m->sellt]->arrange(m);
+ 	motionnotify(0, NULL, 0, 0, 0, 0);
+ 	checkidleinhibitor(NULL);
++	warpcursor(focustop(selmon));
+ }
+ 
+ void
+@@ -1323,6 +1325,10 @@ focusclient(Client *c, int lift)
+ 	if (locked)
+ 		return;
+ 
++	/* Warp cursor to center of client if it is outside */
++	if (lift)
++		warpcursor(c);
++
+ 	/* Raise client in stacking order if requested */
+ 	if (c && lift)
+ 		wlr_scene_node_raise_to_top(&c->scene->node);
+@@ -2927,6 +2933,27 @@ virtualpointer(struct wl_listener *listener, void *data)
+ 		wlr_cursor_map_input_to_output(cursor, &pointer.base, event->suggested_output);
+ }
+ 
++void
++warpcursor(const Client *c) {
++	if (cursor_mode != CurNormal) {
++		return;
++	}
++	if (!c && selmon) {
++		wlr_cursor_warp_closest(cursor,
++			  NULL,
++			  selmon->w.x + selmon->w.width / 2.0 ,
++			  selmon->w.y + selmon->w.height / 2.0);
++	}
++	else if ( c && (cursor->x < c->geom.x ||
++		cursor->x > c->geom.x + c->geom.width ||
++		cursor->y < c->geom.y ||
++		cursor->y > c->geom.y + c->geom.height))
++		wlr_cursor_warp_closest(cursor,
++			  NULL,
++			  c->geom.x + c->geom.width / 2.0,
++			  c->geom.y + c->geom.height / 2.0);
++}
++
+ Monitor *
+ xytomon(double x, double y)
+ {
+-- 
+2.45.2
+