em/dwm
1
0
Fork 0
Code Releases Activity

changed adjustborder to be a macro

Browse Source
This commit is contained in:
a@null 2008-12-19 23:56:00 +00:00
parent fef4614772
commit b16d8282be
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dwm.c
View File

@ -41,6 +41,7 @@
#endif #endif
/* macros */ /* macros */
#define ADJUSTBORDER(C, BW) if((C)->bw != (BW)) XSetWindowBorder(dpy, (C)->win, (BW));
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) #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 INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
@ -128,7 +129,6 @@ typedef struct {
} Rule; } Rule;
/* function declarations */ /* function declarations */
static void adjustborder(Client *c, Bool issingle);
static void applyrules(Client *c); static void applyrules(Client *c);
static void arrange(void); static void arrange(void);
static void attach(Client *c); static void attach(Client *c);
@ -245,17 +245,6 @@ static Window root, barwin;
struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; }; struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
/* function implementations */ /* 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 void
applyrules(Client *c) { applyrules(Client *c) {
unsigned int i; unsigned int i;
@ -941,7 +930,7 @@ monocle(void) {
for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++); for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
for(c = nexttiled(clients); c; c = nexttiled(c->next)) { 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); handler[ev.type](&ev);
break; break;
case MotionNotify: case MotionNotify:
nw = MAX(ev.xmotion.x - ocx - 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); nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
if(snap && nw >= wx && nw <= wx + ww if(snap && nw >= wx && nw <= wx + ww
&& nh >= wy && nh <= wy + wh) { && nh >= wy && nh <= wy + wh) {
if(!c->isfloating && lt[sellt]->arrange if(!c->isfloating && lt[sellt]->arrange
@ -1346,7 +1334,7 @@ showhide(Client *c) {
if(!c) if(!c)
return; return;
if(ISVISIBLE(c)) { /* show clients top down */ if(ISVISIBLE(c)) { /* show clients top down */
adjustborder(c, False); ADJUSTBORDER(c, borderpx)
XMoveWindow(dpy, c->win, c->x, c->y); XMoveWindow(dpy, c->win, c->x, c->y);
if(!lt[sellt]->arrange || c->isfloating) if(!lt[sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True); resize(c, c->x, c->y, c->w, c->h, True);
@ -1410,7 +1398,7 @@ tile(void) {
/* master */ /* master */
c = nexttiled(clients); c = nexttiled(clients);
mw = mfact * ww; 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); resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
if(--n == 0) if(--n == 0)
@ -1425,7 +1413,7 @@ tile(void) {
h = wh; h = wh;
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { 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) resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints); ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
if(h != wh) if(h != wh)