diff options
| author | Warrick Lo <warrick.s.z.lo@gmail.com> | 2021-11-23 01:01:15 -0800 |
|---|---|---|
| committer | Warrick Lo <warrick.s.z.lo@gmail.com> | 2021-11-23 01:01:15 -0800 |
| commit | 957ef3c025424d8a6c0657afc15cb48e59b87356 (patch) | |
| tree | 9ed67e59e7dee26e5cb183aa87a1bd22420593d3 | |
| parent | Add attachaside functionality (diff) | |
Add autostarting functionality
| -rw-r--r-- | config.def.h | 4 | ||||
| -rw-r--r-- | dwm.c | 57 |
2 files changed, 60 insertions, 1 deletions
diff --git a/config.def.h b/config.def.h index 2237251..7a5d203 100644 --- a/config.def.h +++ b/config.def.h @@ -20,6 +20,10 @@ static const char *colors[][3] = { [SchemeSel] = { col_gray4, col_cyan, col_cyan }, }; +static const char *const autostart[] = { + NULL +}; + /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -155,6 +155,7 @@ static void arrangemon(Monitor *m); static void attach(Client *c); static void attachaside(Client *c); static void attachstack(Client *c); +static void autostart_exec(void); static void buttonpress(XEvent *e); static void checkotherwm(void); static void cleanup(void); @@ -296,6 +297,10 @@ 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; + /* function implementations */ void applyrules(Client *c) @@ -447,6 +452,29 @@ attachstack(Client *c) } 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); + } +} + +void buttonpress(XEvent *e) { unsigned int i, x, click; @@ -1321,6 +1349,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; } @@ -1736,9 +1774,25 @@ showhide(Client *c) void sigchld(int unused) { + pid_t pid; + if (signal(SIGCHLD, sigchld) == SIG_ERR) die("can't install SIGCHLD handler:"); - while (0 < waitpid(-1, NULL, WNOHANG)); + 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; + } + } + + } } void @@ -2312,6 +2366,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) |