changed adjustborder to be a macro

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index dc63a0b..f610e33 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -40,6 +41,7 @@
 #endif
 
 /* macros */
+#define ADJUSTBORDER(C, BW)     if((C)->bw != (BW)) XSetWindowBorder(dpy, (C)->win, (BW));
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
@@ -178,6 +180,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 spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static int textnw(const char *text, unsigned int len);
@@ -256,7 +259,7 @@ applyrules(Client *c) {
                        && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
                        && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
                                c->isfloating = r->isfloating;
-                               c->tags |= r->tags & TAGMASK;
+                               c->tags |= r->tags & TAGMASK ? r->tags & TAGMASK : tagset[seltags]; 
                        }
                }
                if(ch.res_class)
@@ -341,7 +344,6 @@ cleanup(void) {
        Arg a = {.ui = ~0};
        Layout foo = { "", NULL };
 
-       close(STDIN_FILENO);
        view(&a);
        lt[sellt] = &foo;
        while(stack)
@@ -923,10 +925,14 @@ maprequest(XEvent *e) {
 
 void
 monocle(void) {
+       unsigned int n;
        Client *c;
 
-       for(c = nexttiled(clients); c; c = nexttiled(c->next))
+       for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
+       for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+               ADJUSTBORDER(c, (n == 1 ? 0 : borderpx))
                resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+       }
 }
 
 void
@@ -1131,9 +1137,8 @@ resizemouse(const Arg *arg) {
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
-                       nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
-                       nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1);
-
+                       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 >= wx && nw <= wx + ww
                                && nh >= wy && nh <= wy + wh) {
                                if(!c->isfloating && lt[sellt]->arrange
@@ -1329,6 +1334,7 @@ showhide(Client *c) {
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
+               ADJUSTBORDER(c, borderpx)
                XMoveWindow(dpy, c->win, c->x, c->y);
                if(!lt[sellt]->arrange || c->isfloating)
                        resize(c, c->x, c->y, c->w, c->h, True);
@@ -1340,22 +1346,24 @@ showhide(Client *c) {
        }
 }
 
+
+void
+sigchld(int signal) {
+       while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
 void
 spawn(const Arg *arg) {
-       /* The double-fork construct avoids zombie processes and keeps the code
-        * clean from stupid signal handlers. */
+       signal(SIGCHLD, sigchld);
        if(fork() == 0) {
-               if(fork() == 0) {
-                       if(dpy)
-                               close(ConnectionNumber(dpy));
-                       setsid();
-                       execvp(((char **)arg->v)[0], (char **)arg->v);
-                       fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
-                       perror(" failed");
-               }
+               if(dpy)
+                       close(ConnectionNumber(dpy));
+               setsid();
+               execvp(((char **)arg->v)[0], (char **)arg->v);
+               fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
+               perror(" failed");
                exit(0);
        }
-       wait(0);
 }
 
 void
@@ -1390,6 +1398,7 @@ tile(void) {
        /* master */
        c = nexttiled(clients);
        mw = mfact * ww;
+       ADJUSTBORDER(c, (n == 1 ? 0 : borderpx))
        resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
        if(--n == 0)
@@ -1404,6 +1413,7 @@ tile(void) {
                h = wh;
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+               ADJUSTBORDER(c, borderpx)
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
                       ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
                if(h != wh)