added merged patch of anydot and Neale

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 289b508..1b30cae 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 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);
@@ -350,9 +350,9 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
                /* adjust for aspect limits */
                if(c->mina > 0 && c->maxa > 0) {
                        if(c->maxa < (float)*w / *h)
-                               *w = *h * c->maxa + 0.5; /* -Os double upcast workaround */
+                               *w = *h * c->maxa + 0.5;
                        else if(c->mina < (float)*h / *w)
-                               *h = *w * c->mina + 0.5; /* -Os double upcast workaround */
+                               *h = *w * c->mina + 0.5;
                }
                if(baseismin) { /* increment calculation requires this */
                        *w -= c->basew;
@@ -1428,6 +1428,10 @@ setup(void) {
        int w;
        XSetWindowAttributes wa;
 
+       /* clean up any zombies immediately */
+       signal(SIGCHLD, sigchld);
+       sigchld(0);
+
        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
@@ -1496,13 +1500,13 @@ showhide(Client *c) {
 
 
 void
-sigchld(int signal) {
+sigchld(int unused) {
        while(0 < waitpid(-1, NULL, WNOHANG));
+       signal(SIGCHLD, sigchld);
 }
 
 void
 spawn(const Arg *arg) {
-       signal(SIGCHLD, sigchld);
        if(fork() == 0) {
                if(dpy)
                        close(ConnectionNumber(dpy));
@@ -1688,10 +1692,16 @@ updategeom(void) {
        Monitor *newmons = NULL, *m = NULL, *tm;
 
 #ifdef XINERAMA
+       int nn;
        XineramaScreenInfo *info = NULL;
 
        if(XineramaIsActive(dpy))
                info = XineramaQueryScreens(dpy, &n);
+       for(i = 1, nn = n; i < n; i++)
+               if(info[i - 1].x_org == info[i].x_org && info[i - 1].y_org == info[i].y_org
+               && info[i - 1].width == info[i].width && info[i - 1].height == info[i].height)
+                       --nn;
+       n = nn; /* we only consider unique geometries as separate screens */
 #endif /* XINERAMA */
        /* allocate monitor(s) for the new geometry setup */
        for(i = 0; i < n; i++) {