Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
fix of typo, thx to Enno Gottox Boland
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
489ba80
..
cfe1e7b
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-128,7
+128,7
@@
typedef struct {
} Rule;
/* function declarations */
} Rule;
/* function declarations */
-static void adjustborder(Client *c,
Bool issingle
);
+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);
@@
-246,12
+246,11
@@
struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1
/* function implementations */
void
/* function implementations */
void
-adjustborder(Client *c,
Bool issingle
) {
+adjustborder(Client *c,
unsigned int bw
) {
XWindowChanges wc;
XWindowChanges wc;
- wc.border_width = issingle ? 0 : borderpx;
- if(c->bw != wc.border_width) {
- c->bw = wc.border_width;
+ if(c->bw != bw) {
+ c->bw = wc.border_width = bw;
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
}
}
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
}
}
@@
-270,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;
&& (!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)
}
}
if(ch.res_class)
@@
-284,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();
@@
-941,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);
+ 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);
}
}
@@
-1012,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 */
@@
-1148,8
+1151,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(snap && nw >= wx && nw <= wx + ww
&& nh >= wy && nh <= wy + wh) {
@@
-1342,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, False);
+ 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);
}
}
@@
-1410,7
+1414,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
+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,
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)
@@
-1704,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-200
8
dwm engineers, see LICENSE for details\n");
+ die("dwm-"VERSION", © 2006-200
9
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");