applied Jukka's sigchld patch

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 314d150..e2f306c 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -207,7 +207,7 @@ static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);

-static void sigchld(int signal);
+static void sigchld(int unused);

 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);


@@ -1428,6 +1428,9 @@ setup(void) {
        int w;
        XSetWindowAttributes wa;
 
        int w;
        XSetWindowAttributes wa;
 

+       /* clean up any zombies immediately */
+       sigchld(0);
+

        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);


@@ -1496,13 +1499,14 @@ showhide(Client *c) {
 
 
 void
 
 
 void

-sigchld(int signal) {
+sigchld(int unused) {
+       if(signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("Can't install SIGCHLD handler");

        while(0 < waitpid(-1, NULL, WNOHANG));
 }
 
 void
 spawn(const Arg *arg) {
        while(0 < waitpid(-1, NULL, WNOHANG));
 }
 
 void
 spawn(const Arg *arg) {

-       signal(SIGCHLD, sigchld);

        if(fork() == 0) {
                if(dpy)
                        close(ConnectionNumber(dpy));
        if(fork() == 0) {
                if(dpy)
                        close(ConnectionNumber(dpy));


@@ -1683,11 +1687,12 @@ updatebarpos(Monitor *m) {
 
 void
 updategeom(void) {
 
 void
 updategeom(void) {

-       int i, n = 1, nn;
+       int i, n = 1;

        Client *c;
        Monitor *newmons = NULL, *m = NULL, *tm;
 
 #ifdef XINERAMA
        Client *c;
        Monitor *newmons = NULL, *m = NULL, *tm;
 
 #ifdef XINERAMA

+       int nn;

        XineramaScreenInfo *info = NULL;
 
        if(XineramaIsActive(dpy))
        XineramaScreenInfo *info = NULL;
 
        if(XineramaIsActive(dpy))