Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
changed font size, I'm not blind...
[dwm.git] / client.c
diff --git a/client.c b/client.c
index 2403d74..f92df83 100644 (file)
--- a/client.c
+++ b/client.c
@@ -2,497 +2,490 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * 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 "dwm.h"
-
-static void (*arrange)(Arg *) = floating;
+/* static functions */
 
 
-static Client *
-next(Client *c)
+static void
+resizetitle(Client *c)
 {
 {
-       for(c = c->next; c && !c->tags[tsel]; c = c->next);
-       return c;
-}
+       int i;
 
 
-static Client *
-prev(Client *c)
-{
-       for(c = c->prev; c && !c->tags[tsel]; c = c->prev);
-       return c;
-}
+       c->tw = 0;
+       for(i = 0; i < ntags; i++)
+               if(c->tags[i])
+                       c->tw += textw(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->tx, c->ty, c->tw, c->th);
+       else
+               XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
 
 
-void
-max(Arg *arg)
-{
-       if(!csel)
-               return;
-       csel->x = sx;
-       csel->y = sy;
-       csel->w = sw - 2 * csel->border;
-       csel->h = sh - 2 * csel->border;
-       craise(csel);
-       resize(csel);
-       discard_events(EnterWindowMask);
 }
 
 }
 
-void
-tag(Arg *arg)
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee)
 {
 {
-       if(!csel)
-               return;
-
-       if(arg->i == tsel)
-               return;
-
-       if(csel->tags[arg->i])
-               csel->tags[arg->i] = NULL; /* toggle tag */
-       else
-               csel->tags[arg->i] = tags[arg->i];
-       arrange(NULL);
+       return 0;
 }
 
 }
 
+/* extern functions */
+
 void
 void
-floating(Arg *arg)
+ban(Client *c)
 {
 {
-       Client *c;
-
-       arrange = floating;
-       if(!csel)
-               return;
-       for(c = csel; c; c = next(c))
-               resize(c);
-       discard_events(EnterWindowMask);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 
 void
 }
 
 void
-tiling(Arg *arg)
+focus(Client *c)
 {
 {
-       Client *c;
-       int n, cols, rows, gw, gh, i, j;
-    float rt, fd;
+       Client *old = sel;
+       XEvent ev;
 
 
-       arrange = tiling;
-       if(!csel)
-               return;
-       for(n = 0, c = csel; c; c = next(c), 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 = csel; c; c = next(c)) {
-               c->x = i * gw;
-               c->y = j * gh;
-               c->w = gw;
-               c->h = gh;
-               resize(c);
-               if(++i == cols) {
-                       j++;
-                       i = 0;
-               }
-       }
-       discard_events(EnterWindowMask);
+       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
 }
 
 void
-prevc(Arg *arg)
+focusnext(Arg *arg)
 {
        Client *c;
 {
        Client *c;
-
-       if(!csel)
+   
+       if(!sel)
                return;
 
                return;
 
-       if(!(c = prev(csel)))
-               c = prev(cend);
+       if(sel->ismax)
+               togglemax(NULL);
+
+       if(!(c = getnext(sel->next)))
+               c = getnext(clients);
        if(c) {
        if(c) {
-               craise(c);
-               XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
+               higher(c);
                focus(c);
        }
 }
 
 void
                focus(c);
        }
 }
 
 void
-nextc(Arg *arg)
+focusprev(Arg *arg)
 {
        Client *c;
 {
        Client *c;
-   
-       if(!csel)
+
+       if(!sel)
                return;
 
                return;
 
-       if(!(c = next(csel)))
-               c = next(cstart);
+       if(sel->ismax)
+               togglemax(NULL);
 
 
+       if(!(c = getprev(sel->prev))) {
+               for(c = clients; c && c->next; c = c->next);
+               c = getprev(c);
+       }
        if(c) {
        if(c) {
-               craise(c);
-               XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
+               higher(c);
                focus(c);
        }
 }
 
                focus(c);
        }
 }
 
-void
-ckill(Arg *arg)
+Client *
+getclient(Window w)
 {
 {
-       Client *c = csel;
+       Client *c;
 
 
-       if(!c)
-               return;
-       if(c->proto & WM_PROTOCOL_DELWIN)
-               send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-       else
-               XKillClient(dpy, c->win);
+       for(c = clients; c; c = c->next)
+               if(c->win == w)
+                       return c;
+       return NULL;
 }
 
 }
 
-static void
-resize_title(Client *c)
+Client *
+getctitle(Window w)
 {
 {
-       int i;
+       Client *c;
 
 
-       c->tw = 0;
-       for(i = 0; i < TLast; i++)
-               if(c->tags[i])
-                       c->tw += textw(c->tags[i]) + dc.font.height;
-       c->tw += textw(c->name) + dc.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);
+       for(c = clients; c; c = c->next)
+               if(c->title == w)
+                       return c;
+       return NULL;
 }
 
 void
 }
 
 void
-update_name(Client *c)
+gravitate(Client *c, Bool invert)
 {
 {
-       XTextProperty name;
-       int n;
-       char **list = NULL;
+       int dx = 0, dy = 0;
 
 
-       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)
-               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);
-               }
+       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;
        }
        }
-       XFree(name.value);
-       resize_title(c);
-}
 
 
-void
-update_size(Client *c)
-{
-       XSizeHints size;
-       long msize;
-       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
-               size.flags = PSize;
-       c->flags = size.flags;
-       if(c->flags & PBaseSize) {
-               c->basew = size.base_width;
-               c->baseh = size.base_height;
-       }
-       else
-               c->basew = c->baseh = 0;
-       if(c->flags & PResizeInc) {
-               c->incw = size.width_inc;
-               c->inch = size.height_inc;
-       }
-       else
-               c->incw = c->inch = 0;
-       if(c->flags & PMaxSize) {
-               c->maxw = size.max_width;
-               c->maxh = size.max_height;
+       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;
        }
        }
-       else
-               c->maxw = c->maxh = 0;
-       if(c->flags & PMinSize) {
-               c->minw = size.min_width;
-               c->minh = size.min_height;
+
+       if(invert) {
+               dx = -dx;
+               dy = -dy;
        }
        }
-       else
-               c->minw = c->minh = 0;
-       if(c->flags & PWinGravity)
-               c->grav = size.win_gravity;
-       else
-               c->grav = NorthWestGravity;
+       c->x += dx;
+       c->y += dy;
 }
 
 void
 }
 
 void
-craise(Client *c)
+higher(Client *c)
 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);
 }
 
 void
 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);
 }
 
 void
-lower(Client *c)
+killclient(Arg *arg)
 {
 {
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
+       if(!sel)
+               return;
+       if(sel->proto & PROTODELWIN)
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+       else
+               XKillClient(dpy, sel->win);
 }
 
 void
 }
 
 void
-focus(Client *c)
+lower(Client *c)
 {
 {
-       if(csel && csel != c) {
-               XSetWindowBorder(dpy, csel->win, dc.bg);
-               XMapWindow(dpy, csel->title);
-               draw_client(csel);
-       }
-       csel = c;
-       XUnmapWindow(dpy, c->title);
-       XSetWindowBorder(dpy, c->win, dc.fg);
-       draw_client(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       XFlush(dpy);
-       discard_events(EnterWindowMask);
+       XLowerWindow(dpy, c->title);
+       XLowerWindow(dpy, c->win);
 }
 
 void
 manage(Window w, XWindowAttributes *wa)
 {
        Client *c;
 }
 
 void
 manage(Window w, XWindowAttributes *wa)
 {
        Client *c;
+       Window trans;
        XSetWindowAttributes twa;
 
        c = emallocz(sizeof(Client));
        XSetWindowAttributes twa;
 
        c = emallocz(sizeof(Client));
+       c->tags = emallocz(ntags * sizeof(Bool));
        c->win = w;
        c->win = w;
-       c->tx = c->x = wa->x;
-       c->ty = c->y = wa->y;
-       c->tw = c->w = wa->width;
+       c->x = c->tx = wa->x;
+       c->y = c->ty = wa->y;
+       c->w = c->tw = wa->width;
        c->h = wa->height;
        c->h = wa->height;
-       c->th = th;
-       c->border = 1;
-       update_size(c);
+       c->th = bh;
+
+       c->border = 0;
+       setsize(c);
+
+       if(c->h != sh && c->y < bh)
+               c->y = c->ty = bh;
+
+       c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
        XSelectInput(dpy, c->win,
-                       StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       XGetTransientForHint(dpy, c->win, &c->trans);
+               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
-       twa.event_mask = ExposureMask;
+       twa.event_mask = ExposureMask | EnterWindowMask;
 
 
-       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);
 
        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);
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
 
 
-       if(!cstart)
-               cstart = cend = c;
-       else {
-               cend->next = c;
-               c->prev = cend;
-               cend = c;
-       }
+       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);
 
 
-       XSetWindowBorderWidth(dpy, c->win, 1);
-       XMapRaised(dpy, c->win);
-       XMapRaised(dpy, c->title);
-       XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+       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);
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
                        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);
+
+       settags(c);
+       if(!c->isfloat)
+               c->isfloat = trans
+                       || (c->maxw && c->minw &&
+                               c->maxw == c->minw && c->maxh == c->minh);
+       settitle(c);
        arrange(NULL);
        arrange(NULL);
-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
-       focus(c);
+
+       /* mapping the window now prevents flicker */
+       XMapRaised(dpy, c->win);
+       XMapRaised(dpy, c->title);
+       if(c->tags[tsel])
+               focus(c);
 }
 
 void
 }
 
 void
-gravitate(Client *c, Bool invert)
+resize(Client *c, Bool sizehints, Corner sticky)
 {
 {
-       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;
+       int bottom = c->y + c->h;
+       int right = c->x + c->w;
+       /*XConfigureEvent e;*/
+       XWindowChanges wc;
+
+       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)
+                       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 > 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)
+               c->y = bottom - c->h;
+
+       resizetitle(c);
+       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 = 1;
+       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       XSync(dpy, False);
+}
 
 
-       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;
-       }
+void
+setsize(Client *c)
+{
+       long msize;
+       XSizeHints size;
 
 
-       if(invert) {
-               dx = -dx;
-               dy = -dy;
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+               size.flags = PSize;
+       c->flags = size.flags;
+       if(c->flags & PBaseSize) {
+               c->basew = size.base_width;
+               c->baseh = size.base_height;
        }
        }
-       c->x += dx;
-       c->y += dy;
+       else
+               c->basew = c->baseh = 0;
+       if(c->flags & PResizeInc) {
+               c->incw = size.width_inc;
+               c->inch = size.height_inc;
+       }
+       else
+               c->incw = c->inch = 0;
+       if(c->flags & PMaxSize) {
+               c->maxw = size.max_width;
+               c->maxh = size.max_height;
+       }
+       else
+               c->maxw = c->maxh = 0;
+       if(c->flags & PMinSize) {
+               c->minw = size.min_width;
+               c->minh = size.min_height;
+       }
+       else
+               c->minw = c->minh = 0;
+       if(c->flags & PWinGravity)
+               c->grav = size.win_gravity;
+       else
+               c->grav = NorthWestGravity;
 }
 
 }
 
-
 void
 void
-resize(Client *c)
+settitle(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);
+       char **list = NULL;
+       int n;
+       XTextProperty name;
+
+       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);
+               }
+       }
+       XFree(name.value);
+       resizetitle(c);
 }
 
 }
 
-static int
-dummy_error_handler(Display *dsply, XErrorEvent *err)
+void
+togglemax(Arg *arg)
 {
 {
-       return 0;
+       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->h = sh - 2 - 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)
 {
        XGrabServer(dpy);
 }
 
 void
 unmanage(Client *c)
 {
        XGrabServer(dpy);
-       XSetErrorHandler(dummy_error_handler);
+       XSetErrorHandler(xerrordummy);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 
-       if(c->prev) {
+       if(c->prev)
                c->prev->next = c->next;
                c->prev->next = c->next;
-               if(csel == c)
-                       csel = c->prev;
-       }
-       if(c->next) {
+       if(c->next)
                c->next->prev = c->prev;
                c->next->prev = c->prev;
-               if(csel == c)
-                       csel = c->next;
+       if(c == clients)
+               clients = c->next;
+       if(sel == c) {
+               sel = getnext(c->next);
+               if(!sel)
+                       sel = getprev(c->prev);
+               if(!sel)
+                       sel = clients;
        }
        }
-       if(cstart == c)
-               cstart = c->next;
-       if(cend == c)
-               cend = c->prev;
-
+       free(c->tags);
        free(c);
 
        free(c);
 
-       XFlush(dpy);
-       XSetErrorHandler(error_handler);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        arrange(NULL);
        XUngrabServer(dpy);
        arrange(NULL);
-       if(csel)
-               focus(csel);
+       if(sel)
+               focus(sel);
 }
 
 }
 
-Client *
-gettitle(Window w)
-{
-       Client *c;
-       for(c = cstart; c; c = c->next)
-               if(c->title == w)
-                       return c;
-       return NULL;
-}
-
-Client *
-getclient(Window w)
+void
+zoom(Arg *arg)
 {
        Client *c;
 {
        Client *c;
-       for(c = cstart; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
-}
 
 
-void
-draw_client(Client *c)
-{
-       int i;
-       if(c == csel)
+       if(!sel || (arrange != dotile) || sel->isfloat)
                return;
 
                return;
 
-       dc.x = dc.y = 0;
-       dc.h = c->th;
-
-       dc.w = 0;
-       for(i = 0; i < TLast; i++) {
-               if(c->tags[i]) {
-                       dc.x += dc.w;
-                       dc.w = textw(c->tags[i]) + dc.font.height;
-                       draw(True, c->tags[i]);
-               }
+       if(sel == getnext(clients))  {
+               if((c = getnext(sel->next)))
+                       sel = c;
+               else
+                       return;
        }
        }
-       dc.x += dc.w;
-       dc.w = textw(c->name) + dc.font.height;
-       draw(True, c->name);
-       XCopyArea(dpy, dc.drawable, c->title, dc.gc,
-                       0, 0, c->tw, c->th, 0, 0);
-       XFlush(dpy);
+
+       /* 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);
 }
 }