Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
implemented fallback for too many clients in stacked mode
[dwm.git] / client.c
diff --git a/client.c b/client.c
index 3c8825d..52e623a 100644 (file)
--- a/client.c
+++ b/client.c
@@ -2,255 +2,359 @@
  * (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 "dwm.h"
 
 #include <stdlib.h>
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "dwm.h"
+/* static functions */
 
 
-static void (*arrange)(Arg *) = tiling;
+static void
+resizetitle(Client *c)
+{
+       int i;
 
 
-static Rule rule[] = {
-       { "Firefox-bin", "Gecko", { [Twww] = "www" } },
-};
+       c->bw = 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;
+       XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+}
 
 
-static Client *
-next(Client *c)
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee)
 {
 {
-       for(; c && !c->tags[tsel]; c = c->next);
-       return c;
+       return 0;
 }
 
 }
 
+/* extern functions */
+
 void
 void
-zoom(Arg *arg)
+ban(Client *c)
 {
 {
-       Client **l, *old;
-
-       if(!(old = sel))
-               return;
+       XMoveWindow(dpy, c->win, *c->x + 2 * sw, *c->y);
+       XMoveWindow(dpy, c->title, c->bx + 2 * sw, c->by);
+}
 
 
-       for(l = &clients; *l && *l != sel; l = &(*l)->next);
-       *l = sel->next;
+void
+focus(Client *c)
+{
+       Client *old = sel;
+       XEvent ev;
 
 
-       old->next = clients; /* pop */
-       clients = old;
-       sel = old;
-       arrange(NULL);
-       focus(sel);
+       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
-max(Arg *arg)
+focusnext(Arg *arg)
 {
 {
+       Client *c;
+   
        if(!sel)
                return;
        if(!sel)
                return;
-       sel->x = sx;
-       sel->y = sy;
-       sel->w = sw - 2 * sel->border;
-       sel->h = sh - 2 * sel->border;
-       craise(sel);
-       resize(sel);
-       discard_events(EnterWindowMask);
-}
 
 
-void
-view(Arg *arg)
-{
-       tsel = arg->i;
-       arrange(NULL);
+       if(!(c = getnext(sel->next, tsel)))
+               c = getnext(clients, tsel);
+       if(c) {
+               higher(c);
+               c->revert = sel;
+               focus(c);
+       }
 }
 
 void
 }
 
 void
-tag(Arg *arg)
+focusprev(Arg *arg)
 {
 {
-       int i, n;
+       Client *c;
+
        if(!sel)
                return;
 
        if(!sel)
                return;
 
-       if(arg->i == tsel) {
-               for(n = i = 0; i < TLast; i++)
-                       if(sel->tags[i])
-                               n++;
-               if(n < 2)
-                       return;
+       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+               higher(c);
+               focus(c);
        }
        }
+}
 
 
-       if(sel->tags[arg->i])
-               sel->tags[arg->i] = NULL; /* toggle tag */
-       else
-               sel->tags[arg->i] = tags[arg->i];
-       arrange(NULL);
+Client *
+getclient(Window w)
+{
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->win == w)
+                       return c;
+       return NULL;
 }
 
 }
 
-static void
-ban_client(Client *c)
+Client *
+getctitle(Window w)
 {
 {
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->title == w)
+                       return c;
+       return NULL;
 }
 
 void
 }
 
 void
-floating(Arg *arg)
+gravitate(Client *c, Bool invert)
 {
 {
-       Client *c;
+       int dx = 0, dy = 0;
 
 
-       arrange = floating;
-       for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
-                       resize(c);
-               else
-                       ban_client(c);
+       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;
        }
        }
-       if(sel && !sel->tags[tsel]) {
-               if((sel = next(clients))) {
-                       craise(sel);
-                       focus(sel);
-               }
+
+       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;
        }
        }
-       discard_events(EnterWindowMask);
+
+       if(invert) {
+               dx = -dx;
+               dy = -dy;
+       }
+       *c->x += dx;
+       *c->y += dy;
 }
 
 void
 }
 
 void
-tiling(Arg *arg)
+higher(Client *c)
 {
 {
-       Client *c;
-       int n, i, w, h;
-
-       w = sw - mw;
-       arrange = tiling;
-       for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel])
-                       n++;
-
-       h = (n > 2) ? sh / (n - 2) : sh;
-
-       for(i = 0, c = clients; c; c = c->next) {
-               if(c->tags[tsel]) {
-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy;
-                               c->w = sw;
-                               c->h = sh;
-                       }
-                       else if(i == 1) {
-                               c->x = sx;
-                               c->y = sy;
-                               c->w = mw;
-                               c->h = sh;
-                       }
-                       else {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 2) * h;
-                               c->w = w;
-                               c->h = h;
-                       }
-                       resize(c);
-                       i++;
-               }
-               else
-                       ban_client(c);
-       }
-       if(sel && !sel->tags[tsel]) {
-               if((sel = next(clients))) {
-                       craise(sel);
-                       focus(sel);
-               }
-       }
-       discard_events(EnterWindowMask);
+       XRaiseWindow(dpy, c->win);
+       XRaiseWindow(dpy, c->title);
 }
 
 void
 }
 
 void
-prevc(Arg *arg)
+killclient(Arg *arg)
 {
 {
-       Client *c;
-
        if(!sel)
                return;
        if(!sel)
                return;
+       if(sel->proto & WM_PROTOCOL_DELWIN)
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+       else
+               XKillClient(dpy, sel->win);
+}
 
 
-       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-               craise(c);
-               focus(c);
-       }
+void
+lower(Client *c)
+{
+       XLowerWindow(dpy, c->title);
+       XLowerWindow(dpy, c->win);
 }
 
 void
 }
 
 void
-nextc(Arg *arg)
+manage(Window w, XWindowAttributes *wa)
 {
 {
+       int diff;
        Client *c;
        Client *c;
-   
-       if(!sel)
-               return;
+       XSetWindowAttributes twa;
+       Window trans;
 
 
-       if(!(c = next(sel->next)))
-               c = next(clients);
-       if(c) {
-               craise(c);
-               c->revert = sel;
+       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;
+
+       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;
+
+       c->border = 1;
+       c->proto = getproto(c->win);
+       setsize(c);
+       XSelectInput(dpy, c->win,
+                       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,
+                       0, DefaultDepth(dpy, screen), CopyFromParent,
+                       DefaultVisual(dpy, screen),
+                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
+
+       settags(c);
+
+       c->next = clients;
+       clients = c;
+
+       XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+       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);
+
+       if(!c->isfloat)
+               c->isfloat = trans
+                       || ((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);
                focus(c);
        }
                focus(c);
        }
+       else {
+               ban(c);
+               XMapRaised(dpy, c->win);
+               XMapRaised(dpy, c->title);
+               XSync(dpy, False);
+       }
 }
 
 void
 }
 
 void
-ckill(Arg *arg)
+maximize(Arg *arg)
 {
        if(!sel)
                return;
 {
        if(!sel)
                return;
-       if(sel->proto & WM_PROTOCOL_DELWIN)
-               send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-       else
-               XKillClient(dpy, sel->win);
+       *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);
 }
 
 }
 
-static void
-resize_title(Client *c)
+void
+pop(Client *c)
 {
 {
-       int i;
+       Client **l;
+       for(l = &clients; *l && *l != c; l = &(*l)->next);
+       *l = c->next;
 
 
-       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);
+       c->next = clients; /* pop */
+       clients = c;
+       arrange(NULL);
 }
 
 void
 }
 
 void
-update_name(Client *c)
+resize(Client *c, Bool inc, Corner sticky)
 {
 {
-       XTextProperty name;
-       int n;
-       char **list = NULL;
+       XConfigureEvent e;
+       int right = *c->x + *c->w;
+       int bottom = *c->y + *c->h;
+
+       if(inc) {
+               if(c->incw)
+                       *c->w -= (*c->w - c->basew) % c->incw;
+               if(c->inch)
+                       *c->h -= (*c->h - c->baseh) % c->inch;
+       }
+       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(sticky == TopRight || sticky == BottomRight)
+               *c->x = right - *c->w;
+       if(sticky == BottomLeft || sticky == BottomRight)
+               *c->y = bottom - *c->h;
+       resizetitle(c);
+       XSetWindowBorderWidth(dpy, c->win, 1);
+       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);
+       XSync(dpy, False);
+}
 
 
-       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));
+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 {
        else {
-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-                               && n > 0 && *list)
-               {
-                       strncpy(c->name, *list, sizeof(c->name));
-                       XFreeStringList(list);
-               }
+               c->x = &c->fx;
+               c->y = &c->fy;
+               c->w = &c->fw;
+               c->h = &c->fh;
        }
        }
-       XFree(name.value);
-       resize_title(c);
 }
 
 void
 }
 
 void
-update_size(Client *c)
+setsize(Client *c)
 {
        XSizeHints size;
        long msize;
 {
        XSizeHints size;
        long msize;
@@ -288,217 +392,31 @@ update_size(Client *c)
 }
 
 void
 }
 
 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)
+settitle(Client *c)
 {
 {
-       if(sel && sel != c) {
-               XSetWindowBorder(dpy, sel->win, dc.bg);
-               XMapWindow(dpy, sel->title);
-               draw_client(sel);
-       }
-       sel = 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);
-}
-
-static void
-init_tags(Client *c)
-{
-       XClassHint ch;
-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-       unsigned int i, j;
-       Bool matched = False;
+       XTextProperty name;
+       int n;
+       char **list = NULL;
 
 
-       if(!len) {
-               c->tags[tsel] = tags[tsel];
+       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;
                return;
-       }
-
-       if(XGetClassHint(dpy, c->win, &ch)) {
-               if(ch.res_class && ch.res_name) {
-                       fprintf(stderr, "%s:%s\n", ch.res_class, ch.res_name);
-                       for(i = 0; i < len; i++)
-                               if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
-                                       && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
-                               {
-                       fprintf(stderr, "->>>%s:%s\n", ch.res_class, ch.res_name);
-                                       for(j = 0; j < TLast; j++)
-                                               c->tags[j] = rule[i].tags[j];
-                                       matched = True;
-                                       break;
-                               }
+       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(ch.res_class)
-                       XFree(ch.res_class);
-               if(ch.res_name)
-                       XFree(ch.res_name);
-       }
-
-       if(!matched)
-               c->tags[tsel] = tags[tsel];
-}
-
-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;
-       c->proto = win_proto(c->win);
-       update_size(c);
-       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->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);
-       init_tags(c);
-
-       for(l = &clients; *l; l = &(*l)->next);
-       c->next = *l; /* *l == nil */
-       *l = c;
-
-       XSetWindowBorderWidth(dpy, c->win, 1);
-       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);
-       if(c->tags[tsel])
-               focus(c);
-       else
-               ban_client(c);
-}
-
-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;
-       }
-
-       if(invert) {
-               dx = -dx;
-               dy = -dy;
        }
        }
-       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);
+       resizetitle(c);
 }
 
 void
 }
 
 void
@@ -507,7 +425,7 @@ unmanage(Client *c)
        Client **l;
 
        XGrabServer(dpy);
        Client **l;
 
        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);
@@ -522,56 +440,27 @@ unmanage(Client *c)
 
        free(c);
 
 
        free(c);
 
-       XFlush(dpy);
-       XSetErrorHandler(error_handler);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        arrange(NULL);
        if(sel)
                focus(sel);
 }
 
        XUngrabServer(dpy);
        arrange(NULL);
        if(sel)
                focus(sel);
 }
 
-Client *
-gettitle(Window w)
-{
-       Client *c;
-       for(c = clients; 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 = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
-}
 
 
-void
-draw_client(Client *c)
-{
-       int i;
-       if(c == sel)
+       if(!sel)
                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, tsel) && sel->next)  {
+               if((c = getnext(sel->next, tsel)))
+                       sel = c;
        }
        }
-       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(sel);
+       focus(sel);
 }
 }