{
int i;
- c->bw = 0;
+ c->tw = 0;
for(i = 0; i < TLast; i++)
if(c->tags[i])
- c->bw += textw(c->tags[i]);
- c->bw += textw(c->name);
- if(c->bw > *c->w)
- c->bw = *c->w + 2;
- c->bx = *c->x + *c->w - c->bw + 2;
- c->by = *c->y;
+ c->tw += textw(c->tags[i]);
+ c->tw += textw(c->name);
+ if(c->tw > c->w)
+ c->tw = c->w + 2;
+ c->tx = c->x + c->w - c->tw + 2;
+ c->ty = c->y;
if(c->tags[tsel])
- XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+ XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
else
- XMoveResizeWindow(dpy, c->title, c->bx + 2 * sw, c->by, c->bw, c->bh);
+ XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
}
void
ban(Client *c)
{
- XMoveWindow(dpy, c->win, *c->x + 2 * sw, *c->y);
- XMoveWindow(dpy, c->title, c->bx + 2 * sw, c->by);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
}
void
if(!sel)
return;
- if(!(c = getnext(sel->next, tsel)))
- c = getnext(clients, tsel);
+ if(sel->ismax)
+ togglemax(NULL);
+
+ if(!(c = getnext(sel->next)))
+ c = getnext(clients);
if(c) {
higher(c);
- c->revert = sel;
focus(c);
}
}
if(!sel)
return;
- if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+ if(sel->ismax)
+ togglemax(NULL);
+
+ if(!(c = getprev(sel->prev))) {
+ for(c = clients; c && c->next; c = c->next);
+ c = getprev(c);
+ }
+ if(c) {
higher(c);
focus(c);
}
getclient(Window w)
{
Client *c;
+
for(c = clients; c; c = c->next)
if(c->win == w)
return c;
getctitle(Window w)
{
Client *c;
+
for(c = clients; c; c = c->next)
if(c->title == w)
return c;
int dx = 0, dy = 0;
switch(c->grav) {
+ default:
+ break;
case StaticGravity:
case NorthWestGravity:
case NorthGravity:
case EastGravity:
case CenterGravity:
case WestGravity:
- dy = -(*c->h / 2) + c->border;
+ dy = -(c->h / 2) + c->border;
break;
case SouthEastGravity:
case SouthGravity:
case SouthWestGravity:
- dy = -(*c->h);
- break;
- default:
+ dy = -(c->h);
break;
}
switch (c->grav) {
+ default:
+ break;
case StaticGravity:
case NorthWestGravity:
case WestGravity:
case NorthGravity:
case CenterGravity:
case SouthGravity:
- dx = -(*c->w / 2) + c->border;
+ dx = -(c->w / 2) + c->border;
break;
case NorthEastGravity:
case EastGravity:
case SouthEastGravity:
- dx = -(*c->w + c->border);
- break;
- default:
+ dx = -(c->w + c->border);
break;
}
dx = -dx;
dy = -dy;
}
- *c->x += dx;
- *c->y += dy;
+ c->x += dx;
+ c->y += dy;
}
void
void
manage(Window w, XWindowAttributes *wa)
{
- int diff;
Client *c;
- XSetWindowAttributes twa;
Window trans;
+ XSetWindowAttributes twa;
c = emallocz(sizeof(Client));
c->win = w;
- c->bx = c->fx = c->tx = wa->x;
- c->by = c->fy = c->ty = wa->y;
- c->bw = c->fw = c->tw = wa->width;
- c->fh = c->th = wa->height;
- c->bh = bh;
+ c->x = c->tx = wa->x;
+ c->y = c->ty = wa->y;
+ c->w = c->tw = wa->width;
+ c->h = wa->height;
+ c->th = bh;
- diff = sw - c->fw;
- c->fx = random() % (diff ? diff : 1);
- diff = sh - c->fh - bh;
- c->fy = random() % (diff ? diff : 1);
-
- if(c->fy < bh)
- c->by = c->fy = c->ty = bh;
+ if(c->y < bh)
+ c->y = c->ty = bh;
c->border = 1;
c->proto = getproto(c->win);
setsize(c);
XSelectInput(dpy, c->win,
- StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+ StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
XGetTransientForHint(dpy, c->win, &trans);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
twa.event_mask = ExposureMask;
- c->title = XCreateWindow(dpy, root, c->bx, c->by, c->bw, c->bh,
+ c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
settags(c);
+ if(clients)
+ clients->prev = c;
c->next = clients;
clients = c;
- XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask,
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
(c->maxw == c->minw) && (c->maxh == c->minh));
- setgeom(c);
settitle(c);
-
arrange(NULL);
/* mapping the window now prevents flicker */
- if(c->tags[tsel]) {
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
+ XMapRaised(dpy, c->win);
+ XMapRaised(dpy, c->title);
+ if(c->tags[tsel])
focus(c);
- }
- else {
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
- }
}
void
-maximize(Arg *arg)
-{
- if(!sel)
- return;
- *sel->x = sx;
- *sel->y = sy + bh;
- *sel->w = sw - 2 * sel->border;
- *sel->h = sh - 2 * sel->border - bh;
- higher(sel);
- resize(sel, False, TopLeft);
-}
-
-void
-pop(Client *c)
-{
- Client **l;
- for(l = &clients; *l && *l != c; l = &(*l)->next);
- *l = c->next;
-
- c->next = clients; /* pop */
- clients = c;
- arrange(NULL);
-}
-
-void
-resize(Client *c, Bool inc, Corner sticky)
+resize(Client *c, Bool sizehints, Corner sticky)
{
+ int bottom = c->y + c->h;
+ int right = c->x + c->w;
XConfigureEvent e;
- int right = *c->x + *c->w;
- int bottom = *c->y + *c->h;
- if(inc) {
+ if(sizehints) {
if(c->incw)
- *c->w -= (*c->w - c->basew) % c->incw;
+ c->w -= (c->w - c->basew) % c->incw;
if(c->inch)
- *c->h -= (*c->h - c->baseh) % 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)
+ 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->x > sw) /* might happen on restart */
- *c->x = sw - *c->w;
- if(*c->y > sh)
- *c->y = sh - *c->h;
- 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->x > sw) /* might happen on restart */
+ c->x = sw - c->w;
+ if(c->y > sh)
+ c->y = sh - c->h;
if(sticky == TopRight || sticky == BotRight)
- *c->x = right - *c->w;
+ c->x = right - c->w;
if(sticky == BotLeft || sticky == BotRight)
- *c->y = bottom - *c->h;
+ c->y = bottom - c->h;
resizetitle(c);
XSetWindowBorderWidth(dpy, c->win, 1);
- XMoveResizeWindow(dpy, c->win, *c->x, *c->y, *c->w, *c->h);
+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
e.type = ConfigureNotify;
e.event = c->win;
e.window = c->win;
- e.x = *c->x;
- e.y = *c->y;
- e.width = *c->w;
- e.height = *c->h;
+ e.x = c->x;
+ e.y = c->y;
+ e.width = c->w;
+ e.height = c->h;
e.border_width = c->border;
e.above = None;
e.override_redirect = False;
}
void
-setgeom(Client *c)
-{
- if((arrange == dotile) && !c->isfloat) {
- c->x = &c->tx;
- c->y = &c->ty;
- c->w = &c->tw;
- c->h = &c->th;
- }
- else {
- c->x = &c->fx;
- c->y = &c->fy;
- c->w = &c->fw;
- c->h = &c->fh;
- }
-}
-
-void
setsize(Client *c)
{
- XSizeHints size;
long msize;
+ XSizeHints size;
+
if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
size.flags = PSize;
c->flags = size.flags;
void
settitle(Client *c)
{
- XTextProperty name;
- int n;
char **list = NULL;
+ int n;
+ XTextProperty name;
name.nitems = 0;
c->name[0] = 0;
}
void
+togglemax(Arg *arg)
+{
+ int ox, oy, ow, oh;
+ XEvent ev;
+
+ if(!sel)
+ return;
+
+ if((sel->ismax = !sel->ismax)) {
+ ox = sel->x;
+ oy = sel->y;
+ ow = sel->w;
+ oh = sel->h;
+ sel->x = sx;
+ sel->y = sy + bh;
+ sel->w = sw - 2 * sel->border;
+ sel->h = sh - 2 * sel->border - bh;
+
+ higher(sel);
+ resize(sel, False, TopLeft);
+
+ sel->x = ox;
+ sel->y = oy;
+ sel->w = ow;
+ sel->h = oh;
+ }
+ else
+ resize(sel, False, TopLeft);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
unmanage(Client *c)
{
Client **l;
XDestroyWindow(dpy, c->title);
for(l = &clients; *l && *l != c; l = &(*l)->next);
+ if(c->prev)
+ c->prev->next = c->next;
+ if(c->next)
+ c->next->prev = c->prev;
*l = c->next;
- for(l = &clients; *l; l = &(*l)->next)
- if((*l)->revert == c)
- (*l)->revert = NULL;
- if(sel == c)
- sel = sel->revert ? sel->revert : clients;
-
+ if(sel == c) {
+ sel = getnext(c->next);
+ if(!sel)
+ sel = getprev(c->prev);
+ if(!sel)
+ sel = clients;
+ }
free(c);
XSync(dpy, False);
void
zoom(Arg *arg)
{
- Client *c;
+ Client *c, **l;
if(!sel)
return;
- if(sel == getnext(clients, tsel) && sel->next) {
- if((c = getnext(sel->next, tsel)))
+ if(sel == getnext(clients) && sel->next) {
+ if((c = getnext(sel->next)))
sel = c;
}
- pop(sel);
+ /* pop */
+ for(l = &clients; *l && *l != sel; l = &(*l)->next);
+ if(sel->prev)
+ sel->prev->next = sel->next;
+ if(sel->next)
+ sel->next->prev = sel->prev;
+ *l = sel->next;
+
+ sel->prev = NULL;
+ if(clients)
+ clients->prev = sel;
+ sel->next = clients;
+ clients = sel;
+ arrange(NULL);
focus(sel);
}
Got questions, comments, patches, etc.? Contact Jason Woofenden