summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.def.h5
-rw-r--r--config.h8
-rw-r--r--dwm.c64
-rw-r--r--patches/dwm-cool_autostart-6.5.diff121
4 files changed, 194 insertions, 4 deletions
diff --git a/config.def.h b/config.def.h
index 7578f8a..6da1f2f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -37,6 +37,11 @@ static const char fti_color_sel[] = "#eeeeee"; /* indicator color (selected
static const char fti_color_nor_inv[] = "#bbbbbb"; /* inverse indicator color (not selected tag) */
static const char fti_color_sel_inv[] = "#005577"; /* inverse indicator color (selected tag) */
+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/config.h b/config.h
index d02f376..52fdbc3 100644
--- a/config.h
+++ b/config.h
@@ -24,6 +24,14 @@ static const char *colors[][3] = {
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
};
+static const char *const autostart[] = {
+ "xwallpaper", "--maximize", "/home/v/media/wallpaper.jpg", NULL ,
+ "slstatus", NULL,
+ "xrdb", "-merge", "/home/v/.config/Xresources", NULL,
+ "start-sound", NULL,
+ NULL /* terminate */
+};
+
/* full tag indicator variables */
static const int fti_top = 0; /* 0 means bottom indicator */
static const int fti_border = 0; /* 0 means no border */
diff --git a/dwm.c b/dwm.c
index f59b538..919b9dc 100644
--- a/dwm.c
+++ b/dwm.c
@@ -251,6 +251,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";
@@ -307,6 +308,36 @@ struct Pertag {
/* 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)
@@ -1223,9 +1254,8 @@ monocle(Monitor *m)
for (c = m->clients; c; c = c->next)
if (ISVISIBLE(c))
n++;
- // remove override monocle symbol
- /* if (n > 0)
- snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n); */
+ if (n > 0)
+ snprintf(m->ltsymbol, sizeof m->ltsymbol, "m-%d", n);
for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
resize(c, m->wx, m->wy, m->ww, m->wh, 0, 0);
}
@@ -1363,6 +1393,16 @@ propertynotify(XEvent *e)
void
quit(const Arg *arg)
{
+ size_t n;
+
+ /* kill child processes */
+ for (n = 0; n < autostart_len; n++) {
+ if (0 < autostart_pids[n]) {
+ kill(autostart_pids[n], SIGTERM);
+ waitpid(autostart_pids[n], NULL, 0);
+ }
+ }
+
if(arg->i) restart = 1;
running = 0;
}
@@ -1753,6 +1793,7 @@ setup(void)
XSetWindowAttributes wa;
Atom utf8string;
struct sigaction sa;
+ pid_t pid;
/* do not transform children into zombies when they terminate */
sigemptyset(&sa.sa_mask);
@@ -1761,7 +1802,21 @@ setup(void)
sigaction(SIGCHLD, &sa, NULL);
/* clean up any zombies (inherited from .xinitrc etc) immediately */
- while (waitpid(-1, NULL, WNOHANG) > 0);
+ while (0 < (pid = waitpid(-1, NULL, WNOHANG))) {
+ pid_t *p, *lim;
+
+ if (!(p = autostart_pids))
+ continue;
+ lim = &p[autostart_len];
+
+ for (; p < lim; p++) {
+ if (*p == pid) {
+ *p = -1;
+ break;
+ }
+ }
+
+ }
signal(SIGHUP, sighup);
signal(SIGTERM, sigterm);
@@ -2460,6 +2515,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)
diff --git a/patches/dwm-cool_autostart-6.5.diff b/patches/dwm-cool_autostart-6.5.diff
new file mode 100644
index 0000000..22b6ecd
--- /dev/null
+++ b/patches/dwm-cool_autostart-6.5.diff
@@ -0,0 +1,121 @@
+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..3ce99fc 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,36 @@ 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 +1289,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;
+ }
+
+@@ -1543,6 +1584,7 @@ setup(void)
+ XSetWindowAttributes wa;
+ Atom utf8string;
+ struct sigaction sa;
++ pid_t pid;
+
+ /* do not transform children into zombies when they terminate */
+ sigemptyset(&sa.sa_mask);
+@@ -1551,7 +1593,21 @@ setup(void)
+ sigaction(SIGCHLD, &sa, NULL);
+
+ /* clean up any zombies (inherited from .xinitrc etc) immediately */
+- while (waitpid(-1, NULL, WNOHANG) > 0);
++ while (0 < (pid = waitpid(-1, NULL, WNOHANG))) {
++ 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 +2208,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)
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-26 18:32:15 +0000