fix of typo, thx to Enno Gottox Boland

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index f610e33..cfe1e7b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -41,7 +41,6 @@
 #endif
 
 /* macros */
 #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))
 #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))


@@ -129,6 +128,7 @@ typedef struct {
 } Rule;
 
 /* function declarations */
 } 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);
 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);


@@ -179,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 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);
 static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);


@@ -245,6 +245,16 @@ static Window root, barwin;
 struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */
 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;
 void
 applyrules(Client *c) {
        unsigned int i;


@@ -273,7 +283,11 @@ applyrules(Client *c) {
 
 void
 arrange(void) {
 
 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();
        focus(NULL);
        if(lt[sellt]->arrange)
                lt[sellt]->arrange();


@@ -930,7 +944,7 @@ monocle(void) {
 
        for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
        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))
+               adjustborder(c, n == 1 ? 0 : borderpx);

                resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
        }
 }
                resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
        }
 }


@@ -1001,7 +1015,7 @@ propertynotify(XEvent *e) {
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        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 */
                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */


@@ -1139,6 +1153,7 @@ resizemouse(const Arg *arg) {
                case MotionNotify:
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
                case MotionNotify:
                        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
                        if(snap && nw >= wx && nw <= wx + ww
                                && nh >= wy && nh <= wy + wh) {
                                if(!c->isfloating && lt[sellt]->arrange


@@ -1330,18 +1345,19 @@ setup(void) {
 }
 
 void
 }
 
 void

-showhide(Client *c) {
+showhide(Client *c, unsigned int ntiled) {

        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */

-               ADJUSTBORDER(c, borderpx)
+               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);
                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 */
        }
        else { /* hide clients bottom up */

-               showhide(c->snext);
+               showhide(c->snext, ntiled);

                XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        }
 }
                XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        }
 }


@@ -1398,7 +1414,7 @@ tile(void) {
        /* master */
        c = nexttiled(clients);
        mw = mfact * ww;
        /* master */
        c = nexttiled(clients);
        mw = mfact * ww;

-       ADJUSTBORDER(c, (n == 1 ? 0 : borderpx))
+       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)
        resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
        if(--n == 0)


@@ -1413,7 +1429,7 @@ tile(void) {
                h = wh;
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
                h = wh;
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {

-               ADJUSTBORDER(c, borderpx)
+               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)
                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)


@@ -1692,7 +1708,7 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 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");
 
        else if(argc != 1)
                die("usage: dwm [-v]\n");