134 lines
3.3 KiB
Diff
134 lines
3.3 KiB
Diff
From feeaa839d2c6c1d0e66649cb64c4added563d4e4 Mon Sep 17 00:00:00 2001
|
|
From: Son Phan Trung <phantrungson17@gmail.com>
|
|
Date: Tue, 12 Mar 2024 18:37:32 +0700
|
|
Subject: [PATCH] patches/cool-autostart: Update patch
|
|
|
|
Updated for the removal of the sigchld() function.
|
|
---
|
|
config.def.h | 5 +++++
|
|
dwm.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
2 files changed, 61 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 9efa774..aba210d 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -18,6 +18,11 @@ static const char *colors[][3] = {
|
|
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
|
};
|
|
|
|
+static const char *const autostart[] = {
|
|
+ "st", NULL,
|
|
+ NULL /* terminate */
|
|
+};
|
|
+
|
|
/* tagging */
|
|
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
|
|
|
diff --git a/dwm.c b/dwm.c
|
|
index f1d86b2..c2eb07d 100644
|
|
--- a/dwm.c
|
|
+++ b/dwm.c
|
|
@@ -233,6 +233,7 @@ static int xerror(Display *dpy, XErrorEvent *ee);
|
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
static void zoom(const Arg *arg);
|
|
+static void autostart_exec(void);
|
|
|
|
/* variables */
|
|
static const char broken[] = "broken";
|
|
@@ -274,6 +275,34 @@ static Window root, wmcheckwin;
|
|
/* compile-time check if all tags fit into an unsigned int bit array. */
|
|
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
|
|
|
+/* dwm will keep pid's of processes from autostart array and kill them at quit */
|
|
+static pid_t *autostart_pids;
|
|
+static size_t autostart_len;
|
|
+
|
|
+/* execute command from autostart array */
|
|
+static void
|
|
+autostart_exec() {
|
|
+ const char *const *p;
|
|
+ size_t i = 0;
|
|
+
|
|
+ /* count entries */
|
|
+ for (p = autostart; *p; autostart_len++, p++)
|
|
+ while (*++p);
|
|
+
|
|
+ autostart_pids = malloc(autostart_len * sizeof(pid_t));
|
|
+ for (p = autostart; *p; i++, p++) {
|
|
+ if ((autostart_pids[i] = fork()) == 0) {
|
|
+ setsid();
|
|
+ execvp(*p, (char *const *)p);
|
|
+ fprintf(stderr, "dwm: execvp %s\n", *p);
|
|
+ perror(" failed");
|
|
+ _exit(EXIT_FAILURE);
|
|
+ }
|
|
+ /* skip arguments */
|
|
+ while (*++p);
|
|
+ }
|
|
+}
|
|
+
|
|
/* function implementations */
|
|
void
|
|
applyrules(Client *c)
|
|
@@ -1258,6 +1287,16 @@ propertynotify(XEvent *e)
|
|
void
|
|
quit(const Arg *arg)
|
|
{
|
|
+ size_t i;
|
|
+
|
|
+ /* 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);
|
|
+ }
|
|
+ }
|
|
+
|
|
running = 0;
|
|
}
|
|
|
|
@@ -1540,6 +1579,7 @@ void
|
|
setup(void)
|
|
{
|
|
int i;
|
|
+ pid_t pid;
|
|
XSetWindowAttributes wa;
|
|
Atom utf8string;
|
|
struct sigaction sa;
|
|
@@ -1551,7 +1591,21 @@ setup(void)
|
|
sigaction(SIGCHLD, &sa, NULL);
|
|
|
|
/* clean up any zombies (inherited from .xinitrc etc) immediately */
|
|
- while (waitpid(-1, NULL, WNOHANG) > 0);
|
|
+ while ((pid = waitpid(-1, NULL, WNOHANG)) > 0) {
|
|
+ pid_t *p, *lim;
|
|
+
|
|
+ if (!(p = autostart_pids))
|
|
+ continue;
|
|
+ lim = &p[autostart_len];
|
|
+
|
|
+ for (; p < lim; p++) {
|
|
+ if (*p == pid) {
|
|
+ *p = -1;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ }
|
|
|
|
/* init screen */
|
|
screen = DefaultScreen(dpy);
|
|
@@ -2152,6 +2206,7 @@ main(int argc, char *argv[])
|
|
if (!(dpy = XOpenDisplay(NULL)))
|
|
die("dwm: cannot open display");
|
|
checkotherwm();
|
|
+ autostart_exec();
|
|
setup();
|
|
#ifdef __OpenBSD__
|
|
if (pledge("stdio rpath proc exec", NULL) == -1)
|
|
--
|
|
2.44.0
|
|
|