applied Jukka's cosmetic patch

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 43f0fd5..74b7795 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);


@@ -564,9 +564,9 @@ configurerequest(XEvent *e) {
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;

-                       if((c->x - m->mx + c->w) > m->mw && c->isfloating)
+                       if((c->x + c->w) > m->mx + m->mw && c->isfloating)

                                c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */
                                c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */

-                       if((c->y - m->my + c->h) > m->mh && c->isfloating)
+                       if((c->y + c->h) > m->my + m->mh && c->isfloating)

                                c->y = m->my + (m->mh / 2 - c->h / 2); /* center in y direction */
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                                c->y = m->my + (m->mh / 2 - c->h / 2); /* center in y direction */
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);


@@ -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));


@@ -1591,23 +1595,23 @@ togglefloating(const Arg *arg) {
 
 void
 toggletag(const Arg *arg) {
 
 void
 toggletag(const Arg *arg) {

-       unsigned int mask;
+       unsigned int newtags;

 
        if(!selmon->sel)
                return;
 
        if(!selmon->sel)
                return;

-       mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
-       if(mask) {
-               selmon->sel->tags = mask;
+       newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
+       if(newtags) {
+               selmon->sel->tags = newtags;

                arrange();
        }
 }
 
 void
 toggleview(const Arg *arg) {
                arrange();
        }
 }
 
 void
 toggleview(const Arg *arg) {

-       unsigned int mask = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+       unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);

 
 

-       if(mask) {
-               selmon->tagset[selmon->seltags] = mask;
+       if(newtagset) {
+               selmon->tagset[selmon->seltags] = newtagset;

                arrange();
        }
 }
                arrange();
        }
 }


@@ -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))


@@ -1696,7 +1701,7 @@ updategeom(void) {
                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;
                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 geometrys as separate screens */
+       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++) {
 #endif /* XINERAMA */
        /* allocate monitor(s) for the new geometry setup */
        for(i = 0; i < n; i++) {