/* static functions */
static void
-resizetitle(Client *c)
-{
- int i;
-
- c->tw = 0;
- for(i = 0; i < ntags; i++)
- if(c->tags[i])
- c->tw += textw(tags[i]);
- c->tw += textw(c->name);
+detachstack(Client *c) {
+ Client **tc;
+ for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ *tc = c->snext;
+}
+
+static void
+grabbuttons(Client *c, Bool focused) {
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+ if(focused) {
+ XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+
+ XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+
+ XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ }
+ else
+ XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+}
+
+static void
+resizetitle(Client *c) {
+ 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->tx, c->ty, c->tw, c->th);
+ if(isvisible(c))
+ XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
else
- XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
-
+ XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
}
static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {
return 0;
}
/* extern functions */
void
-ban(Client *c)
-{
+ban(Client *c) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+ XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
}
void
-focus(Client *c)
-{
- Client *old = sel;
- XEvent ev;
+focus(Client *c) {
+ Client *old;
- sel = c;
- if(old && old != c)
- drawtitle(old);
- drawtitle(c);
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-focusnext(Arg *arg)
-{
- Client *c;
-
- if(!sel)
+ if(!issel)
return;
-
- if(sel->ismax)
- togglemax(NULL);
-
- if(!(c = getnext(sel->next)))
- c = getnext(clients);
- if(c) {
- higher(c);
- focus(c);
- }
-}
-
-void
-focusprev(Arg *arg)
-{
- Client *c;
-
if(!sel)
- return;
-
- if(sel->ismax)
- togglemax(NULL);
-
- if(!(c = getprev(sel->prev))) {
- for(c = clients; c && c->next; c = c->next);
- c = getprev(c);
+ sel = c;
+ else if(sel != c) {
+ if(maximized)
+ togglemax(NULL);
+ old = sel;
+ sel = c;
+ if(old) {
+ grabbuttons(old, False);
+ drawtitle(old);
+ }
}
if(c) {
- higher(c);
- focus(c);
+ detachstack(c);
+ c->snext = stack;
+ stack = c;
+ grabbuttons(c, True);
+ drawtitle(c);
+ XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
Client *
-getclient(Window w)
-{
+getclient(Window w) {
Client *c;
for(c = clients; c; c = c->next)
}
Client *
-getctitle(Window w)
-{
+getctitle(Window w) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->title == w)
+ if(c->twin == w)
return c;
return NULL;
}
void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
int dx = 0, dy = 0;
switch(c->grav) {
}
void
-higher(Client *c)
-{
- XRaiseWindow(dpy, c->win);
- XRaiseWindow(dpy, c->title);
-}
-
-void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {
if(!sel)
return;
if(sel->proto & PROTODELWIN)
}
void
-lower(Client *c)
-{
- XLowerWindow(dpy, c->title);
- XLowerWindow(dpy, c->win);
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
+manage(Window w, XWindowAttributes *wa) {
Client *c;
Window trans;
XSetWindowAttributes twa;
c->th = bh;
c->border = 0;
- setsize(c);
-
+ updatesize(c);
+
+ if(c->x + c->w + 2 > sw)
+ c->x = sw - c->w - 2;
+ if(c->x < 0)
+ c->x = 0;
+ if(c->y + c->h + 2 > sh)
+ c->y = sh - c->h - 2;
if(c->h != sh && c->y < bh)
- c->y = c->ty = bh;
+ c->y = bh;
c->proto = getproto(c->win);
XSelectInput(dpy, c->win,
twa.background_pixmap = ParentRelative;
twa.event_mask = ExposureMask | EnterWindowMask;
- c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+ 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);
- if(clients)
- clients->prev = c;
- c->next = clients;
- clients = c;
-
- XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
-
- settags(c);
+ grabbuttons(c, False);
+ settags(c, getclient(trans));
if(!c->isfloat)
c->isfloat = trans
|| (c->maxw && c->minw &&
c->maxw == c->minw && c->maxh == c->minh);
- settitle(c);
- arrange(NULL);
- /* mapping the window now prevents flicker */
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
- if(c->tags[tsel])
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ c->snext = stack;
+ stack = clients = c;
+
+ updatetitle(c);
+ ban(c);
+ XMapWindow(dpy, c->win);
+ XMapWindow(dpy, c->twin);
+ if(isvisible(c))
focus(c);
+ arrange(NULL);
}
void
-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {
int bottom = c->y + c->h;
int right = c->x + c->w;
- /*XConfigureEvent e;*/
XWindowChanges wc;
if(sizehints) {
if(c->maxh && c->h > c->maxh)
c->h = c->maxh;
}
- if(c->x > right) /* might happen on restart */
- c->x = right - c->w;
- if(c->y > bottom)
- c->y = bottom - c->h;
if(sticky == TopRight || sticky == BotRight)
c->x = right - c->w;
if(sticky == BotLeft || sticky == BotRight)
wc.border_width = 0;
else
wc.border_width = 1;
- XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+ XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
XSync(dpy, False);
}
void
-setsize(Client *c)
-{
+updatesize(Client *c) {
long msize;
XSizeHints size;
}
void
-settitle(Client *c)
-{
+updatetitle(Client *c) {
char **list = NULL;
int n;
XTextProperty name;
}
void
-togglemax(Arg *arg)
-{
+togglemax(Arg *arg) {
int ox, oy, ow, oh;
+ Client *c;
XEvent ev;
if(!sel)
return;
- if((sel->ismax = !sel->ismax)) {
+ if((maximized = !maximized)) {
ox = sel->x;
oy = sel->y;
ow = sel->w;
sel->w = sw - 2;
sel->h = sh - 2 - bh;
- higher(sel);
- resize(sel, False, TopLeft);
+ restack();
+ for(c = getnext(clients); c; c = getnext(c->next))
+ if(c != sel)
+ ban(c);
+ resize(sel, arrange == dofloat, TopLeft);
sel->x = ox;
sel->y = oy;
sel->h = oh;
}
else
- resize(sel, False, TopLeft);
+ arrange(NULL);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
-unmanage(Client *c)
-{
+unmanage(Client *c) {
+ Client *nc;
+
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- XDestroyWindow(dpy, c->title);
-
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- if(c == clients)
- clients = c->next;
+ detach(c);
+ detachstack(c);
if(sel == c) {
- sel = getnext(c->next);
- if(!sel)
- sel = getprev(c->prev);
- if(!sel)
- sel = clients;
+ for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+ focus(nc);
}
+
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ XDestroyWindow(dpy, c->twin);
+
free(c->tags);
free(c);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
arrange(NULL);
- if(sel)
- focus(sel);
-}
-
-void
-zoom(Arg *arg)
-{
- Client *c;
-
- if(!sel)
- return;
-
- if(sel == getnext(clients) && sel->next) {
- if((c = getnext(sel->next)))
- sel = c;
- }
-
- /* pop */
- if(sel->prev)
- sel->prev->next = sel->next;
- if(sel->next)
- sel->next->prev = sel->prev;
- 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