/* 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;
+attachstack(Client *c) {
+ c->snext = stack;
+ stack = c;
}
static void
detachstack(Client *c) {
Client **tc;
+
for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
*tc = c->snext;
}
GrabModeAsync, GrabModeSync, None, None);
}
+static Bool
+isprotodel(Client *c) {
+ int i, n;
+ Atom *protocols;
+ Bool ret = False;
+
+ if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+ for(i = 0; !ret && i < n; i++)
+ if(protocols[i] == wmatom[WMDelete])
+ ret = True;
+ XFree(protocols);
+ }
+ return ret;
+}
+
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);
}
/* extern */
void
+attach(Client *c) {
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ clients = c;
+}
+
+void
configure(Client *c) {
- XEvent synev;
+ XConfigureEvent ce;
- synev.type = ConfigureNotify;
- synev.xconfigure.display = dpy;
- synev.xconfigure.event = c->win;
- synev.xconfigure.window = c->win;
- synev.xconfigure.x = c->x;
- synev.xconfigure.y = c->y;
- synev.xconfigure.width = c->w;
- synev.xconfigure.height = c->h;
- synev.xconfigure.border_width = c->border;
- synev.xconfigure.above = None;
- XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+ ce.type = ConfigureNotify;
+ ce.display = dpy;
+ ce.event = c->win;
+ ce.window = c->win;
+ ce.x = c->x;
+ ce.y = c->y;
+ ce.width = c->w;
+ ce.height = c->h;
+ ce.border_width = c->border;
+ ce.above = None;
+ ce.override_redirect = False;
+ XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
+}
+
+void
+detach(Client *c) {
+ if(c->prev)
+ c->prev->next = c->next;
+ if(c->next)
+ c->next->prev = c->prev;
+ if(c == clients)
+ clients = c->next;
+ c->next = c->prev = NULL;
}
void
}
if(c) {
detachstack(c);
- c->snext = stack;
- stack = c;
+ attachstack(c);
grabbuttons(c, True);
}
sel = c;
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
-Client *
-getclient(Window w) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(c->win == w)
- return c;
- return NULL;
-}
-
void
-killclient(Arg *arg) {
+killclient(const char *arg) {
if(!sel)
return;
- if(sel->proto & PROTODELWIN)
+ if(isprotodel(sel))
sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
else
XKillClient(dpy, sel->win);
void
manage(Window w, XWindowAttributes *wa) {
- Client *c;
+ Client *c, *t;
Window trans;
+ XWindowChanges wc;
c = emallocz(sizeof(Client));
c->tags = emallocz(ntags * sizeof(Bool));
c->y = way;
}
updatesizehints(c);
- c->proto = getproto(c->win);
- XSelectInput(dpy, c->win,
+ XSelectInput(dpy, w,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
- XGetTransientForHint(dpy, c->win, &trans);
+ XGetTransientForHint(dpy, w, &trans);
grabbuttons(c, False);
- XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+ wc.border_width = c->border;
+ XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+ XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+ configure(c); /* propagates border_width, if size doesn't change */
updatetitle(c);
- settags(c, getclient(trans));
- if(!c->isfloat)
- c->isfloat = trans || c->isfixed;
- if(clients)
- clients->prev = c;
- c->next = clients;
- c->snext = stack;
- stack = clients = c;
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- XMapWindow(dpy, c->win);
+ for(t = clients; t && t->win != trans; t = t->next);
+ settags(c, t);
+ if(!c->isuntiled)
+ c->isuntiled = (t != NULL) || c->isfixed;
+ attach(c);
+ attachstack(c);
+ c->isbanned = True;
+ XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+ XMapWindow(dpy, w);
setclientstate(c, NormalState);
if(isvisible(c))
focus(c);
- arrange();
+ lt->arrange();
}
void
-resize(Client *c, Bool sizehints) {
- float dx, dy, min, max, actual;
+resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+ float actual, dx, dy, max, min;
XWindowChanges wc;
- if(c->w <= 0 || c->h <= 0)
+ if(w <= 0 || h <= 0)
return;
if(sizehints) {
- if(c->minw && c->w < c->minw)
- c->w = c->minw;
- if(c->minh && c->h < c->minh)
- c->h = c->minh;
- if(c->maxw && c->w > c->maxw)
- c->w = c->maxw;
- if(c->maxh && c->h > c->maxh)
- c->h = c->maxh;
+ if(c->minw && w < c->minw)
+ w = c->minw;
+ if(c->minh && h < c->minh)
+ h = c->minh;
+ if(c->maxw && w > c->maxw)
+ w = c->maxw;
+ if(c->maxh && h > c->maxh)
+ 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);
+ if(c->minay > 0 && c->maxay && (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);
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;
+ dy = (dx * min + dy) / (min * min + 1);
+ dx = dy * min;
+ w = (int)dx + c->basew;
+ 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;
+ dy = (dx * min + dy) / (max * max + 1);
+ dx = dy * min;
+ w = (int)dx + c->basew;
+ h = (int)dy + c->baseh;
}
}
}
if(c->incw)
- c->w -= (c->w - c->basew) % c->incw;
+ w -= (w - c->basew) % c->incw;
if(c->inch)
- c->h -= (c->h - c->baseh) % c->inch;
+ h -= (h - c->baseh) % c->inch;
}
- if(c->w == sw && c->h == sh)
+ if(w == sw && h == sh)
c->border = 0;
else
c->border = BORDERPX;
/* offscreen appearance fixes */
- 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;
- wc.height = c->h;
- wc.border_width = c->border;
- XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
- configure(c);
- XSync(dpy, False);
+ if(x > sw)
+ x = sw - w - 2 * c->border;
+ if(y > sh)
+ y = sh - h - 2 * c->border;
+ if(x + w + 2 * c->border < sx)
+ x = sx;
+ if(y + h + 2 * c->border < sy)
+ y = sy;
+ if(c->x != x || c->y != y || c->w != w || c->h != h) {
+ c->x = wc.x = x;
+ c->y = wc.y = y;
+ c->w = wc.width = w;
+ c->h = wc.height = h;
+ wc.border_width = c->border;
+ XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+ configure(c);
+ XSync(dpy, False);
+ }
+}
+
+void
+toggletiled(const char *arg) {
+ if(!sel || lt->arrange == untile)
+ return;
+ sel->isuntiled = !sel->isuntiled;
+ lt->arrange();
}
void
}
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);
+ c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
+ && c->maxw == c->minw && c->maxh == c->minh);
}
void
strncpy(c->name, (char *)name.value, sizeof c->name);
else {
if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
- && n > 0 && *list)
+ && n > 0 && *list)
{
strncpy(c->name, *list, sizeof c->name);
XFreeStringList(list);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange();
+ lt->arrange();
}
Got questions, comments, patches, etc.? Contact Jason Woofenden