fixed order

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 6777473..fdb973c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,161 +1,350 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
  * See LICENSE file for license details.
  */

-
-#include <math.h>
+#include "dwm.h"

 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 

-#include "wm.h"
+/* static */
+
+static void
+attachstack(Client *c) {
+       c->snext = stack;
+       stack = c;
+}
+
+static void
+detachstack(Client *c) {
+       Client **tc;

 
 

-void (*arrange)(void *aux);
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}

 
 

-void
-max(void *aux)
-{
-       if(!stack)
+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 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);
+}
+
+static void
+togglemax(Client *c) {
+       XEvent ev;
+
+       if(c->isfixed)

                return;
                return;

-       stack->x = sx;
-       stack->y = sy;
-       stack->w = sw - 2 * stack->border;
-       stack->h = sh - 2 * stack->border;
-       resize(stack);
-       discard_events(EnterWindowMask);
+       if((c->ismax = !c->ismax)) {
+               c->rx = c->x;
+               c->ry = c->y;
+               c->rw = c->w;
+               c->rh = c->h;
+               resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
+       }
+       else
+               resize(c, c->rx, c->ry, c->rw, c->rh, True);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 }
 

+static int
+xerrordummy(Display *dsply, XErrorEvent *ee) {
+       return 0;
+}
+
+/* extern */
+

 void
 void

-floating(void *aux)
-{
-       Client *c;
+attach(Client *c) {
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+}

 
 

-       arrange = floating;
-       for(c = stack; c; c = c->snext)
-               resize(c);
-       discard_events(EnterWindowMask);
+void
+configure(Client *c) {
+       XConfigureEvent ce;
+
+       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
 }
 
 void

-grid(void *aux)
-{
-       Client *c;
-       int n, cols, rows, gw, gh, i, j;
-    float rt, fd;
+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;
+}

 
 

-       arrange = grid;
-       if(!clients)
+void
+focus(Client *c) {
+       if(c && !isvisible(c))

                return;
                return;

-       for(n = 0, c = clients; c; c = c->next, n++);
-       rt = sqrt(n);
-       if(modff(rt, &fd) < 0.5)
-               rows = floor(rt);
-       else
-               rows = ceil(rt);
-       if(rows * rows < n)
-               cols = rows + 1;
-       else
-               cols = rows;
-
-       gw = (sw - 2)  / cols;
-       gh = (sh - 2) / rows;
-
-       for(i = j = 0, c = clients; c; c = c->next) {
-               c->x = i * gw;
-               c->y = j * gh;
-               c->w = gw;
-               c->h = gh;
-               resize(c);
-               if(++i == cols) {
-                       j++;
-                       i = 0;
-               }
+       if(sel && sel != c) {
+               grabbuttons(sel, False);
+               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+       }
+       if(c) {
+               detachstack(c);
+               attachstack(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);

        }
        }

-       discard_events(EnterWindowMask);
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

 }
 
 void
 }
 
 void

-sel(void *aux)
-{
-       const char *arg = aux;
-       Client *c = NULL;
-
-       if(!arg || !stack)
+focusnext(Arg *arg) {
+       Client *c;
+   
+       if(!sel)

                return;
                return;

-       if(!strncmp(arg, "next", 5))
-               c = stack->snext ? stack->snext : stack;
-       else if(!strncmp(arg, "prev", 5))
-               for(c = stack; c && c->snext; c = c->snext);
+       for(c = sel->next; c && !isvisible(c); c = c->next);

        if(!c)
        if(!c)

-               c = stack;
-       craise(c);
-       focus(c);
+               for(c = clients; c && !isvisible(c); c = c->next);
+       if(c) {
+               focus(c);
+               restack();
+       }

 }
 
 void
 }
 
 void

-ckill(void *aux)
-{
-       Client *c = stack;
+focusprev(Arg *arg) {
+       Client *c;

 
 

-       if(!c)
+       if(!sel)
+               return;
+       for(c = sel->prev; c && !isvisible(c); c = c->prev);
+       if(!c) {
+               for(c = clients; c && c->next; c = c->next);
+               for(; c && !isvisible(c); c = c->prev);
+       }
+       if(c) {
+               focus(c);
+               restack();
+       }
+}
+
+void
+killclient(Arg *arg) {
+       if(!sel)

                return;
                return;

-       if(c->proto & WM_PROTOCOL_DELWIN)
-               send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+       if(isprotodel(sel))
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);

        else
        else

-               XKillClient(dpy, c->win);
+               XKillClient(dpy, sel->win);

 }
 
 }
 

-static void
-resize_title(Client *c)
-{
-       int i;
-
-       c->tw = 0;
-       for(i = 0; i < TLast; i++)
-               if(c->tags[i])
-                       c->tw += textw(&brush.font, c->tags[i]) + brush.font.height;
-       c->tw += textw(&brush.font, c->name) + brush.font.height;
-       if(c->tw > c->w)
-               c->tw = c->w + 2;
-       c->tx = c->x + c->w - c->tw + 2;
-       c->ty = c->y;
-       XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+void
+manage(Window w, XWindowAttributes *wa) {
+       Client *c, *t;
+       Window trans;
+       XWindowChanges wc;
+
+       c = emallocz(sizeof(Client));
+       c->tags = emallocz(ntags * sizeof(Bool));
+       c->win = w;
+       c->x = wa->x;
+       c->y = wa->y;
+       c->w = wa->width;
+       c->h = wa->height;
+       if(c->w == sw && c->h == sh) {
+               c->border = 0;
+               c->x = sx;
+               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, w,
+               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       XGetTransientForHint(dpy, w, &trans);
+       grabbuttons(c, False);
+       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);
+       for(t = clients; t && t->win != trans; t = t->next);
+       settags(c, t);
+       if(!c->isversatile)
+               c->isversatile = (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);
+       lt->arrange();
+}
+
+Client *
+nexttiled(Client *c) {
+       for(; c && (c->isversatile || !isvisible(c)); c = c->next);
+       return c;

 }
 
 void
 }
 
 void

-update_name(Client *c)
-{
-       XTextProperty name;
-       int n;
-       char **list = NULL;
+resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+       float actual, dx, dy, max, min;
+       XWindowChanges wc;

 
 

-       name.nitems = 0;
-       c->name[0] = 0;
-       XGetTextProperty(dpy, c->win, &name, net_atom[NetWMName]);
-       if(!name.nitems)
-               XGetWMName(dpy, c->win, &name);
-       if(!name.nitems)
+       if(w <= 0 || h <= 0)

                return;
                return;

-       if(name.encoding == XA_STRING)
-               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));
-                       XFreeStringList(list);
+       if(sizehints) {
+               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 && (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) {
+                                       dy = (dx * min + dy) / (min * min + 1);
+                                       dx = dy * min;
+                                       w = (int)dx + c->basew;
+                                       h = (int)dy + c->baseh;
+                               }
+                               else if(actual > max) {
+                                       dy = (dx * min + dy) / (max * max + 1);
+                                       dx = dy * min;
+                                       w = (int)dx + c->basew;
+                                       h = (int)dy + c->baseh;
+                               }
+                       }

                }
                }

+               if(c->incw)
+                       w -= (w - c->basew) % c->incw;
+               if(c->inch)
+                       h -= (h - c->baseh) % c->inch;
+       }
+       if(w == sw && h == sh)
+               c->border = 0;
+       else
+               c->border = BORDERPX;
+       /* offscreen appearance fixes */
+       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);

        }
        }

-       XFree(name.value);
-       resize_title(c);

 }
 
 void
 }
 
 void

-update_size(Client *c)
-{
-       XSizeHints size;
+updatesizehints(Client *c) {

        long msize;
        long msize;

+       XSizeHints size;
+

        if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
                size.flags = PSize;
        c->flags = size.flags;
        if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
                size.flags = PSize;
        c->flags = size.flags;


@@ -183,255 +372,85 @@ update_size(Client *c)
        }
        else
                c->minw = c->minh = 0;
        }
        else
                c->minw = c->minh = 0;

-       if(c->flags & PWinGravity)
-               c->grav = size.win_gravity;
-       else
-               c->grav = NorthWestGravity;
-}
-
-void
-craise(Client *c)
-{
-       XRaiseWindow(dpy, c->win);
-       XRaiseWindow(dpy, c->title);
-}
-
-void
-lower(Client *c)
-{
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
-}
-
-void
-focus(Client *c)
-{
-       Client **l, *old;
-
-       old = stack;
-       for(l = &stack; *l && *l != c; l = &(*l)->snext);
-       if(*l)
-               *l = c->snext;
-       c->snext = stack;
-       stack = c;
-       if(old && old != c) {
-               XMapWindow(dpy, old->title);
-               draw_client(old);
+       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;

        }
        }

-       XUnmapWindow(dpy, c->title);
-       draw_client(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       XFlush(dpy);
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
-       Client *c, **l;
-       XSetWindowAttributes twa;
-
-       c = emallocz(sizeof(Client));
-       c->win = w;
-       c->tx = c->x = wa->x;
-       c->ty = c->y = wa->y;
-       c->tw = c->w = wa->width;
-       c->h = wa->height;
-       c->th = th;
-       c->border = 1;
-       update_size(c);
-       XSetWindowBorderWidth(dpy, c->win, 1);
-       XSetWindowBorder(dpy, c->win, brush.border);
-       XSelectInput(dpy, c->win,
-                       StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       XGetTransientForHint(dpy, c->win, &c->trans);
-       twa.override_redirect = 1;
-       twa.background_pixmap = ParentRelative;
-       twa.event_mask = ExposureMask;
-
-       c->tags[tsel] = tags[tsel];
-       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);
-
-       update_name(c);
-       for(l=&clients; *l; l=&(*l)->next);
-       c->next = *l; /* *l == nil */
-       *l = c;
-       XMapRaised(dpy, c->win);
-       XMapRaised(dpy, c->title);
-       XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       arrange(NULL);
-       focus(c);
+       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);

 }
 
 void
 }
 
 void

-gravitate(Client *c, Bool invert)
-{
-       int dx = 0, dy = 0;
-
-       switch(c->grav) {
-       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;
-       default:
-               break;
-       }
-
-       switch (c->grav) {
-       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;
-       default:
-               break;
-       }
+updatetitle(Client *c) {
+       char **list = NULL;
+       int n;
+       XTextProperty name;

 
 

-       if(invert) {
-               dx = -dx;
-               dy = -dy;
+       name.nitems = 0;
+       c->name[0] = 0;
+       XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);
+       if(!name.nitems)
+               XGetWMName(dpy, c->win, &name);
+       if(!name.nitems)
+               return;
+       if(name.encoding == XA_STRING)
+               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);
+                       XFreeStringList(list);
+               }

        }
        }

-       c->x += dx;
-       c->y += dy;
-}
-
-
-void
-resize(Client *c)
-{
-       XConfigureEvent e;
-
-       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)
-               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;
-       resize_title(c);
-       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.border_width = c->border;
-       e.above = None;
-       e.override_redirect = False;
-       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
-       XFlush(dpy);
-}
-
-static int
-dummy_error_handler(Display *dsply, XErrorEvent *err)
-{
-       return 0;
+       XFree(name.value);

 }
 
 void
 }
 
 void

-unmanage(Client *c)
-{
-       Client **l;
+unmanage(Client *c) {
+       Client *nc;

 
 

+       /* The server grab construct avoids race conditions. */

        XGrabServer(dpy);
        XGrabServer(dpy);

-       XSetErrorHandler(dummy_error_handler);
-
+       XSetErrorHandler(xerrordummy);
+       detach(c);
+       detachstack(c);
+       if(sel == c) {
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);
+       }

        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

-       XDestroyWindow(dpy, c->title);
-
-       for(l=&clients; *l && *l != c; l=&(*l)->next);
-       *l = c->next;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       *l = c->snext;
+       setclientstate(c, WithdrawnState);
+       free(c->tags);

        free(c);
        free(c);

-
-       XFlush(dpy);
-       XSetErrorHandler(error_handler);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);

        XUngrabServer(dpy);
        XUngrabServer(dpy);

-       arrange(NULL);
-       if(stack)
-               focus(stack);
-}
-
-Client *
-gettitle(Window w)
-{
-       Client *c;
-       for(c = clients; c; c = c->next)
-               if(c->title == w)
-                       return c;
-       return NULL;
+       lt->arrange();

 }
 
 }
 

-Client *
-getclient(Window w)
-{
+void
+zoom(Arg *arg) {
+       unsigned int n;

        Client *c;
        Client *c;

-       for(c = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
-}

 
 

-void
-draw_client(Client *c)
-{
-       int i;
-       if(c == stack)
+       if(!sel)
+               return;
+       if(sel->isversatile || (lt->arrange == versatile)) {
+               togglemax(sel);

                return;
                return;

-
-       brush.x = brush.y = 0;
-       brush.h = c->th;
-
-       brush.w = 0;
-       for(i = 0; i < TLast; i++) {
-               if(c->tags[i]) {
-                       brush.x += brush.w;
-                       brush.w = textw(&brush.font, c->tags[i]) + brush.font.height;
-                       draw(&brush, True, c->tags[i]);
-               }

        }
        }

-       brush.x += brush.w;
-       brush.w = textw(&brush.font, c->name) + brush.font.height;
-       draw(&brush, True, c->name);
-       XCopyArea(dpy, brush.drawable, c->title, brush.gc,
-                       0, 0, c->tw, c->th, 0, 0);
-       XFlush(dpy);
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
+                       return;
+       detach(c);
+       attach(c);
+       focus(c);
+       lt->arrange();

 }
 }