vanitygaps: rebase against d1c2f434983562bd7d2ace15ab0c05155be603bc

This commit is contained in:
Leonardo Hernández Hernández 2025-01-19 18:10:04 -06:00
parent e92e2ebbe0
commit ff8105d1d2
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
2 changed files with 27 additions and 28 deletions

View File

@ -4,7 +4,7 @@ the screen edge in a flexible manner.
### Download ### Download
- [git branch](https://codeberg.org/sevz/dwl/src/branch/vanitygaps) - [git branch](https://codeberg.org/sevz/dwl/src/branch/vanitygaps)
- [main 2024-09-01](/dwl/dwl-patches/raw/branch/main/patches/vanitygaps/vanitygaps.patch) - [main 2025-01-20](/dwl/dwl-patches/raw/branch/main/patches/vanitygaps/vanitygaps.patch)
- [vanitygaps-0.7.patch](/dwl/dwl-patches/raw/branch/main/patches/vanitygaps/vanitygaps-0.7.patch) - [vanitygaps-0.7.patch](/dwl/dwl-patches/raw/branch/main/patches/vanitygaps/vanitygaps-0.7.patch)
### Authors ### Authors

View File

@ -1,4 +1,4 @@
From a66874e623f8471bf5cee7f7d64ce97fc6cd1564 Mon Sep 17 00:00:00 2001 From 8d29d5cace06c97917fbc26c673fd37731ac4984 Mon Sep 17 00:00:00 2001
From: Bonicgamer <44382222+Bonicgamer@users.noreply.github.com> From: Bonicgamer <44382222+Bonicgamer@users.noreply.github.com>
Date: Mon, 17 Aug 2020 14:48:24 -0400 Date: Mon, 17 Aug 2020 14:48:24 -0400
Subject: [PATCH 1/2] Implement vanitygaps Subject: [PATCH 1/2] Implement vanitygaps
@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me> Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
--- ---
config.def.h | 21 ++++++++ config.def.h | 21 ++++++++
dwl.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++---- dwl.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 161 insertions(+), 10 deletions(-) 2 files changed, 160 insertions(+), 10 deletions(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index 22d2171d..39e528b1 100644 index 22d2171d..39e528b1 100644
@ -53,10 +53,10 @@ index 22d2171d..39e528b1 100644
{ MODKEY, XKB_KEY_Tab, view, {0} }, { MODKEY, XKB_KEY_Tab, view, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 9021e442..14e4627a 100644 index ad21e1ba..fa823957 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -201,6 +201,10 @@ struct Monitor { @@ -197,6 +197,10 @@ 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];
@ -67,7 +67,7 @@ index 9021e442..14e4627a 100644
unsigned int seltags; unsigned int seltags;
unsigned int sellt; unsigned int sellt;
uint32_t tagset[2]; uint32_t tagset[2];
@@ -274,6 +278,7 @@ static void createpopup(struct wl_listener *listener, void *data); @@ -271,6 +275,7 @@ static void createpopup(struct wl_listener *listener, void *data);
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint); static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
static void cursorframe(struct wl_listener *listener, void *data); static void cursorframe(struct wl_listener *listener, void *data);
static void cursorwarptohint(void); static void cursorwarptohint(void);
@ -75,7 +75,7 @@ index 9021e442..14e4627a 100644
static void destroydecoration(struct wl_listener *listener, void *data); static void destroydecoration(struct wl_listener *listener, void *data);
static void destroydragicon(struct wl_listener *listener, void *data); static void destroydragicon(struct wl_listener *listener, void *data);
static void destroyidleinhibitor(struct wl_listener *listener, void *data); static void destroyidleinhibitor(struct wl_listener *listener, void *data);
@@ -294,6 +299,13 @@ static void fullscreennotify(struct wl_listener *listener, void *data); @@ -290,6 +295,13 @@ static void fullscreennotify(struct wl_listener *listener, void *data);
static void gpureset(struct wl_listener *listener, void *data); static void gpureset(struct wl_listener *listener, void *data);
static void handlesig(int signo); static void handlesig(int signo);
static void incnmaster(const Arg *arg); static void incnmaster(const Arg *arg);
@ -89,7 +89,7 @@ index 9021e442..14e4627a 100644
static void inputdevice(struct wl_listener *listener, void *data); static void inputdevice(struct wl_listener *listener, void *data);
static int keybinding(uint32_t mods, xkb_keysym_t sym); static int keybinding(uint32_t mods, xkb_keysym_t sym);
static void keypress(struct wl_listener *listener, void *data); static void keypress(struct wl_listener *listener, void *data);
@@ -327,6 +339,7 @@ static void setcursor(struct wl_listener *listener, void *data); @@ -323,6 +335,7 @@ static void setcursor(struct wl_listener *listener, void *data);
static void setcursorshape(struct wl_listener *listener, void *data); static void setcursorshape(struct wl_listener *listener, void *data);
static void setfloating(Client *c, int floating); static void setfloating(Client *c, int floating);
static void setfullscreen(Client *c, int fullscreen); static void setfullscreen(Client *c, int fullscreen);
@ -97,7 +97,7 @@ index 9021e442..14e4627a 100644
static void setlayout(const Arg *arg); static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg); static void setmfact(const Arg *arg);
static void setmon(Client *c, Monitor *m, uint32_t newtags); static void setmon(Client *c, Monitor *m, uint32_t newtags);
@@ -340,6 +353,7 @@ static void tagmon(const Arg *arg); @@ -336,6 +349,7 @@ static void tagmon(const Arg *arg);
static void tile(Monitor *m); static void tile(Monitor *m);
static void togglefloating(const Arg *arg); static void togglefloating(const Arg *arg);
static void togglefullscreen(const Arg *arg); static void togglefullscreen(const Arg *arg);
@ -105,16 +105,15 @@ index 9021e442..14e4627a 100644
static void toggletag(const Arg *arg); static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg); static void toggleview(const Arg *arg);
static void unlocksession(struct wl_listener *listener, void *data); static void unlocksession(struct wl_listener *listener, void *data);
@@ -411,6 +425,8 @@ static struct wlr_box sgeom; @@ -405,6 +419,7 @@ static struct wlr_output_layout *output_layout;
static struct wlr_box sgeom;
static struct wl_list mons; static struct wl_list mons;
static Monitor *selmon; static Monitor *selmon;
+static int enablegaps = 1; /* enables gaps, used by togglegaps */ +static int enablegaps = 1; /* enables gaps, used by togglegaps */
+
#ifdef XWAYLAND /* global event handlers */
static void activatex11(struct wl_listener *listener, void *data); static struct wl_listener cursor_axis = {.notify = axisnotify};
static void associatex11(struct wl_listener *listener, void *data); @@ -1048,6 +1063,11 @@ createmon(struct wl_listener *listener, void *data)
@@ -985,6 +1001,11 @@ createmon(struct wl_listener *listener, void *data)
for (i = 0; i < LENGTH(m->layers); i++) for (i = 0; i < LENGTH(m->layers); i++)
wl_list_init(&m->layers[i]); wl_list_init(&m->layers[i]);
@ -126,7 +125,7 @@ index 9021e442..14e4627a 100644
wlr_output_state_init(&state); wlr_output_state_init(&state);
/* Initialize monitor state using configured rules */ /* Initialize monitor state using configured rules */
m->tagset[0] = m->tagset[1] = 1; m->tagset[0] = m->tagset[1] = 1;
@@ -1167,6 +1188,12 @@ cursorwarptohint(void) @@ -1230,6 +1250,12 @@ cursorwarptohint(void)
} }
} }
@ -139,7 +138,7 @@ index 9021e442..14e4627a 100644
void void
destroydecoration(struct wl_listener *listener, void *data) destroydecoration(struct wl_listener *listener, void *data)
{ {
@@ -1520,6 +1547,83 @@ incnmaster(const Arg *arg) @@ -1566,6 +1592,83 @@ incnmaster(const Arg *arg)
arrange(selmon); arrange(selmon);
} }
@ -223,7 +222,7 @@ index 9021e442..14e4627a 100644
void void
inputdevice(struct wl_listener *listener, void *data) inputdevice(struct wl_listener *listener, void *data)
{ {
@@ -2310,6 +2414,16 @@ setfullscreen(Client *c, int fullscreen) @@ -2357,6 +2460,16 @@ setfullscreen(Client *c, int fullscreen)
printstatus(); printstatus();
} }
@ -240,7 +239,7 @@ index 9021e442..14e4627a 100644
void void
setlayout(const Arg *arg) setlayout(const Arg *arg)
{ {
@@ -2651,7 +2765,7 @@ tagmon(const Arg *arg) @@ -2701,7 +2814,7 @@ tagmon(const Arg *arg)
void void
tile(Monitor *m) tile(Monitor *m)
{ {
@ -249,7 +248,7 @@ index 9021e442..14e4627a 100644
int i, n = 0; int i, n = 0;
Client *c; Client *c;
@@ -2661,22 +2775,31 @@ tile(Monitor *m) @@ -2711,22 +2824,31 @@ tile(Monitor *m)
if (n == 0) if (n == 0)
return; return;
@ -290,7 +289,7 @@ index 9021e442..14e4627a 100644
} }
i++; i++;
} }
@@ -2699,6 +2822,13 @@ togglefullscreen(const Arg *arg) @@ -2749,6 +2871,13 @@ togglefullscreen(const Arg *arg)
setfullscreen(sel, !sel->isfullscreen); setfullscreen(sel, !sel->isfullscreen);
} }
@ -305,10 +304,10 @@ index 9021e442..14e4627a 100644
toggletag(const Arg *arg) toggletag(const Arg *arg)
{ {
-- --
2.46.0 2.48.0
From 333bf3c468570468ec4525f28ba40a2d8b53ca6b Mon Sep 17 00:00:00 2001 From e3d10f01df9b7d6735ce9e43ebfdca35b8639f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
<leohdz172@protonmail.com> <leohdz172@protonmail.com>
Date: Wed, 20 Jul 2022 00:15:32 -0500 Date: Wed, 20 Jul 2022 00:15:32 -0500
@ -336,10 +335,10 @@ index 39e528b1..f4d4095d 100644
static const unsigned int gappih = 10; /* horiz inner gap between windows */ static const unsigned int gappih = 10; /* horiz inner gap between windows */
static const unsigned int gappiv = 10; /* vert inner gap between windows */ static const unsigned int gappiv = 10; /* vert inner gap between windows */
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 14e4627a..2428a6d1 100644 index fa823957..59eabb54 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -1877,8 +1877,12 @@ monocle(Monitor *m) @@ -1922,8 +1922,12 @@ monocle(Monitor *m)
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
continue; continue;
@ -354,5 +353,5 @@ index 14e4627a..2428a6d1 100644
if (n) if (n)
snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n); snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
-- --
2.46.0 2.48.0