diff --git a/patches/vanitygaps/README.md b/patches/vanitygaps/README.md index 187cc68..4b40693 100644 --- a/patches/vanitygaps/README.md +++ b/patches/vanitygaps/README.md @@ -3,7 +3,7 @@ Adds (inner) gaps between client windows and (outer) gaps between windows and th ### Download - [git branch](https://codeberg.org/sevz/dwl/src/branch/vanitygaps) -- [2023-11-25](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/vanitygaps/vanitygaps.patch) +- [2024-06-07](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/vanitygaps/vanitygaps.patch) ### Authors - [sevz](https://codeberg.org/sevz) diff --git a/patches/vanitygaps/vanitygaps.patch b/patches/vanitygaps/vanitygaps.patch index 269b882..a1e58a0 100644 --- a/patches/vanitygaps/vanitygaps.patch +++ b/patches/vanitygaps/vanitygaps.patch @@ -1,4 +1,4 @@ -From a01bec27c6a2c4828c2b3a5a852ceb5ca6d84b92 Mon Sep 17 00:00:00 2001 +From acc4b618849ce625d6c32525e91743a96529580f Mon Sep 17 00:00:00 2001 From: Bonicgamer <44382222+Bonicgamer@users.noreply.github.com> Date: Mon, 17 Aug 2020 14:48:24 -0400 Subject: [PATCH 1/2] Implement vanitygaps @@ -13,7 +13,7 @@ Signed-off-by: Leonardo Hernández Hernández 2 files changed, 161 insertions(+), 10 deletions(-) diff --git a/config.def.h b/config.def.h -index a8ed61d..ac56870 100644 +index a784eb4f..6b04d9ff 100644 --- a/config.def.h +++ b/config.def.h @@ -6,7 +6,12 @@ @@ -29,10 +29,10 @@ index a8ed61d..ac56870 100644 static const float rootcolor[] = COLOR(0x222222ff); static const float bordercolor[] = COLOR(0x444444ff); static const float focuscolor[] = COLOR(0x005577ff); -@@ -128,6 +133,22 @@ static const Key keys[] = { +@@ -130,6 +135,22 @@ static const Key keys[] = { { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, - { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05} }, - { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05} }, + { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} }, + { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, + { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_h, incgaps, {.i = +1 } }, + { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_l, incgaps, {.i = -1 } }, + { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_H, incogaps, {.i = +1 } }, @@ -53,10 +53,10 @@ index a8ed61d..ac56870 100644 { MODKEY, XKB_KEY_Tab, view, {0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, diff --git a/dwl.c b/dwl.c -index 10d5a5b..d82078f 100644 +index 6f041a0d..6a3e6fe2 100644 --- a/dwl.c +++ b/dwl.c -@@ -193,6 +193,10 @@ struct Monitor { +@@ -199,6 +199,10 @@ struct Monitor { struct wlr_box w; /* window area, layout-relative */ struct wl_list layers[4]; /* LayerSurface.link */ const Layout *lt[2]; @@ -67,15 +67,15 @@ index 10d5a5b..d82078f 100644 unsigned int seltags; unsigned int sellt; uint32_t tagset[2]; -@@ -254,6 +258,7 @@ static void createmon(struct wl_listener *listener, void *data); - static void createnotify(struct wl_listener *listener, void *data); - static void createpointer(struct wlr_pointer *pointer); +@@ -269,6 +273,7 @@ static void createpointerconstraint(struct wl_listener *listener, void *data); + static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint); static void cursorframe(struct wl_listener *listener, void *data); + static void cursorwarptohint(void); +static void defaultgaps(const Arg *arg); static void destroydecoration(struct wl_listener *listener, void *data); static void destroydragicon(struct wl_listener *listener, void *data); static void destroyidleinhibitor(struct wl_listener *listener, void *data); -@@ -271,6 +276,13 @@ static Client *focustop(Monitor *m); +@@ -288,6 +293,13 @@ static Client *focustop(Monitor *m); static void fullscreennotify(struct wl_listener *listener, void *data); static void handlesig(int signo); static void incnmaster(const Arg *arg); @@ -89,7 +89,7 @@ index 10d5a5b..d82078f 100644 static void inputdevice(struct wl_listener *listener, void *data); static int keybinding(uint32_t mods, xkb_keysym_t sym); static void keypress(struct wl_listener *listener, void *data); -@@ -304,6 +316,7 @@ static void setcursorshape(struct wl_listener *listener, void *data); +@@ -322,6 +334,7 @@ static void setcursorshape(struct wl_listener *listener, void *data); static void setfloating(Client *c, int floating); static void setfullscreen(Client *c, int fullscreen); static void setgamma(struct wl_listener *listener, void *data); @@ -97,7 +97,7 @@ index 10d5a5b..d82078f 100644 static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); static void setmon(Client *c, Monitor *m, uint32_t newtags); -@@ -317,6 +330,7 @@ static void tagmon(const Arg *arg); +@@ -335,6 +348,7 @@ static void tagmon(const Arg *arg); static void tile(Monitor *m); static void togglefloating(const Arg *arg); static void togglefullscreen(const Arg *arg); @@ -105,7 +105,7 @@ index 10d5a5b..d82078f 100644 static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); static void unlocksession(struct wl_listener *listener, void *data); -@@ -384,6 +398,8 @@ static struct wlr_box sgeom; +@@ -407,6 +421,8 @@ static struct wlr_box sgeom; static struct wl_list mons; static Monitor *selmon; @@ -114,7 +114,7 @@ index 10d5a5b..d82078f 100644 #ifdef XWAYLAND static void activatex11(struct wl_listener *listener, void *data); static void associatex11(struct wl_listener *listener, void *data); -@@ -854,6 +870,11 @@ createmon(struct wl_listener *listener, void *data) +@@ -930,6 +946,11 @@ createmon(struct wl_listener *listener, void *data) for (i = 0; i < LENGTH(m->layers); i++) wl_list_init(&m->layers[i]); @@ -126,8 +126,8 @@ index 10d5a5b..d82078f 100644 wlr_output_state_init(&state); /* Initialize monitor state using configured rules */ m->tagset[0] = m->tagset[1] = 1; -@@ -1017,6 +1038,12 @@ cursorframe(struct wl_listener *listener, void *data) - wlr_seat_pointer_notify_frame(seat); +@@ -1131,6 +1152,12 @@ cursorwarptohint(void) + } } +void @@ -139,7 +139,7 @@ index 10d5a5b..d82078f 100644 void destroydecoration(struct wl_listener *listener, void *data) { -@@ -1320,6 +1347,83 @@ incnmaster(const Arg *arg) +@@ -1460,6 +1487,83 @@ incnmaster(const Arg *arg) arrange(selmon); } @@ -223,7 +223,7 @@ index 10d5a5b..d82078f 100644 void inputdevice(struct wl_listener *listener, void *data) { -@@ -2080,6 +2184,16 @@ setgamma(struct wl_listener *listener, void *data) +@@ -2256,6 +2360,16 @@ setgamma(struct wl_listener *listener, void *data) wlr_output_schedule_frame(m->wlr_output); } @@ -240,16 +240,16 @@ index 10d5a5b..d82078f 100644 void setlayout(const Arg *arg) { -@@ -2452,7 +2566,7 @@ tagmon(const Arg *arg) +@@ -2589,7 +2703,7 @@ tagmon(const Arg *arg) void tile(Monitor *m) { -- unsigned int i, n = 0, mw, my, ty; -+ unsigned int i, n = 0, h, r, oe = enablegaps, ie = enablegaps, mw, my, ty; +- unsigned int mw, my, ty; ++ unsigned int mw, my, ty, h, r, oe = enablegaps, ie = enablegaps; + int i, n = 0; Client *c; - wl_list_for_each(c, &clients, link) -@@ -2461,22 +2575,31 @@ tile(Monitor *m) +@@ -2599,22 +2713,31 @@ tile(Monitor *m) if (n == 0) return; @@ -258,8 +258,8 @@ index 10d5a5b..d82078f 100644 + } + if (n > m->nmaster) -- mw = m->nmaster ? m->w.width * m->mfact : 0; -+ mw = m->nmaster ? (m->w.width + m->gappiv*ie) * m->mfact : 0; +- mw = m->nmaster ? ROUND(m->w.width * m->mfact) : 0; ++ mw = m->nmaster ? ROUND((m->w.width + m->gappiv*ie) * m->mfact) : 0; else - mw = m->w.width; - i = my = ty = 0; @@ -290,7 +290,7 @@ index 10d5a5b..d82078f 100644 } i++; } -@@ -2499,6 +2622,13 @@ togglefullscreen(const Arg *arg) +@@ -2637,6 +2760,13 @@ togglefullscreen(const Arg *arg) setfullscreen(sel, !sel->isfullscreen); } @@ -305,10 +305,10 @@ index 10d5a5b..d82078f 100644 toggletag(const Arg *arg) { -- -2.43.0 +2.45.2 -From 4ef9eed5ef259e817c038697d3055425228d58d7 Mon Sep 17 00:00:00 2001 +From d1c6fa3d9e6ca3ed55bf70c91f9da7b335312c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Wed, 20 Jul 2022 00:15:32 -0500 @@ -324,7 +324,7 @@ Signed-off-by: Leonardo Hernández Hernández 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config.def.h b/config.def.h -index ac56870..f52c1fc 100644 +index 6b04d9ff..395b28f4 100644 --- a/config.def.h +++ b/config.def.h @@ -7,6 +7,7 @@ @@ -336,10 +336,10 @@ index ac56870..f52c1fc 100644 static const unsigned int gappih = 10; /* horiz inner gap between windows */ static const unsigned int gappiv = 10; /* vert inner gap between windows */ diff --git a/dwl.c b/dwl.c -index d82078f..854907e 100644 +index 6a3e6fe2..4579a194 100644 --- a/dwl.c +++ b/dwl.c -@@ -1683,8 +1683,12 @@ monocle(Monitor *m) +@@ -1821,8 +1821,12 @@ monocle(Monitor *m) wl_list_for_each(c, &clients, link) { if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) continue; @@ -354,5 +354,5 @@ index d82078f..854907e 100644 if (n) snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n); -- -2.43.0 +2.45.2