fix of typo, thx to Enno Gottox Boland

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 883610a..cfe1e7b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -23,11 +23,11 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <X11/cursorfont.h>
@@ -128,6 +128,7 @@ typedef struct {
 } Rule;
 
 /* function declarations */
+static void adjustborder(Client *c, unsigned int bw);
 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);
@@ -178,7 +179,7 @@ static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
-static void showhide(Client *c);
+static void showhide(Client *c, unsigned int ntiled);
 static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
@@ -244,6 +245,16 @@ static Window root, barwin;
 struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */
+void
+adjustborder(Client *c, unsigned int bw) {
+       XWindowChanges wc;
+
+       if(c->bw != bw) {
+               c->bw = wc.border_width = bw;
+               XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
+       }
+}
+
 void
 applyrules(Client *c) {
        unsigned int i;
@@ -258,7 +269,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)
@@ -272,7 +283,11 @@ applyrules(Client *c) {
 
 void
 arrange(void) {
-       showhide(stack);
+       unsigned int nt;
+       Client *c;
+
+       for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++);
+       showhide(stack, nt);
        focus(NULL);
        if(lt[sellt]->arrange)
                lt[sellt]->arrange();
@@ -924,10 +939,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
@@ -996,7 +1015,7 @@ propertynotify(XEvent *e) {
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
-       if((ev->window == root) && (ev->atom = XA_WM_NAME))
+       if((ev->window == root) && (ev->atom == XA_WM_NAME))
                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */
@@ -1132,8 +1151,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) {
@@ -1326,17 +1345,19 @@ setup(void) {
 }
 
 void
-showhide(Client *c) {
+showhide(Client *c, unsigned int ntiled) {
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
+               if(c->isfloating || ntiled > 1) /* avoid unnecessary border reverts */
+                       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);
-               showhide(c->snext);
+               showhide(c->snext, ntiled);
        }
        else { /* hide clients bottom up */
-               showhide(c->snext);
+               showhide(c->snext, ntiled);
                XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        }
 }
@@ -1393,6 +1414,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)
@@ -1407,6 +1429,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)
@@ -1685,7 +1708,7 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
-               die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
        else if(argc != 1)
                die("usage: dwm [-v]\n");