update master-right patch

4693a27

no one noticed, right?
This commit is contained in:
Leonardo Hernández Hernández 2023-12-29 02:23:19 +00:00
parent 73250a34e3
commit 5ecd6e48a4
No known key found for this signature in database
GPG Key ID: E538897EE11B9624

View File

@ -1,154 +1,35 @@
From c2e65831770a54eebe6eef6e36bfa4716c7e1ada Mon Sep 17 00:00:00 2001 From 4693a27d3c435883743f60dbe3c0c523bdc1a0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= From: Sevz17 <leohdz172@outlook.com>
<leohdz172@proton.me> Date: Fri, 25 Jun 2021 19:50:56 -0500
Date: Sat, 8 Jul 2023 17:11:36 -0600 Subject: [PATCH] show master area to the right
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 +++++++ dwl.c | 5 +++--
dwl.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 3 insertions(+), 2 deletions(-)
2 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/config.def.h b/config.def.h
index a8ed61d..3585711 100644
--- a/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
/* logging */
static int log_level = WLR_ERROR;
+/* Autostart */
+static const char *const autostart[] = {
+ "wbg", "/path/to/your/image", NULL,
+ NULL /* terminate */
+};
+
+
static const Rule rules[] = {
/* app_id title tags mask isfloating monitor */
/* examples:
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index edf0cf1..4b7adc8 100644 index 10d5a5b..5ae2605 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -236,6 +236,7 @@ static void arrange(Monitor *m); @@ -2470,11 +2470,12 @@ tile(Monitor *m)
static void arrangelayer(Monitor *m, struct wl_list *list, if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
struct wlr_box *usable_area, int exclusive); continue;
static void arrangelayers(Monitor *m); if (i < m->nmaster) {
+static void autostartexec(void); - resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
static void axisnotify(struct wl_listener *listener, void *data); + resize(c, (struct wlr_box){.x = m->w.x + m->w.width - mw,
static void buttonpress(struct wl_listener *listener, void *data); + .y = m->w.y + my, .width = mw,
static void chvt(const Arg *arg); .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
@@ -403,6 +404,9 @@ static xcb_atom_t netatom[NetLast]; my += c->geom.height;
/* attempt to encapsulate suck into one file */ } else {
#include "client.h" - resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
+ resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + ty,
+static pid_t *autostart_pids; .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
+static size_t autostart_len; ty += c->geom.height;
+ }
/* function implementations */
void
applybounds(Client *c, struct wlr_box *bbox)
@@ -533,6 +537,27 @@ arrangelayers(Monitor *m)
}
}
+void
+autostartexec(void) {
+ const char *const *p;
+ size_t i = 0;
+
+ /* 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
axisnotify(struct wl_listener *listener, void *data)
{
@@ -630,11 +655,21 @@ checkidleinhibitor(struct wlr_surface *exclude)
void
cleanup(void)
{
+ size_t i;
#ifdef XWAYLAND
wlr_xwayland_destroy(xwayland);
xwayland = NULL;
#endif
wl_display_destroy_clients(dpy);
+
+ /* kill child processes */
+ for (i = 0; i < autostart_len; i++) {
+ if (0 < autostart_pids[i]) {
+ kill(autostart_pids[i], SIGTERM);
+ waitpid(autostart_pids[i], NULL, 0);
+ }
+ }
+
if (child_pid > 0) {
kill(child_pid, SIGTERM);
waitpid(child_pid, NULL, 0);
@@ -1295,18 +1330,31 @@ void
handlesig(int signo)
{
if (signo == SIGCHLD) {
-#ifdef XWAYLAND
siginfo_t in;
/* wlroots expects to reap the XWayland process itself, so we
* use WNOWAIT to keep the child waitable until we know it's not
* XWayland.
*/
while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid
- && (!xwayland || in.si_pid != xwayland->server->pid))
- waitpid(in.si_pid, NULL, 0);
-#else
- while (waitpid(-1, NULL, WNOHANG) > 0);
+#ifdef XWAYLAND
+ && (!xwayland || in.si_pid != xwayland->server->pid)
#endif
+ ) {
+ pid_t *p, *lim;
+ waitpid(in.si_pid, NULL, 0);
+ if (in.si_pid == child_pid)
+ child_pid = -1;
+ if (!(p = autostart_pids))
+ continue;
+ lim = &p[autostart_len];
+
+ for (; p < lim; p++) {
+ if (*p == in.si_pid) {
+ *p = -1;
+ break;
+ }
+ }
+ }
} else if (signo == SIGINT || signo == SIGTERM) {
quit(NULL);
}
@@ -1966,6 +2014,7 @@ run(char *startup_cmd)
die("startup: backend_start");
/* Now that the socket exists and the backend is started, run the startup command */
+ autostartexec();
if (startup_cmd) {
int piperw[2];
if (pipe(piperw) < 0)
-- --
2.43.0 2.43.0