X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=2b194d7f39b5a836e8b4af849842ed6eaf8b6d39;hb=2ddc78720aceda76e22fd3584740fc86a2e7c677;hp=b122427cace994f9768fa3ea76d544bea44470af;hpb=f8181f64e2ba4fca4e85036c48cf90a2151794fc;p=dwm.git diff --git a/client.c b/client.c index b122427..2b194d7 100644 --- a/client.c +++ b/client.c @@ -7,7 +7,14 @@ #include #include -/* static functions */ +/* static */ + +static void +closestpt(float *rx, float *ry, float x, float y, float grad) { + float u = (x * grad + y) / (grad * grad + 1); + *rx = u * grad; + *ry = u; +} static void detachstack(Client *c) { @@ -53,12 +60,19 @@ grabbuttons(Client *c, Bool focused) { GrabModeAsync, GrabModeSync, None, None); } +static void +setclientstate(Client *c, long state) { + long data[] = {state, None}; + XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, + PropModeReplace, (unsigned char *)data, 2); +} + static int xerrordummy(Display *dsply, XErrorEvent *ee) { return 0; } -/* extern functions */ +/* extern */ void configure(Client *c) { @@ -79,31 +93,28 @@ configure(Client *c) { void focus(Client *c) { - Client *old; - - if(!issel || (c && !isvisible(c))) + if(c && !isvisible(c)) return; - if(!sel) - sel = c; - else if(sel != c) { - old = sel; - sel = c; - if(old) { - 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 XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); - drawstatus(); } Client * @@ -134,25 +145,33 @@ manage(Window w, XWindowAttributes *wa) { c = emallocz(sizeof(Client)); c->tags = emallocz(ntags * sizeof(Bool)); c->win = w; - c->border = 0; c->x = wa->x; c->y = wa->y; c->w = wa->width; c->h = wa->height; - updatesizehints(c); - if(c->x + c->w + 2 * BORDERPX > sw) - c->x = sw - c->w - 2 * BORDERPX; - if(c->x < sx) + if(c->w == sw && c->h == sh) { + c->border = 0; c->x = sx; - if(c->y + c->h + 2 * BORDERPX > sh) - c->y = sh - c->h - 2 * BORDERPX; - if(c->h != sh && c->y < bh) - c->y = bh; + c->y = sy; + } + else { + c->border = BORDERPX; + 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); XSelectInput(dpy, c->win, 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) @@ -164,22 +183,20 @@ manage(Window w, XWindowAttributes *wa) { stack = clients = c; XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); XMapWindow(dpy, c->win); + setclientstate(c, NormalState); if(isvisible(c)) focus(c); arrange(); } void -resize(Client *c, Bool sizehints, Corner sticky) { - int bottom = c->y + c->h; - int right = c->x + c->w; +resize(Client *c, Bool sizehints) { + float dx, dy, min, max, actual; XWindowChanges wc; + if(c->w <= 0 || c->h <= 0) + return; if(sizehints) { - if(c->incw) - c->w -= (c->w - c->basew) % c->incw; - if(c->inch) - c->h -= (c->h - c->baseh) % c->inch; if(c->minw && c->w < c->minw) c->w = c->minw; if(c->minh && c->h < c->minh) @@ -188,28 +205,49 @@ resize(Client *c, Bool sizehints, Corner sticky) { c->w = c->maxw; if(c->maxh && c->h > c->maxh) c->h = c->maxh; + /* inspired by algorithm from fluxbox */ + if(c->minay > 0 && c->maxay && (c->h - c->baseh) > 0) { + dx = (float)(c->w - c->basew); + dy = (float)(c->h - c->baseh); + min = (float)(c->minax) / (float)(c->minay); + max = (float)(c->maxax) / (float)(c->maxay); + actual = dx / dy; + if(max > 0 && min > 0 && actual > 0) { + if(actual < min) { + closestpt(&dx, &dy, dx, dy, min); + c->w = (int)dx + c->basew; + c->h = (int)dy + c->baseh; + } + else if(actual > max) { + closestpt(&dx, &dy, dx, dy, max); + c->w = (int)dx + c->basew; + c->h = (int)dy + c->baseh; + } + } + } + if(c->incw) + c->w -= (c->w - c->basew) % c->incw; + if(c->inch) + c->h -= (c->h - c->baseh) % c->inch; } - if(sticky == TopRight || sticky == BotRight) - c->x = right - c->w; - if(sticky == BotLeft || sticky == BotRight) - c->y = bottom - c->h; + if(c->w == sw && c->h == sh) + c->border = 0; + else + c->border = BORDERPX; /* offscreen appearance fixes */ - if(c->x + c->w < sx) - c->x = sx; - if(c->y + c->h < bh) - c->y = bh; if(c->x > sw) - c->x = sw - c->w; + c->x = sw - c->w - 2 * c->border; if(c->y > sh) - c->y = sh - c->h; + 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; wc.height = c->h; - if(c->w == sw && c->h == sh) - wc.border_width = 0; - else - wc.border_width = BORDERPX; + wc.border_width = c->border; XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); configure(c); XSync(dpy, False); @@ -247,6 +285,14 @@ updatesizehints(Client *c) { } else c->minw = c->minh = 0; + if(c->flags & PAspect) { + c->minax = size.min_aspect.x; + c->minay = size.min_aspect.y; + c->maxax = size.max_aspect.x; + c->maxay = size.max_aspect.y; + } + else + c->minax = c->minay = c->maxax = c->maxay = 0; c->isfixed = (c->maxw && c->minw && c->maxh && c->minh && c->maxw == c->minw && c->maxh == c->minh); } @@ -291,6 +337,7 @@ unmanage(Client *c) { focus(nc); } XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + setclientstate(c, WithdrawnState); free(c->tags); free(c); XSync(dpy, False);