X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=e37b9e6d65b5e7a36ccf58eecdd240df6357a349;hb=28ffff801bb0137ec3fe4093afc4fb29784b17ec;hp=220d2a02de12628b18e1a960f941fb139ffd3161;hpb=91e569ca37ac441930f041057d2934f02bf263a2;p=dwm.git diff --git a/client.c b/client.c index 220d2a0..e37b9e6 100644 --- a/client.c +++ b/client.c @@ -1,4 +1,4 @@ -/* (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -7,7 +7,7 @@ #include #include -/* static functions */ +/* static */ static void detachstack(Client *c) { @@ -53,18 +53,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 */ - -void -ban(Client *c) { - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty); -} +/* extern */ void configure(Client *c) { @@ -85,26 +86,24 @@ 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); - drawtitle(old); - } + 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); - drawtitle(c); + } + sel = c; + drawstatus(); + if(!selscreen) + return; + if(c) { + XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); } else @@ -121,73 +120,26 @@ getclient(Window w) { return NULL; } -Client * -getctitle(Window w) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->twin == w) - return c; - return NULL; -} +Bool +isprotodel(Client *c) { + int i, n; + Atom *protocols; + Bool ret = False; -void -gravitate(Client *c, Bool invert) { - int dx = 0, dy = 0; - - switch(c->grav) { - default: - break; - case StaticGravity: - case NorthWestGravity: - case NorthGravity: - case NorthEastGravity: - dy = c->border; - break; - case EastGravity: - case CenterGravity: - case WestGravity: - dy = -(c->h / 2) + c->border; - break; - case SouthEastGravity: - case SouthGravity: - case SouthWestGravity: - dy = -(c->h); - break; - } - switch (c->grav) { - default: - break; - case StaticGravity: - case NorthWestGravity: - case WestGravity: - case SouthWestGravity: - dx = c->border; - break; - case NorthGravity: - case CenterGravity: - case SouthGravity: - dx = -(c->w / 2) + c->border; - break; - case NorthEastGravity: - case EastGravity: - case SouthEastGravity: - dx = -(c->w + c->border); - break; + if(XGetWMProtocols(dpy, c->win, &protocols, &n)) { + for(i = 0; !ret && i < n; i++) + if(protocols[i] == wmatom[WMDelete]) + ret = True; + XFree(protocols); } - if(invert) { - dx = -dx; - dy = -dy; - } - c->x += dx; - c->y += dy; + return ret; } void killclient(Arg *arg) { if(!sel) return; - if(sel->proto & PROTODELWIN) + if(isprotodel(sel)) sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]); else XKillClient(dpy, sel->win); @@ -197,67 +149,61 @@ void manage(Window w, XWindowAttributes *wa) { Client *c; Window trans; - XSetWindowAttributes twa; c = emallocz(sizeof(Client)); c->tags = emallocz(ntags * sizeof(Bool)); c->win = w; - c->border = 0; - c->x = c->tx = wa->x; - c->y = c->ty = wa->y; - c->w = c->tw = wa->width; + c->x = wa->x; + c->y = wa->y; + c->w = wa->width; c->h = wa->height; - c->th = bh; - updatesize(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->proto = getproto(c->win); + 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); XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | EnterWindowMask); XGetTransientForHint(dpy, c->win, &trans); - twa.override_redirect = 1; - twa.background_pixmap = ParentRelative; - twa.event_mask = ExposureMask | EnterWindowMask; - c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th, - 0, DefaultDepth(dpy, screen), CopyFromParent, - DefaultVisual(dpy, screen), - CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); grabbuttons(c, False); + XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); updatetitle(c); settags(c, getclient(trans)); if(!c->isfloat) c->isfloat = trans || c->isfixed; - resizetitle(c); if(clients) clients->prev = c; c->next = clients; c->snext = stack; stack = clients = c; - ban(c); + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); XMapWindow(dpy, c->win); - XMapWindow(dpy, c->twin); + 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 actual, dx, dy, max, min; 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) @@ -266,49 +212,58 @@ 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) { + dy = (dx * min + dy) / (min * min + 1); + dx = dy * min; + c->w = (int)dx + c->basew; + c->h = (int)dy + c->baseh; + } + else if(actual > max) { + dy = (dx * min + dy) / (max * max + 1); + dx = dy * min; + 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; - resizetitle(c); + 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); } void -resizetitle(Client *c) { - c->tw = textw(c->name); - if(c->tw > c->w) - c->tw = c->w + 2 * BORDERPX; - c->tx = c->x + c->w - c->tw + 2 * BORDERPX; - c->ty = c->y; - if(isvisible(c)) - XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th); - else - XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th); -} - -void -updatesize(Client *c) { +updatesizehints(Client *c) { long msize; XSizeHints size; @@ -339,12 +294,16 @@ updatesize(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); - if(c->flags & PWinGravity) - c->grav = size.win_gravity; - else - c->grav = NorthWestGravity; } void @@ -361,12 +320,12 @@ updatetitle(Client *c) { if(!name.nitems) return; if(name.encoding == XA_STRING) - strncpy(c->name, (char *)name.value, sizeof(c->name)); + strncpy(c->name, (char *)name.value, sizeof c->name); else { if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) { - strncpy(c->name, *list, sizeof(c->name)); + strncpy(c->name, *list, sizeof c->name); XFreeStringList(list); } } @@ -387,7 +346,7 @@ unmanage(Client *c) { focus(nc); } XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - XDestroyWindow(dpy, c->twin); + setclientstate(c, WithdrawnState); free(c->tags); free(c); XSync(dpy, False);