mirror of
https://github.com/mintycube/dwm.git
synced 2024-10-22 14:05:45 +02:00
onlyquitonempty + cool_autostart: adding proposed compatibility improvements ref. #194
This commit is contained in:
parent
297412adf4
commit
ec6a64a64f
14
dwm.c
14
dwm.c
@ -2750,15 +2750,10 @@ quit(const Arg *arg)
|
|||||||
|
|
||||||
XQueryTree(dpy, root, junk, junk, &junk, &n);
|
XQueryTree(dpy, root, junk, junk, &junk, &n);
|
||||||
|
|
||||||
#if COOL_AUTOSTART_PATCH
|
|
||||||
if (n - autostart_len <= quit_empty_window_count)
|
|
||||||
#else
|
|
||||||
if (n <= quit_empty_window_count)
|
if (n <= quit_empty_window_count)
|
||||||
#endif // COOL_AUTOSTART_PATCH
|
|
||||||
{
|
{
|
||||||
#if RESTARTSIG_PATCH
|
#if RESTARTSIG_PATCH
|
||||||
if (arg->i)
|
restart = arg->i;
|
||||||
restart = 1;
|
|
||||||
#endif // RESTARTSIG_PATCH
|
#endif // RESTARTSIG_PATCH
|
||||||
running = 0;
|
running = 0;
|
||||||
}
|
}
|
||||||
@ -2766,17 +2761,16 @@ quit(const Arg *arg)
|
|||||||
printf("[dwm] not exiting (n=%d)\n", n);
|
printf("[dwm] not exiting (n=%d)\n", n);
|
||||||
|
|
||||||
free(junk);
|
free(junk);
|
||||||
#else
|
#else // !ONLYQUITONEMPTY_PATCH
|
||||||
#if RESTARTSIG_PATCH
|
#if RESTARTSIG_PATCH
|
||||||
if (arg->i)
|
restart = arg->i;
|
||||||
restart = 1;
|
|
||||||
#endif // RESTARTSIG_PATCH
|
#endif // RESTARTSIG_PATCH
|
||||||
running = 0;
|
running = 0;
|
||||||
#endif // ONLYQUITONEMPTY_PATCH
|
#endif // ONLYQUITONEMPTY_PATCH
|
||||||
|
|
||||||
#if COOL_AUTOSTART_PATCH
|
#if COOL_AUTOSTART_PATCH
|
||||||
/* kill child processes */
|
/* kill child processes */
|
||||||
for (i = 0; i < autostart_len; i++) {
|
for (i = 0; i < autostart_len && !running; i++) {
|
||||||
if (0 < autostart_pids[i]) {
|
if (0 < autostart_pids[i]) {
|
||||||
kill(autostart_pids[i], SIGTERM);
|
kill(autostart_pids[i], SIGTERM);
|
||||||
waitpid(autostart_pids[i], NULL, 0);
|
waitpid(autostart_pids[i], NULL, 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user