changed adjustborder to be a macro

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

@@ -128,7 +129,6 @@ typedef struct {
 } Rule;
 
 /* function declarations */
 } Rule;
 
 /* function declarations */

-static void adjustborder(Client *c, Bool issingle);

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

@@ -246,17 +246,6 @@ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1
 
 /* function implementations */
 void
 
 /* function implementations */
 void

-adjustborder(Client *c, Bool issingle) {
-       XWindowChanges wc;
-
-       wc.border_width = issingle ? 0 : borderpx;
-       if(c->bw != wc.border_width) {
-               c->bw = wc.border_width;
-               XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-       }
-}
-
-void

 applyrules(Client *c) {
        unsigned int i;
        Rule *r;
 applyrules(Client *c) {
        unsigned int i;
        Rule *r;

@@ -941,7 +930,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);
+               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);
        }
 }

@@ -1148,9 +1137,8 @@ resizemouse(const Arg *arg) {
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                        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
                        if(snap && nw >= wx && nw <= wx + ww
                                && nh >= wy && nh <= wy + wh) {
                                if(!c->isfloating && lt[sellt]->arrange

@@ -1346,7 +1334,7 @@ showhide(Client *c) {
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */

-               adjustborder(c, False);
+               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);

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

-       adjustborder(c, n == 1);
+       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)

@@ -1425,7 +1413,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, False);
+               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)