applied Jukka's sigchld patch

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 553194d..e2f306c 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -51,7 +51,7 @@
 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
-#define TAGMASK                 ((int)((1LL << LENGTH(tags)) - 1))
+#define TAGMASK                 ((1 << LENGTH(tags)) - 1)
 #define TEXTW(X)                (textnw(X, strlen(X)) + dc.font.height)
 
 /* enums */
@@ -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);
@@ -271,7 +271,7 @@ static Window root;
 #include "config.h"
 
 /* compile-time check if all tags fit into an unsigned int bit array. */
-struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
+struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
 
 /* function implementations */
 void
@@ -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;
+                               *w = *h * c->maxa + 0.5;
                        else if(c->mina < (float)*h / *w)
-                               *h = *w * c->mina;
+                               *h = *w * c->mina + 0.5;
                }
                if(baseismin) { /* increment calculation requires this */
                        *w -= c->basew;
@@ -380,7 +380,6 @@ void
 arrange(void) {
        Monitor *m;
 
-       /* optimise two loops into one, check focus(NULL) */
        for(m = mons; m; m = m->next)
                showhide(m->stack);
        focus(NULL);
@@ -420,9 +419,9 @@ buttonpress(XEvent *e) {
        }
        if(ev->window == selmon->barwin) {
                i = x = 0;
-               do
+               do {
                        x += TEXTW(tags[i]);
-               while(ev->x >= x && ++i < LENGTH(tags));
+               } while(ev->x >= x && ++i < LENGTH(tags));
                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;
@@ -440,7 +439,7 @@ buttonpress(XEvent *e) {
        }
        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
-                  && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+               && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
                        buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 }
 
@@ -885,7 +884,7 @@ getstate(Window w) {
        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-                       &real, &format, &n, &extra, (unsigned char **)&p);
+                                   &real, &format, &n, &extra, (unsigned char **)&p);
        if(status != Success)
                return -1;
        if(n != 0)
@@ -909,9 +908,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
        if(name.encoding == XA_STRING)
                strncpy(text, (char *)name.value, size - 1);
        else {
-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-               && n > 0 && *list)
-               {
+               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }
@@ -977,6 +974,7 @@ initfont(const char *fontstr) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
+
                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
@@ -1021,8 +1019,8 @@ keypress(XEvent *e) {
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
-                  && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-                  && keys[i].func)
+               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+               && keys[i].func)
                        keys[i].func(&(keys[i].arg));
 }
 
@@ -1167,7 +1165,7 @@ movemouse(const Arg *arg) {
                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);
                        if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
-                               && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+                       && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
                                if(abs(selmon->wx - nx) < snap)
                                        nx = selmon->wx;
                                else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
@@ -1177,15 +1175,14 @@ movemouse(const Arg *arg) {
                                else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
                                        ny = selmon->wy + selmon->wh - HEIGHT(c);
                                if(!c->isfloating && selmon->lt[selmon->sellt]->arrange
-                                                 && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                               && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
                                        togglefloating(NULL);
                        }
                        if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
                                resize(c, nx, ny, c->w, c->h, True);
                        break;
                }
-       }
-       while(ev.type != ButtonRelease);
+       } while(ev.type != ButtonRelease);
        XUngrabPointer(dpy, CurrentTime);
        if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
                sendmon(c, m);
@@ -1279,7 +1276,7 @@ resizemouse(const Arg *arg) {
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-       None, cursor[CurResize], CurrentTime) != GrabSuccess)
+                       None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        do {
@@ -1294,17 +1291,17 @@ resizemouse(const Arg *arg) {
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
                        if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
-                               && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
+                       && nh >= selmon->wy && nh <= selmon->wy + selmon->wh)
+                       {
                                if(!c->isfloating && selmon->lt[selmon->sellt]->arrange
-                                  && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                               && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }
                        if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
-       }
-       while(ev.type != ButtonRelease);
+       } while(ev.type != ButtonRelease);
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        XUngrabPointer(dpy, CurrentTime);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -1347,7 +1344,7 @@ run(void) {
        XSync(dpy, False);
        while(running && !XNextEvent(dpy, &ev))
                if(handler[ev.type])
-                       (handler[ev.type])(&ev); /* call handler */
+                       handler[ev.type](&ev); /* call handler */
 }
 
 void
@@ -1431,6 +1428,9 @@ setup(void) {
        int w;
        XSetWindowAttributes wa;
 
+       /* clean up any zombies immediately */
+       sigchld(0);
+
        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
@@ -1474,8 +1474,8 @@ setup(void) {
        /* select for events */
        wa.cursor = cursor[CurNormal];
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
-                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
-                       |PropertyChangeMask;
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
+                       |PropertyChangeMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
        grabkeys();
@@ -1499,13 +1499,14 @@ showhide(Client *c) {
 
 
 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) {
-       signal(SIGCHLD, sigchld);
        if(fork() == 0) {
                if(dpy)
                        close(ConnectionNumber(dpy));
@@ -1691,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++) {
@@ -1810,8 +1817,8 @@ updatesizehints(Client *c) {
        else
                c->minw = c->minh = 0;
        if(size.flags & PAspect) {
-               c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
-               c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
+               c->mina = (float)size.min_aspect.y / size.min_aspect.x;
+               c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
        }
        else
                c->maxa = c->mina = 0.0;