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 vanitygaps patch

Browse Source 
4ef9eed

no one noticed, right?
This commit is contained in:
Leonardo Hernández Hernández 2023-12-29 02:23:19 +00:00
parent 568df1c3fa
commit 7b7ece4831
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
1 changed files with 328 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

452
vanitygaps/vanitygaps.patch
View File

@ -1,154 +1,358 @@
From c2e65831770a54eebe6eef6e36bfa4716c7e1ada Mon Sep 17 00:00:00 2001 From a01bec27c6a2c4828c2b3a5a852ceb5ca6d84b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= From: Bonicgamer <44382222+Bonicgamer@users.noreply.github.com>
<leohdz172@proton.me> Date: Mon, 17 Aug 2020 14:48:24 -0400
Date: Sat, 8 Jul 2023 17:11:36 -0600 Subject: [PATCH 1/2] Implement vanitygaps
Subject: [PATCH] port autostart patch from dwm
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
https://dwm.suckless.org/patches/cool_autostart/
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 | 7 +++++++ config.def.h | 21 ++++++++
dwl.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++----- dwl.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 61 insertions(+), 5 deletions(-) 2 files changed, 161 insertions(+), 10 deletions(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index a8ed61d..3585711 100644 index a8ed61d..ac56870 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -20,6 +20,13 @@ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can al @@ -6,7 +6,12 @@
/* logging */ /* appearance */
static int log_level = WLR_ERROR; static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
+/* Autostart */ +static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
+static const char *const autostart[] = { static const unsigned int borderpx = 1; /* border pixel of windows */
+ "wbg", "/path/to/your/image", NULL, +static const unsigned int gappih = 10; /* horiz inner gap between windows */
+ NULL /* terminate */ +static const unsigned int gappiv = 10; /* vert inner gap between windows */
+}; +static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
+ +static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
+ static const float rootcolor[] = COLOR(0x222222ff);
static const Rule rules[] = { static const float bordercolor[] = COLOR(0x444444ff);
/* app_id title tags mask isfloating monitor */ static const float focuscolor[] = COLOR(0x005577ff);
/* examples: @@ -128,6 +133,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|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 } },
+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_L, incogaps, {.i = -1 } },
+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_h, incigaps, {.i = +1 } },
+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_l, incigaps, {.i = -1 } },
+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_0, togglegaps, {0} },
+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_parenright,defaultgaps, {0} },
+ { MODKEY, XKB_KEY_y, incihgaps, {.i = +1 } },
+ { MODKEY, XKB_KEY_o, incihgaps, {.i = -1 } },
+ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_y, incivgaps, {.i = +1 } },
+ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_o, incivgaps, {.i = -1 } },
+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_y, incohgaps, {.i = +1 } },
+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_o, incohgaps, {.i = -1 } },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Y, incovgaps, {.i = +1 } },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O, incovgaps, {.i = -1 } },
{ MODKEY, XKB_KEY_Return, zoom, {0} },
{ MODKEY, XKB_KEY_Tab, view, {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 edf0cf1..4b7adc8 100644 index 10d5a5b..d82078f 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -236,6 +236,7 @@ static void arrange(Monitor *m); @@ -193,6 +193,10 @@ struct Monitor {
static void arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box w; /* window area, layout-relative */
struct wlr_box *usable_area, int exclusive); struct wl_list layers[4]; /* LayerSurface.link */
static void arrangelayers(Monitor *m); const Layout *lt[2];
+static void autostartexec(void); + int gappih; /* horizontal gap between windows */
static void axisnotify(struct wl_listener *listener, void *data); + int gappiv; /* vertical gap between windows */
static void buttonpress(struct wl_listener *listener, void *data); + int gappoh; /* horizontal outer gaps */
static void chvt(const Arg *arg); + int gappov; /* vertical outer gaps */
@@ -403,6 +404,9 @@ static xcb_atom_t netatom[NetLast]; unsigned int seltags;
/* attempt to encapsulate suck into one file */ unsigned int sellt;
#include "client.h" 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);
static void cursorframe(struct wl_listener *listener, void *data);
+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);
static void fullscreennotify(struct wl_listener *listener, void *data);
static void handlesig(int signo);
static void incnmaster(const Arg *arg);
+static void incgaps(const Arg *arg);
+static void incigaps(const Arg *arg);
+static void incihgaps(const Arg *arg);
+static void incivgaps(const Arg *arg);
+static void incogaps(const Arg *arg);
+static void incohgaps(const Arg *arg);
+static void incovgaps(const Arg *arg);
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);
static void setfloating(Client *c, int floating);
static void setfullscreen(Client *c, int fullscreen);
static void setgamma(struct wl_listener *listener, void *data);
+static void setgaps(int oh, int ov, int ih, int iv);
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);
static void tile(Monitor *m);
static void togglefloating(const Arg *arg);
static void togglefullscreen(const Arg *arg);
+static void togglegaps(const Arg *arg);
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;
static struct wl_list mons;
static Monitor *selmon;
+static pid_t *autostart_pids; +static int enablegaps = 1; /* enables gaps, used by togglegaps */
+static size_t autostart_len;
+ +
/* function implementations */ #ifdef XWAYLAND
void static void activatex11(struct wl_listener *listener, void *data);
applybounds(Client *c, struct wlr_box *bbox) static void associatex11(struct wl_listener *listener, void *data);
@@ -533,6 +537,27 @@ arrangelayers(Monitor *m) @@ -854,6 +870,11 @@ createmon(struct wl_listener *listener, void *data)
} for (i = 0; i < LENGTH(m->layers); i++)
wl_list_init(&m->layers[i]);
+ m->gappih = gappih;
+ m->gappiv = gappiv;
+ m->gappoh = gappoh;
+ m->gappov = gappov;
+
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);
} }
+void +void
+autostartexec(void) { +defaultgaps(const Arg *arg)
+ const char *const *p; +{
+ size_t i = 0; + setgaps(gappoh, gappov, gappih, gappiv);
+
+ /* count entries */
+ for (p = autostart; *p; autostart_len++, p++)
+ while (*++p);
+
+ autostart_pids = calloc(autostart_len, sizeof(pid_t));
+ for (p = autostart; *p; i++, p++) {
+ if ((autostart_pids[i] = fork()) == 0) {
+ setsid();
+ execvp(*p, (char *const *)p);
+ die("dwl: execvp %s:", *p);
+ }
+ /* skip arguments */
+ while (*++p);
+ }
+} +}
+ +
void void
axisnotify(struct wl_listener *listener, void *data) destroydecoration(struct wl_listener *listener, void *data)
{ {
@@ -630,11 +655,21 @@ checkidleinhibitor(struct wlr_surface *exclude) @@ -1320,6 +1347,83 @@ incnmaster(const Arg *arg)
void arrange(selmon);
cleanup(void) }
{
+ size_t i; +void
#ifdef XWAYLAND +incgaps(const Arg *arg)
wlr_xwayland_destroy(xwayland); +{
xwayland = NULL; + setgaps(
#endif + selmon->gappoh + arg->i,
wl_display_destroy_clients(dpy); + selmon->gappov + arg->i,
+ selmon->gappih + arg->i,
+ selmon->gappiv + arg->i
+ );
+}
+ +
+ /* kill child processes */ +void
+ for (i = 0; i < autostart_len; i++) { +incigaps(const Arg *arg)
+ if (0 < autostart_pids[i]) { +{
+ kill(autostart_pids[i], SIGTERM); + setgaps(
+ waitpid(autostart_pids[i], NULL, 0); + selmon->gappoh,
+ } + selmon->gappov,
+ selmon->gappih + arg->i,
+ selmon->gappiv + arg->i
+ );
+}
+
+void
+incihgaps(const Arg *arg)
+{
+ setgaps(
+ selmon->gappoh,
+ selmon->gappov,
+ selmon->gappih + arg->i,
+ selmon->gappiv
+ );
+}
+
+void
+incivgaps(const Arg *arg)
+{
+ setgaps(
+ selmon->gappoh,
+ selmon->gappov,
+ selmon->gappih,
+ selmon->gappiv + arg->i
+ );
+}
+
+void
+incogaps(const Arg *arg)
+{
+ setgaps(
+ selmon->gappoh + arg->i,
+ selmon->gappov + arg->i,
+ selmon->gappih,
+ selmon->gappiv
+ );
+}
+
+void
+incohgaps(const Arg *arg)
+{
+ setgaps(
+ selmon->gappoh + arg->i,
+ selmon->gappov,
+ selmon->gappih,
+ selmon->gappiv
+ );
+}
+
+void
+incovgaps(const Arg *arg)
+{
+ setgaps(
+ selmon->gappoh,
+ selmon->gappov + arg->i,
+ selmon->gappih,
+ selmon->gappiv
+ );
+}
+
void
inputdevice(struct wl_listener *listener, void *data)
{
@@ -2080,6 +2184,16 @@ setgamma(struct wl_listener *listener, void *data)
wlr_output_schedule_frame(m->wlr_output);
}
+void
+setgaps(int oh, int ov, int ih, int iv)
+{
+ selmon->gappoh = MAX(oh, 0);
+ selmon->gappov = MAX(ov, 0);
+ selmon->gappih = MAX(ih, 0);
+ selmon->gappiv = MAX(iv, 0);
+ arrange(selmon);
+}
+
void
setlayout(const Arg *arg)
{
@@ -2452,7 +2566,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;
Client *c;
wl_list_for_each(c, &clients, link)
@@ -2461,22 +2575,31 @@ tile(Monitor *m)
if (n == 0)
return;
+ if (smartgaps == n) {
+ oe = 0; // outer gaps disabled
+ } + }
+ +
if (child_pid > 0) { if (n > m->nmaster)
kill(child_pid, SIGTERM); - mw = m->nmaster ? m->w.width * m->mfact : 0;
waitpid(child_pid, NULL, 0); + mw = m->nmaster ? (m->w.width + m->gappiv*ie) * m->mfact : 0;
@@ -1295,18 +1330,31 @@ void else
handlesig(int signo) - mw = m->w.width;
{ - i = my = ty = 0;
if (signo == SIGCHLD) { + mw = m->w.width - 2*m->gappov*oe + m->gappiv*ie;
-#ifdef XWAYLAND + i = 0;
siginfo_t in; + my = ty = m->gappoh*oe;
/* wlroots expects to reap the XWayland process itself, so we wl_list_for_each(c, &clients, link) {
* use WNOWAIT to keep the child waitable until we know it's not if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
* XWayland. continue;
*/ if (i < m->nmaster) {
while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid - resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
- && (!xwayland || in.si_pid != xwayland->server->pid)) - .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
- waitpid(in.si_pid, NULL, 0); - my += c->geom.height;
-#else + r = MIN(n, m->nmaster) - i;
- while (waitpid(-1, NULL, WNOHANG) > 0); + h = (m->w.height - my - m->gappoh*oe - m->gappih*ie * (r - 1)) / r;
+#ifdef XWAYLAND + resize(c, (struct wlr_box){.x = m->w.x + m->gappov*oe, .y = m->w.y + my,
+ && (!xwayland || in.si_pid != xwayland->server->pid) + .width = mw - m->gappiv*ie, .height = h}, 0);
#endif + my += c->geom.height + m->gappih*ie;
+ ) { } else {
+ pid_t *p, *lim; - resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
+ waitpid(in.si_pid, NULL, 0); - .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
+ if (in.si_pid == child_pid) - ty += c->geom.height;
+ child_pid = -1; + r = n - i;
+ if (!(p = autostart_pids)) + h = (m->w.height - ty - m->gappoh*oe - m->gappih*ie * (r - 1)) / r;
+ continue; + resize(c, (struct wlr_box){.x = m->w.x + mw + m->gappov*oe, .y = m->w.y + ty,
+ lim = &p[autostart_len]; + .width = m->w.width - mw - 2*m->gappov*oe, .height = h}, 0);
+ + ty += c->geom.height + m->gappih*ie;
+ for (; p < lim; p++) { }
+ if (*p == in.si_pid) { i++;
+ *p = -1;
+ break;
+ }
+ }
+ }
} else if (signo == SIGINT || signo == SIGTERM) {
quit(NULL);
} }
@@ -1966,6 +2014,7 @@ run(char *startup_cmd) @@ -2499,6 +2622,13 @@ togglefullscreen(const Arg *arg)
die("startup: backend_start"); setfullscreen(sel, !sel->isfullscreen);
}
/* Now that the socket exists and the backend is started, run the startup command */ +void
+ autostartexec(); +togglegaps(const Arg *arg)
if (startup_cmd) { +{
int piperw[2]; + enablegaps = !enablegaps;
if (pipe(piperw) < 0) + arrange(selmon);
+}
+
void
toggletag(const Arg *arg)
{
--
2.43.0
From 4ef9eed5ef259e817c038697d3055425228d58d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
<leohdz172@protonmail.com>
Date: Wed, 20 Jul 2022 00:15:32 -0500
Subject: [PATCH 2/2] allow gaps in monocle layout if requested
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
---
config.def.h | 1 +
dwl.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index ac56870..f52c1fc 100644
--- a/config.def.h
+++ b/config.def.h
@@ -7,6 +7,7 @@
static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
+static const int monoclegaps = 0; /* 1 means outer gaps in monocle layout */
static const unsigned int borderpx = 1; /* border pixel of windows */
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
--- a/dwl.c
+++ b/dwl.c
@@ -1683,8 +1683,12 @@ monocle(Monitor *m)
wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
continue;
- resize(c, m->w, 0);
n++;
+ if (!monoclegaps)
+ resize(c, m->w, 0);
+ else
+ resize(c, (struct wlr_box){.x = m->w.x + gappoh, .y = m->w.y + gappov,
+ .width = m->w.width - 2 * gappoh, .height = m->w.height - 2 * gappov}, 0);
}
if (n)
snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
-- --
2.43.0 2.43.0