revert 712d6639ff8e863560328131bbb92b248dc9cde7
This commit is contained in:
parent
787a8bc10d
commit
2cfa02d9b3
2 changed files with 12 additions and 10 deletions
2
config.h
2
config.h
|
@ -245,7 +245,7 @@ static const Key keys[] = {
|
||||||
{ MODKEY, XK_F5, xrdb, {.v = NULL } },
|
{ MODKEY, XK_F5, xrdb, {.v = NULL } },
|
||||||
{ MODKEY, XK_F6, spawn, {.v = (const char*[]){ "torwrap", NULL } } },
|
{ MODKEY, XK_F6, spawn, {.v = (const char*[]){ "torwrap", NULL } } },
|
||||||
{ MODKEY, XK_F7, spawn, {.v = (const char*[]){ "td-toggle", NULL } } },
|
{ MODKEY, XK_F7, spawn, {.v = (const char*[]){ "td-toggle", NULL } } },
|
||||||
{ MODKEY, XK_F8, spawn, {.v = (const char*[]){ "mw", "-Y", NULL } } },
|
{ MODKEY, XK_F8, spawn, {.v = (const char*[]){ "mailsync", NULL } } },
|
||||||
{ MODKEY, XK_F9, spawn, {.v = (const char*[]){ "mounter", NULL } } },
|
{ MODKEY, XK_F9, spawn, {.v = (const char*[]){ "mounter", NULL } } },
|
||||||
{ MODKEY, XK_F10, spawn, {.v = (const char*[]){ "unmounter", NULL } } },
|
{ MODKEY, XK_F10, spawn, {.v = (const char*[]){ "unmounter", NULL } } },
|
||||||
{ MODKEY, XK_F11, spawn, SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },
|
{ MODKEY, XK_F11, spawn, SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },
|
||||||
|
|
20
dwm.c
20
dwm.c
|
@ -259,6 +259,7 @@ static void setmfact(const Arg *arg);
|
||||||
static void setup(void);
|
static void setup(void);
|
||||||
static void seturgent(Client *c, int urg);
|
static void seturgent(Client *c, int urg);
|
||||||
static void showhide(Client *c);
|
static void showhide(Client *c);
|
||||||
|
static void sigchld(int unused);
|
||||||
#ifndef __OpenBSD__
|
#ifndef __OpenBSD__
|
||||||
static int getdwmblockspid();
|
static int getdwmblockspid();
|
||||||
static void sigdwmblocks(const Arg *arg);
|
static void sigdwmblocks(const Arg *arg);
|
||||||
|
@ -1855,16 +1856,9 @@ setup(void)
|
||||||
int i;
|
int i;
|
||||||
XSetWindowAttributes wa;
|
XSetWindowAttributes wa;
|
||||||
Atom utf8string;
|
Atom utf8string;
|
||||||
struct sigaction sa;
|
|
||||||
|
|
||||||
/* do not transform children into zombies when they terminate */
|
/* clean up any zombies immediately */
|
||||||
sigemptyset(&sa.sa_mask);
|
sigchld(0);
|
||||||
sa.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART;
|
|
||||||
sa.sa_handler = SIG_IGN;
|
|
||||||
sigaction(SIGCHLD, &sa, NULL);
|
|
||||||
|
|
||||||
/* clean up any zombies (inherited from .xinitrc etc) immediately */
|
|
||||||
while (waitpid(-1, NULL, WNOHANG) > 0);
|
|
||||||
|
|
||||||
signal(SIGHUP, sighup);
|
signal(SIGHUP, sighup);
|
||||||
signal(SIGTERM, sigterm);
|
signal(SIGTERM, sigterm);
|
||||||
|
@ -1999,6 +1993,14 @@ sigdwmblocks(const Arg *arg)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void
|
||||||
|
sigchld(int unused)
|
||||||
|
{
|
||||||
|
if (signal(SIGCHLD, sigchld) == SIG_ERR)
|
||||||
|
die("can't install SIGCHLD handler:");
|
||||||
|
while (0 < waitpid(-1, NULL, WNOHANG));
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
spawn(const Arg *arg)
|
spawn(const Arg *arg)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue