diff --git a/pertag/pertag.patch b/pertag/pertag.patch index ef265ea..50fac90 100644 --- a/pertag/pertag.patch +++ b/pertag/pertag.patch @@ -1,18 +1,18 @@ -From 6f1d1d667ab417026f4c91993154628ccca03e41 Mon Sep 17 00:00:00 2001 +From c076f18beddb7c0b1714a638143294febcd94ed1 Mon Sep 17 00:00:00 2001 From: wochap -Date: Tue, 5 Mar 2024 23:35:55 -0500 -Subject: [PATCH] apply mortezadadgar pertag patch +Date: Thu, 11 Apr 2024 15:50:00 -0500 +Subject: [PATCH] makes layout, mwfact and nmaster individual for every tag -source: https://github.com/djpohly/dwl/wiki/pertag +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 ef27a1d..1b84350 100644 +index bf763df..99e2550 100644 --- a/dwl.c +++ b/dwl.c -@@ -95,6 +95,7 @@ typedef struct { +@@ -101,6 +101,7 @@ typedef struct { const Arg arg; } Button; @@ -20,15 +20,15 @@ index ef27a1d..1b84350 100644 typedef struct Monitor Monitor; typedef struct { /* Must keep these three elements in this order */ -@@ -190,6 +191,7 @@ struct Monitor { +@@ -198,6 +199,7 @@ struct Monitor { struct wlr_box w; /* window area, layout-relative */ - struct wl_list layers[4]; /* LayerSurface::link */ + struct wl_list layers[4]; /* LayerSurface.link */ const Layout *lt[2]; + Pertag *pertag; unsigned int seltags; unsigned int sellt; uint32_t tagset[2]; -@@ -396,6 +398,14 @@ static xcb_atom_t netatom[NetLast]; +@@ -424,6 +426,14 @@ static xcb_atom_t netatom[NetLast]; /* attempt to encapsulate suck into one file */ #include "client.h" @@ -43,15 +43,15 @@ index ef27a1d..1b84350 100644 /* function implementations */ void applybounds(Client *c, struct wlr_box *bbox) -@@ -673,6 +683,7 @@ cleanupmon(struct wl_listener *listener, void *data) +@@ -698,6 +708,7 @@ cleanupmon(struct wl_listener *listener, void *data) + wlr_output_layout_remove(output_layout, m->wlr_output); wlr_scene_output_destroy(m->scene_output); - wlr_scene_node_destroy(&m->fullscreen_bg->node); + free(m->pertag); closemon(m); + wlr_scene_node_destroy(&m->fullscreen_bg->node); free(m); - } -@@ -912,6 +923,18 @@ createmon(struct wl_listener *listener, void *data) +@@ -915,6 +926,18 @@ createmon(struct wl_listener *listener, void *data) wl_list_insert(&mons, &m->link); printstatus(); @@ -70,7 +70,7 @@ index ef27a1d..1b84350 100644 /* The xdg-protocol specifies: * * If the fullscreened surface is not opaque, the compositor must make -@@ -1328,7 +1351,7 @@ incnmaster(const Arg *arg) +@@ -1393,7 +1416,7 @@ incnmaster(const Arg *arg) { if (!arg || !selmon) return; @@ -79,7 +79,7 @@ index ef27a1d..1b84350 100644 arrange(selmon); } -@@ -2094,9 +2117,9 @@ setlayout(const Arg *arg) +@@ -2198,9 +2221,9 @@ setlayout(const Arg *arg) if (!selmon) return; if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) @@ -91,8 +91,8 @@ index ef27a1d..1b84350 100644 strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol)); arrange(selmon); printstatus(); -@@ -2113,7 +2136,7 @@ setmfact(const Arg *arg) - f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; +@@ -2217,7 +2240,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; @@ -100,16 +100,15 @@ index ef27a1d..1b84350 100644 arrange(selmon); } -@@ -2475,10 +2498,30 @@ void +@@ -2638,9 +2661,29 @@ void toggleview(const Arg *arg) { - uint32_t newtagset = selmon ? selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK) : 0; + uint32_t newtagset; + size_t i; - - if (!newtagset) + if (!(newtagset = selmon ? selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK) : 0)) return; -+ if (newtagset == ~0) { ++ if (newtagset == TAGMASK) { + selmon->pertag->prevtag = selmon->pertag->curtag; + selmon->pertag->curtag = 0; + } @@ -131,7 +130,7 @@ index ef27a1d..1b84350 100644 selmon->tagset[selmon->seltags] = newtagset; focusclient(focustop(selmon), 1); arrange(selmon); -@@ -2659,11 +2702,33 @@ urgent(struct wl_listener *listener, void *data) +@@ -2825,11 +2868,33 @@ urgent(struct wl_listener *listener, void *data) void view(const Arg *arg) { @@ -145,7 +144,7 @@ index ef27a1d..1b84350 100644 selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; + selmon->pertag->prevtag = selmon->pertag->curtag; + -+ if (arg->ui == ~0) ++ if (arg->ui == TAGMASK) + selmon->pertag->curtag = 0; + else { + for (i = 0; !(arg->ui & 1 << i); i++) ; @@ -167,4 +166,4 @@ index ef27a1d..1b84350 100644 arrange(selmon); printstatus(); -- -2.42.0 +2.43.2