X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=114aeddc6328d0320593ab82dd198ece49f59ab7;hb=77044e876511f51c34bde379d89e2de754707ee6;hp=85b1af82cbf008c66a9d3e7a1a3876a2bc0c8efc;hpb=a54cf2ecef2ca83441dccd454c694b92bca42a16;p=dwm.git diff --git a/client.c b/client.c index 85b1af8..114aedd 100644 --- a/client.c +++ b/client.c @@ -226,24 +226,24 @@ manage(Window w, XWindowAttributes *wa) { c->isfloating = (rettrans == Success) || c->isfixed; attach(c); attachstack(c); + XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */ + setclientstate(c, IconicState); c->isbanned = True; focus(c); - lt->arrange(); + arrange(); } void resize(Client *c, int x, int y, int w, int h, Bool sizehints) { - float dx, dy, max, min, ratio; - XWindowChanges wc; + double dx, dy, max, min, ratio; + XWindowChanges wc; - if(w <= 0 || h <= 0) - return; if(sizehints) { - if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) { - dx = (float)(w - c->basew); - dy = (float)(h - c->baseh); - min = (float)(c->minax) / (float)(c->minay); - max = (float)(c->maxax) / (float)(c->maxay); + if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) { + dx = (double)(w - c->basew); + dy = (double)(h - c->baseh); + min = (double)(c->minax) / (double)(c->minay); + max = (double)(c->maxax) / (double)(c->maxay); ratio = dx / dy; if(max > 0 && min > 0 && ratio > 0) { if(ratio < min) { @@ -272,9 +272,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { w -= (w - c->basew) % c->incw; if(c->inch) h -= (h - c->baseh) % c->inch; + if(w <= 0 || h <= 0) + return; } - if(w <= 0 || h <= 0) - return; /* offscreen appearance fixes */ if(x > sw) x = sw - w - 2 * c->border; @@ -298,12 +298,12 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { void togglefloating(const char *arg) { - if(!sel || lt->arrange == floating) + if(!sel || isfloating()) return; sel->isfloating = !sel->isfloating; if(sel->isfloating) resize(sel, sel->x, sel->y, sel->w, sel->h, True); - lt->arrange(); + arrange(); } void @@ -335,7 +335,7 @@ unmanage(Client *c) { XSync(dpy, False); XSetErrorHandler(xerror); XUngrabServer(dpy); - lt->arrange(); + arrange(); } void