pinosaur
/
dwm.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied Hiltjo's tiny cleanup patch, thanks!
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
4b43a18
..
cbe2752
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-372,10
+372,8
@@
applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
if(c->inch)
*h -= *h % c->inch;
/* restore base dimensions */
if(c->inch)
*h -= *h % c->inch;
/* restore base dimensions */
- *w += c->basew;
- *h += c->baseh;
- *w = MAX(*w, c->minw);
- *h = MAX(*h, c->minh);
+ *w = MAX(*w + c->basew, c->minw);
+ *h = MAX(*h + c->baseh, c->minh);
if(c->maxw)
*w = MIN(*w, c->maxw);
if(c->maxh)
if(c->maxw)
*w = MIN(*w, c->maxw);
if(c->maxh)
@@
-799,7
+797,7
@@
enternotify(XEvent *e) {
unfocus(selmon->sel, True);
selmon = m;
}
unfocus(selmon->sel, True);
selmon = m;
}
- focus(
wintoclient(ev->window
));
+ focus(
(wintoclient(ev->window)
));
}
void
}
void
@@
-845,7
+843,7
@@
focusin(XEvent *e) { /* there are some broken focus acquiring clients */
void
focusmon(const Arg *arg) {
void
focusmon(const Arg *arg) {
- Monitor *m
= NULL
;
+ Monitor *m;
if(!mons->next)
return;
if(!mons->next)
return;
@@
-1100,9
+1098,7
@@
manage(Window w, XWindowAttributes *wa) {
*c = cz;
c->win = w;
updatetitle(c);
*c = cz;
c->win = w;
updatetitle(c);
- if(XGetTransientForHint(dpy, w, &trans))
- t = wintoclient(trans);
- if(t) {
+ if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
c->mon = t->mon;
c->tags = t->tags;
}
c->mon = t->mon;
c->tags = t->tags;
}
@@
-1117,7
+1113,7
@@
manage(Window w, XWindowAttributes *wa) {
c->h = c->oldh = wa->height;
c->oldbw = wa->border_width;
if(c->w == c->mon->mw && c->h == c->mon->mh) {
c->h = c->oldh = wa->height;
c->oldbw = wa->border_width;
if(c->w == c->mon->mw && c->h == c->mon->mh) {
- c->isfloating =
1
;
+ c->isfloating =
True
;
c->x = c->mon->mx;
c->y = c->mon->my;
c->bw = 0;
c->x = c->mon->mx;
c->y = c->mon->my;
c->bw = 0;
@@
-1273,8
+1269,8
@@
propertynotify(XEvent *e) {
switch (ev->atom) {
default: break;
case XA_WM_TRANSIENT_FOR:
switch (ev->atom) {
default: break;
case XA_WM_TRANSIENT_FOR:
- XGetTransientForHint(dpy, c->win, &trans);
-
if(!c->isfloating && (c->isfloating = (wintoclient(trans) != NULL
)))
+ if(!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
+
(c->isfloating = (wintoclient(trans)
)))
arrange(c->mon);
break;
case XA_WM_NORMAL_HINTS:
arrange(c->mon);
break;
case XA_WM_NORMAL_HINTS:
@@
-1307,7
+1303,7
@@
clientmessage(XEvent *e) {
c->oldstate = c->isfloating;
c->oldbw = c->bw;
c->bw = 0;
c->oldstate = c->isfloating;
c->oldbw = c->bw;
c->bw = 0;
- c->isfloating =
1
;
+ c->isfloating =
True
;
resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
XRaiseWindow(dpy, c->win);
}
resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
XRaiseWindow(dpy, c->win);
}