X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=e11abfda43d767aca153b5466e19bf43a61a2565;hb=bced9077f963be2bce4f0c60023c3b48af54b8e9;hp=5309d0eb9b44c3bbc8fa1d221110c4b340cbfa0a;hpb=373b11de11fd5cee875ef521e3ac0527565c4721;p=dwm.git diff --git a/client.c b/client.c index 5309d0e..e11abfd 100644 --- a/client.c +++ b/client.c @@ -79,27 +79,28 @@ configure(Client *c) { void focus(Client *c) { - Client *old = sel; - if(c && !isvisible(c)) return; - - if(old && old != c) { - grabbuttons(old, False); - XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]); + if(sel && sel != c) { + grabbuttons(sel, False); + XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); } if(c) { detachstack(c); c->snext = stack; stack = c; grabbuttons(c, True); + } + sel = c; + drawstatus(); + if(!selscreen) + return; + if(c) { XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); } - else if(issel) + else XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); - sel = c; - drawstatus(); } Client * @@ -141,14 +142,14 @@ manage(Window w, XWindowAttributes *wa) { } else { c->border = BORDERPX; - if(c->x < wax) - c->x = wax; - if(c->y < way) - c->y = way; if(c->x + c->w + 2 * c->border > wax + waw) c->x = wax + waw - c->w - 2 * c->border; if(c->y + c->h + 2 * c->border > way + wah) c->y = way + wah - c->h - 2 * c->border; + if(c->x < wax) + c->x = wax; + if(c->y < way) + c->y = way; } updatesizehints(c); c->proto = getproto(c->win); @@ -156,6 +157,7 @@ manage(Window w, XWindowAttributes *wa) { StructureNotifyMask | PropertyChangeMask | EnterWindowMask); XGetTransientForHint(dpy, c->win, &trans); grabbuttons(c, False); + XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); updatetitle(c); settags(c, getclient(trans)); if(!c->isfloat) @@ -176,6 +178,8 @@ void resize(Client *c, Bool sizehints) { XWindowChanges wc; + if(c->w <= 0 || c->h <= 0) + return; if(sizehints) { if(c->incw) c->w -= (c->w - c->basew) % c->incw; @@ -195,14 +199,14 @@ resize(Client *c, Bool sizehints) { else c->border = BORDERPX; /* offscreen appearance fixes */ - if(c->x + c->w + 2 * c->border < sx) - c->x = sx; - if(c->y + c->h + 2 * c->border < sy) - c->y = sy; if(c->x > sw) c->x = sw - c->w - 2 * c->border; if(c->y > sh) c->y = sh - c->h - 2 * c->border; + if(c->x + c->w + 2 * c->border < sx) + c->x = sx; + if(c->y + c->h + 2 * c->border < sy) + c->y = sy; wc.x = c->x; wc.y = c->y; wc.width = c->w;