staticfanfare
/
dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed order of transient monitor applicaion and rule application

This commit is contained in:
Anselm R Garbe 2009-06-30 19:56:19 +01:00
parent 25947bcfdb
commit 183dc670a3
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dwm.c
View File

@ -1046,28 +1046,38 @@ manage(Window w, XWindowAttributes *wa) {
die("fatal: could not malloc() %u bytes\n", sizeof(Client)); die("fatal: could not malloc() %u bytes\n", sizeof(Client));
*c = cz; *c = cz;
c->win = w; c->win = w;
c->mon = selmon;
if(XGetTransientForHint(dpy, w, &trans))
t = wintoclient(trans);
if(t) {
c->mon = t->mon;
c->tags = t->tags;
}
else {
c->mon = selmon;
applyrules(c);
}
/* geometry */ /* geometry */
c->x = wa->x + selmon->wx; c->x = wa->x + c->mon->wx;
c->y = wa->y + selmon->wy; c->y = wa->y + c->mon->wy;
c->w = wa->width; c->w = wa->width;
c->h = wa->height; c->h = wa->height;
c->oldbw = wa->border_width; c->oldbw = wa->border_width;
if(c->w == selmon->mw && c->h == selmon->mh) { if(c->w == c->mon->mw && c->h == c->mon->mh) {
c->x = selmon->mx; c->x = c->mon->mx;
c->y = selmon->my; c->y = c->mon->my;
c->bw = 0; c->bw = 0;
} }
else { else {
if(c->x + WIDTH(c) > selmon->mx + selmon->mw) if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
c->x = selmon->mx + selmon->mw - WIDTH(c); c->x = c->mon->mx + c->mon->mw - WIDTH(c);
if(c->y + HEIGHT(c) > selmon->my + selmon->mh) if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
c->y = selmon->my + selmon->mh - HEIGHT(c); c->y = c->mon->my + c->mon->mh - HEIGHT(c);
c->x = MAX(c->x, selmon->mx); c->x = MAX(c->x, c->mon->mx);
/* only fix client y-offset, if the client center might cover the bar */ /* only fix client y-offset, if the client center might cover the bar */
c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx) c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
&& (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : selmon->my); && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
c->bw = borderpx; c->bw = borderpx;
} }
@ -1079,12 +1089,6 @@ manage(Window w, XWindowAttributes *wa) {
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, False); grabbuttons(c, False);
updatetitle(c); updatetitle(c);
if(XGetTransientForHint(dpy, w, &trans))
t = wintoclient(trans);
if(t)
c->tags = t->tags;
else
applyrules(c);
if(!c->isfloating) if(!c->isfloating)
c->isfloating = trans != None || c->isfixed; c->isfloating = trans != None || c->isfixed;
if(c->isfloating) if(c->isfloating)