jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2025-09-08 12:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update to v0.6

Browse Source 
fix https://codeberg.org/dwl/dwl-patches/issues/112
This commit is contained in:
wochap 2024-07-31 13:32:12 +00:00
parent 6133b325e4
commit 65ea99519b
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
patches/pertag/pertag.patch
View File

@ -1,6 +1,6 @@
From c076f18beddb7c0b1714a638143294febcd94ed1 Mon Sep 17 00:00:00 2001 From d3b551ffe3ec85e16341962e322150b81af6722f Mon Sep 17 00:00:00 2001
From: wochap <gean.marroquin@gmail.com> From: wochap <gean.marroquin@gmail.com>
Date: Thu, 11 Apr 2024 15:50:00 -0500 Date: Wed, 31 Jul 2024 08:27:26 -0500
Subject: [PATCH] makes layout, mwfact and nmaster individual for every tag Subject: [PATCH] makes layout, mwfact and nmaster individual for every tag
inspiration: https://github.com/djpohly/dwl/wiki/pertag inspiration: https://github.com/djpohly/dwl/wiki/pertag
@ -9,10 +9,10 @@ inspiration: https://github.com/djpohly/dwl/wiki/pertag
1 file changed, 70 insertions(+), 5 deletions(-) 1 file changed, 70 insertions(+), 5 deletions(-)
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index bf763df..99e2550 100644 index 145fd01..2f364bc 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -101,6 +101,7 @@ typedef struct { @@ -102,6 +102,7 @@ typedef struct {
const Arg arg; const Arg arg;
} Button; } Button;
@ -20,7 +20,7 @@ index bf763df..99e2550 100644
typedef struct Monitor Monitor; typedef struct Monitor Monitor;
typedef struct { typedef struct {
/* Must keep these three elements in this order */ /* Must keep these three elements in this order */
@@ -198,6 +199,7 @@ struct Monitor { @@ -199,6 +200,7 @@ struct Monitor {
struct wlr_box w; /* window area, layout-relative */ 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]; const Layout *lt[2];
@ -28,7 +28,7 @@ index bf763df..99e2550 100644
unsigned int seltags; unsigned int seltags;
unsigned int sellt; unsigned int sellt;
uint32_t tagset[2]; uint32_t tagset[2];
@@ -424,6 +426,14 @@ static xcb_atom_t netatom[NetLast]; @@ -427,6 +429,14 @@ static xcb_atom_t netatom[NetLast];
/* attempt to encapsulate suck into one file */ /* attempt to encapsulate suck into one file */
#include "client.h" #include "client.h"
@ -43,7 +43,7 @@ index bf763df..99e2550 100644
/* function implementations */ /* function implementations */
void void
applybounds(Client *c, struct wlr_box *bbox) applybounds(Client *c, struct wlr_box *bbox)
@@ -698,6 +708,7 @@ cleanupmon(struct wl_listener *listener, void *data) @@ -712,6 +722,7 @@ cleanupmon(struct wl_listener *listener, void *data)
wlr_output_layout_remove(output_layout, m->wlr_output); wlr_output_layout_remove(output_layout, m->wlr_output);
wlr_scene_output_destroy(m->scene_output); wlr_scene_output_destroy(m->scene_output);
@ -51,7 +51,7 @@ index bf763df..99e2550 100644
closemon(m); closemon(m);
wlr_scene_node_destroy(&m->fullscreen_bg->node); wlr_scene_node_destroy(&m->fullscreen_bg->node);
free(m); free(m);
@@ -915,6 +926,18 @@ createmon(struct wl_listener *listener, void *data) @@ -983,6 +994,18 @@ createmon(struct wl_listener *listener, void *data)
wl_list_insert(&mons, &m->link); wl_list_insert(&mons, &m->link);
printstatus(); printstatus();
@ -70,7 +70,7 @@ index bf763df..99e2550 100644
/* The xdg-protocol specifies: /* The xdg-protocol specifies:
* *
* If the fullscreened surface is not opaque, the compositor must make * If the fullscreened surface is not opaque, the compositor must make
@@ -1393,7 +1416,7 @@ incnmaster(const Arg *arg) @@ -1472,7 +1495,7 @@ incnmaster(const Arg *arg)
{ {
if (!arg || !selmon) if (!arg || !selmon)
return; return;
@ -79,7 +79,7 @@ index bf763df..99e2550 100644
arrange(selmon); arrange(selmon);
} }
@@ -2198,9 +2221,9 @@ setlayout(const Arg *arg) @@ -2305,9 +2328,9 @@ setlayout(const Arg *arg)
if (!selmon) if (!selmon)
return; return;
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
@ -91,7 +91,7 @@ index bf763df..99e2550 100644
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol)); strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
arrange(selmon); arrange(selmon);
printstatus(); printstatus();
@@ -2217,7 +2240,7 @@ setmfact(const Arg *arg) @@ -2324,7 +2347,7 @@ setmfact(const Arg *arg)
f = arg->f < 1.0f ? arg->f + selmon->mfact : arg->f - 1.0f; f = arg->f < 1.0f ? arg->f + selmon->mfact : arg->f - 1.0f;
if (f < 0.1 || f > 0.9) if (f < 0.1 || f > 0.9)
return; return;
@ -100,7 +100,7 @@ index bf763df..99e2550 100644
arrange(selmon); arrange(selmon);
} }
@@ -2638,9 +2661,29 @@ void @@ -2701,9 +2724,29 @@ void
toggleview(const Arg *arg) toggleview(const Arg *arg)
{ {
uint32_t newtagset; uint32_t newtagset;
@ -108,7 +108,7 @@ index bf763df..99e2550 100644
if (!(newtagset = selmon ? selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK) : 0)) if (!(newtagset = selmon ? selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK) : 0))
return; return;
+ if (newtagset == TAGMASK) { + if (newtagset == (uint32_t)~0) {
+ selmon->pertag->prevtag = selmon->pertag->curtag; + selmon->pertag->prevtag = selmon->pertag->curtag;
+ selmon->pertag->curtag = 0; + selmon->pertag->curtag = 0;
+ } + }
@ -130,7 +130,7 @@ index bf763df..99e2550 100644
selmon->tagset[selmon->seltags] = newtagset; selmon->tagset[selmon->seltags] = newtagset;
focusclient(focustop(selmon), 1); focusclient(focustop(selmon), 1);
arrange(selmon); arrange(selmon);
@@ -2825,11 +2868,33 @@ urgent(struct wl_listener *listener, void *data) @@ -2892,11 +2935,33 @@ urgent(struct wl_listener *listener, void *data)
void void
view(const Arg *arg) view(const Arg *arg)
{ {
@ -140,7 +140,7 @@ index bf763df..99e2550 100644
return; return;
selmon->seltags ^= 1; /* toggle sel tagset */ selmon->seltags ^= 1; /* toggle sel tagset */
- if (arg->ui & TAGMASK) - if (arg->ui & TAGMASK)
+ if (arg->ui & TAGMASK) { + if (arg->ui & ~0) {
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+ selmon->pertag->prevtag = selmon->pertag->curtag; + selmon->pertag->prevtag = selmon->pertag->curtag;
+ +
@ -166,4 +166,5 @@ index bf763df..99e2550 100644
arrange(selmon); arrange(selmon);
printstatus(); printstatus();
-- --
2.43.2 2.45.2