added a comment about FAQ regarding mfact meaning

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 60d6ea6..fce0a25 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -16,8 +16,8 @@
  * Each child of the root window is called a client, except windows which have
  * set the override_redirect flag.  Clients are organized in a global
  * doubly-linked client list, the focus history is remembered through a global
  * Each child of the root window is called a client, except windows which have
  * set the override_redirect flag.  Clients are organized in a global
  * doubly-linked client list, the focus history is remembered through a global

- * stack list. Each client contains an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.
+ * stack list. Each client contains a bit array to indicate the tags of a
+ * client.

  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *


@@ -33,47 +33,62 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/wait.h>

-#include <regex.h>

 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>

-//#ifdef XINERAMA
+#ifdef XINERAMA

 #include <X11/extensions/Xinerama.h>
 #include <X11/extensions/Xinerama.h>

-//#endif
+#endif

 
 /* macros */
 
 /* macros */

-#define BUTTONMASK             (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)                (mask & ~(numlockmask|LockMask))
-#define LENGTH(x)              (sizeof x / sizeof x[0])
-#define MAXTAGLEN              16
-#define MOUSEMASK              (BUTTONMASK|PointerMotionMask)
-
+#define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define ISVISIBLE(x)            (x->tags & tagset[seltags])
+#define LENGTH(x)               (sizeof x / sizeof x[0])
+#define MAX(a, b)               ((a) > (b) ? (a) : (b))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
+#define MAXTAGLEN               16
+#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
+#define TAGMASK                 ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x)                (textnw(x, strlen(x)) + dc.font.height)

 
 /* enums */
 
 /* enums */

-enum { BarTop, BarBot, BarOff };                       /* bar position */
-enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
-enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
+enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
+enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */

 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */

+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
+
+typedef union {
+       int i;
+       unsigned int ui;
+       float f;
+       void *v;
+} Arg;
+
+typedef struct {
+       unsigned int click;
+       unsigned int mask;
+       unsigned int button;
+       void (*func)(const Arg *arg);
+       const Arg arg;
+} Button;

 
 

-/* typedefs */
-typedef struct View View;

 typedef struct Client Client;
 struct Client {
        char name[256];
 typedef struct Client Client;
 struct Client {
        char name[256];

+       float mina, maxa;

        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;

-       int minax, maxax, minay, maxay;
-       long flags;
-       unsigned int border, oldborder;
-       Bool isbanned, isfixed, isfloating, isurgent;
-       Bool *tags;
-       View *view;
+       int bw, oldbw;
+       unsigned int tags;
+       Bool isfixed, isfloating, isurgent;

        Client *next;
        Client *next;

-       Client *prev;

        Client *snext;
        Window win;
 };
        Client *snext;
        Window win;
 };


@@ -94,125 +109,107 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
 } DC; /* draw context */
 
 typedef struct {

-       unsigned long mod;
+       unsigned int mod;

        KeySym keysym;
        KeySym keysym;

-       void (*func)(const char *arg);
-       const char *arg;
+       void (*func)(const Arg *);
+       const Arg arg;

 } Key;
 
 typedef struct {
        const char *symbol;
 } Key;
 
 typedef struct {
        const char *symbol;

-       void (*arrange)(View *);
+       void (*arrange)(void);

 } Layout;
 
 typedef struct {
 } Layout;
 
 typedef struct {

-       const char *prop;
-       const char *tag;
+       const char *class;
+       const char *instance;
+       const char *title;
+       unsigned int tags;

        Bool isfloating;
 } Rule;
 
        Bool isfloating;
 } Rule;
 

-struct View {
-       unsigned int id;
-       int x, y, w, h, wax, way, wah, waw;
-       double mwfact;
-       Layout *layout;
-       Window barwin;
-};
-

 /* function declarations */
 /* function declarations */

-void addtag(Client *c, const char *t);
-void applyrules(Client *c);
-void arrange(void);
-void attach(Client *c);
-void attachstack(Client *c);
-void ban(Client *c);
-void buttonpress(XEvent *e);
-void checkotherwm(void);
-void cleanup(void);
-void configure(Client *c);
-void configurenotify(XEvent *e);
-void configurerequest(XEvent *e);
-void destroynotify(XEvent *e);
-void detach(Client *c);
-void detachstack(Client *c);
-void drawbar(View *v);
-void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
-void *emallocz(unsigned int size);
-void enternotify(XEvent *e);
-void eprint(const char *errstr, ...);
-void expose(XEvent *e);
-void floating(View *v); /* default floating layout */
-void focus(Client *c);
-void focusin(XEvent *e);
-void focusnext(const char *arg);
-void focusprev(const char *arg);
-Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
-View *getviewbar(Window barwin);
-long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-void grabbuttons(Client *c, Bool focused);
-void grabkeys(void);
-unsigned int idxoftag(const char *t);
-void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
-Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c);
-void keypress(XEvent *e);
-void killclient(const char *arg);
-void manage(Window w, XWindowAttributes *wa);
-void mappingnotify(XEvent *e);
-void maprequest(XEvent *e);
-View *viewat(void);
-void movemouse(Client *c);
-Client *nexttiled(Client *c, View *v);
-void propertynotify(XEvent *e);
-void quit(const char *arg);
-void reapply(const char *arg);
-void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-void resizemouse(Client *c);
-void restack(View *v);
-void run(void);
-void scan(void);
-void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
-void setmwfact(const char *arg);
-void setup(void);
-void spawn(const char *arg);
-void tag(const char *arg);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
-void tile(View *v);
-void togglebar(const char *arg);
-void togglefloating(const char *arg);
-void toggletag(const char *arg);
-void toggleview(const char *arg);
-void unban(Client *c);
-void unmanage(Client *c);
-void unmapnotify(XEvent *e);
-void updatebarpos(View *v);
-void updatesizehints(Client *c);
-void updatetitle(Client *c);
-void updatewmhints(Client *c);
-void view(const char *arg);
-void viewprevtag(const char *arg);     /* views previous selected tags */
-int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dpy, XErrorEvent *ee);
-int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
-void selectview(const char *arg);
+static void applyrules(Client *c);
+static void arrange(void);
+static void attach(Client *c);
+static void attachstack(Client *c);
+static void buttonpress(XEvent *e);
+static void checkotherwm(void);
+static void cleanup(void);
+static void clearurgent(void);
+static void configure(Client *c);
+static void configurenotify(XEvent *e);
+static void configurerequest(XEvent *e);
+static void destroynotify(XEvent *e);
+static void detach(Client *c);
+static void detachstack(Client *c);
+static void die(const char *errstr, ...);
+static void drawbar(void);
+static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
+static void enternotify(XEvent *e);
+static void expose(XEvent *e);
+static void focus(Client *c);
+static void focusin(XEvent *e);
+static void focusstack(const Arg *arg);
+static Client *getclient(Window w);
+static unsigned long getcolor(const char *colstr);
+static long getstate(Window w);
+static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+static void grabbuttons(Client *c, Bool focused);
+static void grabkeys(void);
+static void initfont(const char *fontstr);
+static Bool isprotodel(Client *c);
+static void keypress(XEvent *e);
+static void killclient(const Arg *arg);
+static void manage(Window w, XWindowAttributes *wa);
+static void mappingnotify(XEvent *e);
+static void maprequest(XEvent *e);
+static void monocle(void);
+static void movemouse(const Arg *arg);
+static Client *nexttiled(Client *c);
+static void propertynotify(XEvent *e);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resizemouse(const Arg *arg);
+static void restack(void);
+static void run(void);
+static void scan(void);
+static void setclientstate(Client *c, long state);
+static void setlayout(const Arg *arg);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, unsigned int len);
+static void tile(void);
+static void togglebar(const Arg *arg);
+static void togglefloating(const Arg *arg);
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+static void unmanage(Client *c);
+static void unmapnotify(XEvent *e);
+static void updatebar(void);
+static void updategeom(void);
+static void updatesizehints(Client *c);
+static void updatetitle(Client *c);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);
+static int xerror(Display *dpy, XErrorEvent *ee);
+static int xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);

 
 /* variables */
 
 /* variables */

-char stext[256], buf[256];
-int nviews = 1;
-int screen;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
-unsigned int numlockmask = 0;
-void (*handler[LASTEvent]) (XEvent *) = {
+static char stext[256];
+static int screen;
+static int sx, sy, sw, sh; /* display geometry x, y, width, height */ 
+static int by, bh, blw;    /* bar geometry y, height and layout symbol width */
+static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */
+static unsigned int seltags = 0, sellt = 0;
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned int numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {

        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,


@@ -226,43 +223,28 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };

-Atom wmatom[WMLast], netatom[NetLast];
-Bool isxinerama = False;
-Bool domwfact = True;
-Bool dozoom = True;
-Bool otherwm, readin;
-Bool running = True;
-Bool *prevtags;
-Bool *seltags;
-Client *clients = NULL;
-Client *sel = NULL;
-Client *stack = NULL;
-Cursor cursor[CurLast];
-Display *dpy;
-DC dc = {0};
-View *views;
-View *selview;
-Window root;
-
+static Atom wmatom[WMLast], netatom[NetLast];
+static Bool otherwm;
+static Bool running = True;
+static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
+static Client *clients = NULL;
+static Client *sel = NULL;
+static Client *stack = NULL;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc = {0};
+static Layout *lt[] = { NULL, NULL };
+static Window root, barwin;

 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 

-/* function implementations */
-void
-addtag(Client *c, const char *t) {
-       unsigned int i, tidx = idxoftag(t);
-
-       for(i = 0; i < LENGTH(tags); i++)
-               if(c->tags[i] && vtags[i] != vtags[tidx])
-                       return; /* conflict */
-       c->tags[tidx] = True;
-       c->view = &views[vtags[tidx]];
-}
+/* compile-time check if all tags fit into an unsigned int bit array. */
+struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };

 
 

+/* function implementations */

 void
 applyrules(Client *c) {
        unsigned int i;
 void
 applyrules(Client *c) {
        unsigned int i;

-       Bool matched = False;

        Rule *r;
        XClassHint ch = { 0 };
 
        Rule *r;
        XClassHint ch = { 0 };
 


@@ -270,49 +252,43 @@ applyrules(Client *c) {
        XGetClassHint(dpy, c->win, &ch);
        for(i = 0; i < LENGTH(rules); i++) {
                r = &rules[i];
        XGetClassHint(dpy, c->win, &ch);
        for(i = 0; i < LENGTH(rules); i++) {
                r = &rules[i];

-               if(strstr(c->name, r->prop)
-               || (ch.res_class && strstr(ch.res_class, r->prop))
-               || (ch.res_name && strstr(ch.res_name, r->prop)))
-               {
+               if((!r->title || strstr(c->name, r->title))
+               && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+               && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {

                        c->isfloating = r->isfloating;
                        c->isfloating = r->isfloating;

-                       if(r->tag) {
-                               addtag(c, r->tag);
-                               matched = True;
-                       }
+                       c->tags |= r->tags & TAGMASK;

                }
        }
        if(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);
                }
        }
        if(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);

-       if(!matched) {
-               memcpy(c->tags, seltags, sizeof initags);
-               c->view = selview;
-       }
+       if(!c->tags)
+               c->tags = tagset[seltags];

 }
 
 void
 arrange(void) {
 }
 
 void
 arrange(void) {

-       unsigned int i;

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(isvisible(c))
-                       unban(c);
-               else
-                       ban(c);
+               if(ISVISIBLE(c)) {
+                       XMoveWindow(dpy, c->win, c->x, c->y);
+                       if(!lt[sellt]->arrange || c->isfloating)
+                               resize(c, c->x, c->y, c->w, c->h, True);
+               }
+               else {
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+               }

 
 

-       for(i = 0; i < nviews; i++) {
-               views[i].layout->arrange(&views[i]);
-               restack(&views[i]);
-       }

        focus(NULL);
        focus(NULL);

+       if(lt[sellt]->arrange)
+               lt[sellt]->arrange();
+       restack();

 }
 
 void
 attach(Client *c) {
 }
 
 void
 attach(Client *c) {

-       if(clients)
-               clients->prev = c;

        c->next = clients;
        clients = c;
 }
        c->next = clients;
        clients = c;
 }


@@ -323,64 +299,37 @@ attachstack(Client *c) {
        stack = c;
 }
 
        stack = c;
 }
 

-void
-ban(Client *c) {
-       if(c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x + 3 * c->view->w, c->y);
-       c->isbanned = True;
-}
-

 void
 buttonpress(XEvent *e) {
 void
 buttonpress(XEvent *e) {

-       unsigned int i, x;
+       unsigned int i, x, click;
+       Arg arg = {0};

        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 

-       if(ev->window == selview->barwin) {
-               x = 0;
-               for(i = 0; i < LENGTH(tags); i++) {
-                       if(&views[vtags[i]] != selview)
-                               continue;
-                       x += textw(tags[i]);
-                       if(ev->x < x) {
-                               if(ev->button == Button1) {
-                                       if(ev->state & MODKEY)
-                                               tag(tags[i]);
-                                       else
-                                               view(tags[i]);
-                               }
-                               else if(ev->button == Button3) {
-                                       if(ev->state & MODKEY)
-                                               toggletag(tags[i]);
-                                       else
-                                               toggleview(tags[i]);
-                               }
-                               return;
-                       }
+       click = ClkRootWin;
+       if(ev->window == barwin) {
+               i = x = 0;
+               do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+               if(i < LENGTH(tags)) {
+                       click = ClkTagBar;
+                       arg.ui = 1 << i;

                }
                }

-               if((ev->x < x + blw) && ev->button == Button1)
-                       setlayout(NULL);
+               else if(ev->x < x + blw)
+                       click = ClkLtSymbol;
+               else if(ev->x > wx + ww - TEXTW(stext))
+                       click = ClkStatusText;
+               else
+                       click = ClkWinTitle;

        }
        else if((c = getclient(ev->window))) {
                focus(c);
        }
        else if((c = getclient(ev->window))) {
                focus(c);

-               if(CLEANMASK(ev->state) != MODKEY)
-                       return;
-               if(ev->button == Button1) {
-                       restack(c->view);
-                       movemouse(c);
-               }
-               else if(ev->button == Button2) {
-                       if((floating != c->view->layout->arrange) && c->isfloating)
-                               togglefloating(NULL);
-                       else
-                               zoom(NULL);
-               }
-               else if(ev->button == Button3 && !c->isfixed) {
-                       restack(c->view);
-                       resizemouse(c);
-               }
+               click = ClkClientWin;

        }
        }

+
+       for(i = 0; i < LENGTH(buttons); i++)
+               if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+                  && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+                       buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);

 }
 
 void
 }
 
 void


@@ -392,8 +341,7 @@ checkotherwm(void) {
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        if(otherwm)
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        if(otherwm)

-               eprint("dwm: another window manager is already running\n");
-       XSync(dpy, False);
+               die("dwm: another window manager is already running\n");

        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);


@@ -401,29 +349,46 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
 
 void
 cleanup(void) {

-       unsigned int i;
+       Arg a = {.ui = ~0};
+       Layout foo = { "", NULL };
+

        close(STDIN_FILENO);
        close(STDIN_FILENO);

-       while(stack) {
-               unban(stack);
+       view(&a);
+       lt[sellt] = &foo;
+       while(stack)

                unmanage(stack);
                unmanage(stack);

-       }

        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        else
                XFreeFont(dpy, dc.font.xfont);
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        else
                XFreeFont(dpy, dc.font.xfont);

-

        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);

-       for(i = 0; i < nviews; i++)
-               XDestroyWindow(dpy, views[i].barwin);
+       XDestroyWindow(dpy, barwin);

        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 

+void
+clearurgent(void) {
+       XWMHints *wmh;
+       Client *c;
+
+       for(c = clients; c; c = c->next)
+               if(ISVISIBLE(c) && c->isurgent) {
+                       c->isurgent = False;
+                       if (!(wmh = XGetWMHints(dpy, c->win)))
+                               continue;
+
+                       wmh->flags &= ~XUrgencyHint;
+                       XSetWMHints(dpy, c->win, wmh);
+                       XFree(wmh);
+               }
+}
+

 void
 configure(Client *c) {
        XConfigureEvent ce;
 void
 configure(Client *c) {
        XConfigureEvent ce;


@@ -436,7 +401,7 @@ configure(Client *c) {
        ce.y = c->y;
        ce.width = c->w;
        ce.height = c->h;
        ce.y = c->y;
        ce.width = c->w;
        ce.height = c->h;

-       ce.border_width = c->border;
+       ce.border_width = c->bw;

        ce.above = None;
        ce.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
        ce.above = None;
        ce.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);


@@ -445,16 +410,12 @@ configure(Client *c) {
 void
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 void
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;

-       View *v = selview;

 
 

-       if(ev->window == root && (ev->width != v->w || ev->height != v->h)) {
-               /* TODO -- update Xinerama dimensions here */
-               v->w = ev->width;
-               v->h = ev->height;
-               XFreePixmap(dpy, dc.drawable);
-               dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
-               XResizeWindow(dpy, v->barwin, v->w, bh);
-               updatebarpos(selview);
+       if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+               sw = ev->width;
+               sh = ev->height;
+               updategeom();
+               updatebar();

                arrange();
        }
 }
                arrange();
        }
 }


@@ -466,26 +427,24 @@ configurerequest(XEvent *e) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {

-               View *v = c->view;

                if(ev->value_mask & CWBorderWidth)
                if(ev->value_mask & CWBorderWidth)

-                       c->border = ev->border_width;
-               if(c->isfixed || c->isfloating || (floating == v->layout->arrange)) {
+                       c->bw = ev->border_width;
+               else if(c->isfloating || !lt[sellt]->arrange) {

                        if(ev->value_mask & CWX)
                        if(ev->value_mask & CWX)

-                               c->x = v->x + ev->x;
+                               c->x = sx + ev->x;

                        if(ev->value_mask & CWY)
                        if(ev->value_mask & CWY)

-                               c->y = v->y + ev->y;
+                               c->y = sy + ev->y;

                        if(ev->value_mask & CWWidth)
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;
                        if(ev->value_mask & CWWidth)
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;

-                       if((c->x - v->x + c->w) > v->w && c->isfloating)
-                               c->x = v->x + (v->w / 2 - c->w / 2); /* center in x direction */
-                       if((c->y - v->y + c->h) > v->h && c->isfloating)
-                               c->y = v->y + (v->h / 2 - c->h / 2); /* center in y direction */
-                       if((ev->value_mask & (CWX|CWY))
-                       && !(ev->value_mask & (CWWidth|CWHeight)))
+                       if((c->x - sx + c->w) > sw && c->isfloating)
+                               c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
+                       if((c->y - sy + c->h) > sh && c->isfloating)
+                               c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+                       if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))

                                configure(c);
                                configure(c);

-                       if(isvisible(c))
+                       if(ISVISIBLE(c))

                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else


@@ -515,68 +474,75 @@ destroynotify(XEvent *e) {
 
 void
 detach(Client *c) {
 
 void
 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;
+       Client **tc;
+
+       for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next);
+       *tc = c->next;

 }
 
 void
 detachstack(Client *c) {
        Client **tc;
 
 }
 
 void
 detachstack(Client *c) {
        Client **tc;
 

-       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);

        *tc = c->snext;
 }
 
 void
        *tc = c->snext;
 }
 
 void

-drawbar(View *v) {
-       int i, x;
+die(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
+void
+drawbar(void) {
+       int x;
+       unsigned int i, occ = 0, urg = 0;
+       unsigned long *col;

        Client *c;
 
        Client *c;
 

+       for(c = clients; c; c = c->next) {
+               occ |= c->tags;
+               if(c->isurgent)
+                       urg |= c->tags;
+       }
+

        dc.x = 0;
        dc.x = 0;

-       for(c = stack; c && (!isvisible(c) || c->view != v); c = c->snext);

        for(i = 0; i < LENGTH(tags); i++) {
        for(i = 0; i < LENGTH(tags); i++) {

-               if(&views[vtags[i]] != v)
-                       continue;
-               dc.w = textw(tags[i]);
-               if(seltags[i]) {
-                       drawtext(tags[i], dc.sel, isurgent(i));
-                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
-               }
-               else {
-                       drawtext(tags[i], dc.norm, isurgent(i));
-                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
-               }
+               dc.w = TEXTW(tags[i]);
+               col = tagset[seltags] & 1 << i ? dc.sel : dc.norm;
+               drawtext(tags[i], col, urg & 1 << i);
+               drawsquare(sel && sel->tags & 1 << i, occ & 1 << i, urg & 1 << i, col);

                dc.x += dc.w;
        }
                dc.x += dc.w;
        }

-       dc.w = blw;
-       drawtext(v->layout->symbol, dc.norm, False);
-       x = dc.x + dc.w;
-       if(v == selview) {
-               dc.w = textw(stext);
-               dc.x = v->w - dc.w;
-               if(dc.x < x) {
-                       dc.x = x;
-                       dc.w = v->w - x;
-               }
-               drawtext(stext, dc.norm, False);
+       if(blw > 0) {
+               dc.w = blw;
+               drawtext(lt[sellt]->symbol, dc.norm, False);
+               x = dc.x + dc.w;

        }
        else
        }
        else

-               dc.x = v->w;
+               x = dc.x;
+       dc.w = TEXTW(stext);
+       dc.x = ww - dc.w;
+       if(dc.x < x) {
+               dc.x = x;
+               dc.w = ww - x;
+       }
+       drawtext(stext, dc.norm, False);

        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;

-               if(c) {
-                       drawtext(c->name, dc.sel, False);
-                       drawsquare(False, c->isfloating, False, dc.sel);
+               if(sel) {
+                       drawtext(sel->name, dc.sel, False);
+                       drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);

                }
                else
                        drawtext(NULL, dc.norm, False);
        }
                }
                else
                        drawtext(NULL, dc.norm, False);
        }

-       XCopyArea(dpy, dc.drawable, v->barwin, dc.gc, 0, 0, v->w, bh, 0, 0);
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);

        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 


@@ -603,36 +569,26 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {

-       int x, y, w, h;
-       unsigned int len, olen;
+       int i, x, y, h, len, olen;

        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };

+       char buf[256];

 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;

-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
+       olen = strlen(text);
+       len = MIN(olen, sizeof buf);

        memcpy(buf, text, len);
        memcpy(buf, text, len);

-       buf[len] = 0;

        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */
        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */

-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
-       }
-       if(w > dc.w)
-               return; /* too long */
+       for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+       if(!len)
+               return;
+       if(len < olen)
+               for(i = len; i && i > len - 3; buf[--i] = '.');

        XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
        if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
        if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);


@@ -640,70 +596,31 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 

-void *
-emallocz(unsigned int size) {
-       void *res = calloc(1, size);
-
-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
-}
-

 void
 enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
 void
 enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 

-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
-               if(!isxinerama || ev->window != root)
-                       return;
-       }
+       if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
+               return;

        if((c = getclient(ev->window)))
                focus(c);
        else
                focus(NULL);
 }
 
        if((c = getclient(ev->window)))
                focus(c);
        else
                focus(NULL);
 }
 

-void
-eprint(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
-}
-

 void
 expose(XEvent *e) {
 void
 expose(XEvent *e) {

-       View *v;

        XExposeEvent *ev = &e->xexpose;
 
        XExposeEvent *ev = &e->xexpose;
 

-       if(ev->count == 0 && ((v = getviewbar(ev->window))))
-               drawbar(v);
-}
-
-void
-floating(View *v) { /* default floating layout */
-       Client *c;
-
-       domwfact = dozoom = False;
-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       resize(c, c->x, c->y, c->w, c->h, True);
+       if(ev->count == 0 && (ev->window == barwin))
+               drawbar();

 }
 
 void
 focus(Client *c) {
 }
 
 void
 focus(Client *c) {

-       View *v = selview;
-       if(c)
-               selview = c->view;
-       else
-               selview = viewat();
-       if(selview != v)
-               drawbar(v);
-       if(!c || (c && !isvisible(c)))
-               for(c = stack; c && (!isvisible(c) || c->view != selview); c = c->snext);
+       if(!c || !ISVISIBLE(c))
+               for(c = stack; c && !ISVISIBLE(c); c = c->snext);

        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);


@@ -712,16 +629,13 @@ focus(Client *c) {
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);

-       }
-       sel = c;
-       if(c) {

                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

-               selview = c->view;

        }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

-       drawbar(selview);
+       sel = c;
+       drawbar();

 }
 
 void
 }
 
 void


@@ -733,34 +647,28 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 }
 
 void
 }
 
 void

-focusnext(const char *arg) {
-       Client *c;
+focusstack(const Arg *arg) {
+       Client *c = NULL, *i;

 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack(c->view);
+       if (arg->i > 0) {
+               for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
+               if(!c)
+                       for(c = clients; c && !ISVISIBLE(c); c = c->next);

        }
        }

-}
-
-void
-focusprev(const char *arg) {
-       Client *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);
+       else {
+               for(i = clients; i != sel; i = i->next)
+                       if(ISVISIBLE(i))
+                               c = i;
+               if(!c)
+                       for(; i; i = i->next)
+                               if(ISVISIBLE(i))
+                                       c = i;

        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);

-               restack(c->view);
+               restack();

        }
 }
 
        }
 }
 


@@ -778,20 +686,10 @@ getcolor(const char *colstr) {
        XColor color;
 
        if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
        XColor color;
 
        if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))

-               eprint("error, cannot allocate color '%s'\n", colstr);
+               die("error, cannot allocate color '%s'\n", colstr);

        return color.pixel;
 }
 
        return color.pixel;
 }
 

-View *
-getviewbar(Window barwin) {
-       unsigned int i;
-
-       for(i = 0; i < nviews; i++)
-               if(views[i].barwin == barwin)
-                       return &views[i];
-       return NULL;
-}
-

 long
 getstate(Window w) {
        int format, status;
 long
 getstate(Window w) {
        int format, status;


@@ -838,44 +736,24 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
 
 void
 grabbuttons(Client *c, Bool focused) {

-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       unsigned int i, j;
+       unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };

 
 

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

        if(focused) {
        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);
+               for(i = 0; i < LENGTH(buttons); i++)
+                       if(buttons[i].click == ClkClientWin)
+                               for(j = 0; j < LENGTH(modifiers); j++)
+                                       XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+       } else
+               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+                           BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);

 }
 
 void
 }
 
 void

-grabkeys(void)  {
+grabkeys(void) {

        unsigned int i, j;
        unsigned int i, j;

+       unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };

        KeyCode code;
        XModifierKeymap *modmap;
 
        KeyCode code;
        XModifierKeymap *modmap;
 


@@ -891,25 +769,12 @@ grabkeys(void)  {
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for(i = 0; i < LENGTH(keys); i++) {
                code = XKeysymToKeycode(dpy, keys[i].keysym);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for(i = 0; i < LENGTH(keys); i++) {
                code = XKeysymToKeycode(dpy, keys[i].keysym);

-               XGrabKey(dpy, code, keys[i].mod, root, True,
-                               GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
-                               GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
-                               GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
-                               GrabModeAsync, GrabModeAsync);
+               for(j = 0; j < LENGTH(modifiers); j++)
+                       XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
+                                GrabModeAsync, GrabModeAsync);

        }
 }
 
        }
 }
 

-unsigned int
-idxoftag(const char *t) {
-       unsigned int i;
-
-       for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
-       return (i < LENGTH(tags)) ? i : 0;
-}
-

 void
 initfont(const char *fontstr) {
        char *def, **missing;
 void
 initfont(const char *fontstr) {
        char *def, **missing;


@@ -932,10 +797,8 @@ initfont(const char *fontstr) {
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {

-                       if(dc.font.ascent < (*xfonts)->ascent)
-                               dc.font.ascent = (*xfonts)->ascent;
-                       if(dc.font.descent < (*xfonts)->descent)
-                               dc.font.descent = (*xfonts)->descent;
+                       dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+                       dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);

                        xfonts++;
                }
        }
                        xfonts++;
                }
        }


@@ -945,23 +808,13 @@ initfont(const char *fontstr) {
                dc.font.xfont = NULL;
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
                dc.font.xfont = NULL;
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))

-                       eprint("error, cannot load font: '%s'\n", fontstr);
+                       die("error, cannot load font: '%s'\n", fontstr);

                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }
        dc.font.height = dc.font.ascent + dc.font.descent;
 }
 
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }
        dc.font.height = dc.font.ascent + dc.font.descent;
 }
 

-Bool
-isoccupied(unsigned int t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
-}
-

 Bool
 isprotodel(Client *c) {
        int i, n;
 Bool
 isprotodel(Client *c) {
        int i, n;


@@ -977,26 +830,6 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

-Bool
-isurgent(unsigned int t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->isurgent && c->tags[t])
-                       return True;
-       return False;
-}
-
-Bool
-isvisible(Client *c) {
-       unsigned int i;
-
-       for(i = 0; i < LENGTH(tags); i++)
-               if(c->tags[i] && seltags[i])
-                       return True;
-       return False;
-}
-

 void
 keypress(XEvent *e) {
        unsigned int i;
 void
 keypress(XEvent *e) {
        unsigned int i;


@@ -1007,15 +840,13 @@ keypress(XEvent *e) {
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym

-               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
-               {
-                       if(keys[i].func)
-                               keys[i].func(keys[i].arg);
-               }
+                  && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+                  && keys[i].func)
+                       keys[i].func(&(keys[i].arg));

 }
 
 void
 }
 
 void

-killclient(const char *arg) {
+killclient(const Arg *arg) {

        XEvent ev;
 
        if(!sel)
        XEvent ev;
 
        if(!sel)


@@ -1036,42 +867,36 @@ killclient(const char *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

-       View *v;
-       Status rettrans;
-       Window trans;
+       Window trans = 0;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       c = emallocz(sizeof(Client));
-       c->tags = emallocz(sizeof initags);
+       if(!(c = calloc(1, sizeof(Client))))
+               die("fatal: could not calloc() %u bytes\n", sizeof(Client));

        c->win = w;
 
        c->win = w;
 

-       applyrules(c);
-
-       v = c->view;
-
-       c->x = wa->x + v->x;
-       c->y = wa->y + v->y;
+       /* geometry */
+       c->x = wa->x;
+       c->y = wa->y;

        c->w = wa->width;
        c->h = wa->height;
        c->w = wa->width;
        c->h = wa->height;

-       c->oldborder = wa->border_width;
-
-       if(c->w == v->w && c->h == v->h) {
-               c->x = v->x;
-               c->y = v->y;
-               c->border = wa->border_width;
+       c->oldbw = wa->border_width;
+       if(c->w == sw && c->h == sh) {
+               c->x = sx;
+               c->y = sy;
+               c->bw = 0;

        }
        else {
        }
        else {

-               if(c->x + c->w + 2 * c->border > v->wax + v->waw)
-                       c->x = v->wax + v->waw - c->w - 2 * c->border;
-               if(c->y + c->h + 2 * c->border > v->way + v->wah)
-                       c->y = v->way + v->wah - c->h - 2 * c->border;
-               if(c->x < v->wax)
-                       c->x = v->wax;
-               if(c->y < v->way)
-                       c->y = v->way;
-               c->border = BORDERPX;
+               if(c->x + c->w + 2 * c->bw > sx + sw)
+                       c->x = sx + sw - c->w - 2 * c->bw;
+               if(c->y + c->h + 2 * c->bw > sy + sh)
+                       c->y = sy + sh - c->h - 2 * c->bw;
+               c->x = MAX(c->x, sx);
+               /* only fix client y-offset, if the client center might cover the bar */
+               c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
+               c->bw = borderpx;

        }
        }

-       wc.border_width = c->border;
+
+       wc.border_width = c->bw;

        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */


@@ -1079,16 +904,19 @@ manage(Window w, XWindowAttributes *wa) {
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);

-       if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-               for(t = clients; t && t->win != trans; t = t->next);
+       if(XGetTransientForHint(dpy, w, &trans))
+               t = getclient(trans);

        if(t)
        if(t)

-               memcpy(c->tags, t->tags, sizeof initags);
+               c->tags = t->tags;
+       else
+               applyrules(c);

        if(!c->isfloating)
        if(!c->isfloating)

-               c->isfloating = (rettrans == Success) || c->isfixed;
+               c->isfloating = trans || c->isfixed;
+       if(c->isfloating)
+               XRaiseWindow(dpy, c->win);

        attach(c);
        attachstack(c);
        attach(c);
        attachstack(c);

-       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-       ban(c);
+       XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */

        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();


@@ -1117,20 +945,30 @@ maprequest(XEvent *e) {
 }
 
 void
 }
 
 void

-movemouse(Client *c) {
-       int x1, y1, ocx, ocy, di, nx, ny;
+monocle(void) {
+       Client *c;
+
+       for(c = nexttiled(clients); c; c = nexttiled(c->next))
+               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+}
+
+void
+movemouse(const Arg *arg) {
+       int x, y, ocx, ocy, di, nx, ny;

        unsigned int dui;
        unsigned int dui;

-       View *v;
+       Client *c;

        Window dummy;
        XEvent ev;
 
        Window dummy;
        XEvent ev;
 

+       if(!(c = sel))
+               return;
+       restack();

        ocx = nx = c->x;
        ocy = ny = c->y;
        ocx = nx = c->x;
        ocy = ny = c->y;

-       v = c->view;

        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

-                       None, cursor[CurMove], CurrentTime) != GrabSuccess)
+       None, cursor[CurMove], CurrentTime) != GrabSuccess)

                return;
                return;

-       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);

        for(;;) {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                switch (ev.type) {
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                switch (ev.type) {


@@ -1144,19 +982,22 @@ movemouse(Client *c) {
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);

-                       nx = ocx + (ev.xmotion.x - x1);
-                       ny = ocy + (ev.xmotion.y - y1);
-                       if(abs(v->wax - nx) < SNAP)
-                               nx = v->wax;
-                       else if(abs((v->wax + v->waw) - (nx + c->w + 2 * c->border)) < SNAP)
-                               nx = v->wax + v->waw - c->w - 2 * c->border;
-                       if(abs(v->way - ny) < SNAP)
-                               ny = v->way;
-                       else if(abs((v->way + v->wah) - (ny + c->h + 2 * c->border)) < SNAP)
-                               ny = v->way + v->wah - c->h - 2 * c->border;
-                       if(!c->isfloating && (v->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
-                               togglefloating(NULL);
-                       if((v->layout->arrange == floating) || c->isfloating)
+                       nx = ocx + (ev.xmotion.x - x);
+                       ny = ocy + (ev.xmotion.y - y);
+                       if(snap && nx >= wx && nx <= wx + ww
+                               && ny >= wy && ny <= wy + wh) {
+                               if(abs(wx - nx) < snap)
+                                       nx = wx;
+                               else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
+                                       nx = wx + ww - c->w - 2 * c->bw;
+                               if(abs(wy - ny) < snap)
+                                       ny = wy;
+                               else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
+                                       ny = wy + wh - c->h - 2 * c->bw;
+                               if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                                       togglefloating(NULL);
+                       }
+                       if(!lt[sellt]->arrange || c->isfloating)

                                resize(c, nx, ny, c->w, c->h, False);
                        break;
                }
                                resize(c, nx, ny, c->w, c->h, False);
                        break;
                }


@@ -1164,8 +1005,8 @@ movemouse(Client *c) {
 }
 
 Client *
 }
 
 Client *

-nexttiled(Client *c, View *v) {
-       for(; c && (c->isfloating || c->view != v || !isvisible(c)); c = c->next);
+nexttiled(Client *c) {
+       for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -1190,57 +1031,41 @@ propertynotify(XEvent *e) {
                        break;
                case XA_WM_HINTS:
                        updatewmhints(c);
                        break;
                case XA_WM_HINTS:
                        updatewmhints(c);

-                       drawbar(c->view);
+                       drawbar();

                        break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                        if(c == sel)
                        break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                        if(c == sel)

-                               drawbar(selview);
+                               drawbar();

                }
        }
 }
 
 void
                }
        }
 }
 
 void

-quit(const char *arg) {
+quit(const Arg *arg) {

        readin = running = False;
 }
 
        readin = running = False;
 }
 

-void
-reapply(const char *arg) {
-       static Bool zerotags[LENGTH(tags)] = { 0 };
-       Client *c;
-
-       for(c = clients; c; c = c->next) {
-               memcpy(c->tags, zerotags, sizeof zerotags);
-               applyrules(c);
-       }
-       arrange();
-}
-

 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {

-       View *v;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       v = c->view;

        if(sizehints) {
                /* set minimum possible */
        if(sizehints) {
                /* set minimum possible */

-               if (w < 1)
-                       w = 1;
-               if (h < 1)
-                       h = 1;
+               w = MAX(1, w);
+               h = MAX(1, h);

 
                /* temporarily remove base dimensions */
                w -= c->basew;
                h -= c->baseh;
 
                /* adjust for aspect limits */
 
                /* temporarily remove base dimensions */
                w -= c->basew;
                h -= c->baseh;
 
                /* adjust for aspect limits */

-               if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
-                       if (w * c->maxay > h * c->maxax)
-                               w = h * c->maxax / c->maxay;
-                       else if (w * c->minay < h * c->minax)
-                               h = w * c->minay / c->minax;
+               if(c->mina > 0 && c->maxa > 0) {
+                       if(c->maxa < (float) w/h)
+                               w = h * c->maxa;
+                       else if(c->mina > (float) h/w)
+                               h = w * c->mina;

                }
 
                /* adjust for increment value */
                }
 
                /* adjust for increment value */


@@ -1253,31 +1078,35 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                w += c->basew;
                h += c->baseh;
 
                w += c->basew;
                h += c->baseh;
 

-               if(c->minw > 0 && w < c->minw)
-                       w = c->minw;
-               if(c->minh > 0 && h < c->minh)
-                       h = c->minh;
-               if(c->maxw > 0 && w > c->maxw)
-                       w = c->maxw;
-               if(c->maxh > 0 && h > c->maxh)
-                       h = c->maxh;
+               w = MAX(w, c->minw);
+               h = MAX(h, c->minh);
+
+               if(c->maxw)
+                       w = MIN(w, c->maxw);
+
+               if(c->maxh)
+                       h = MIN(h, c->maxh);

        }
        if(w <= 0 || h <= 0)
                return;
        }
        if(w <= 0 || h <= 0)
                return;

-       if(x > v->x + v->w)
-               x = v->w - w - 2 * c->border;
-       if(y > v->y + v->h)
-               y = v->h - h - 2 * c->border;
-       if(x + w + 2 * c->border < v->x)
-               x = v->x;
-       if(y + h + 2 * c->border < v->y)
-               y = v->y;
+       if(x > sx + sw)
+               x = sw - w - 2 * c->bw;
+       if(y > sy + sh)
+               y = sh - h - 2 * c->bw;
+       if(x + w + 2 * c->bw < sx)
+               x = sx;
+       if(y + h + 2 * c->bw < sy)
+               y = sy;
+       if(h < bh)
+               h = bh;
+       if(w < bh)
+               w = bh;

        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;
        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;
+               wc.border_width = c->bw;

                XConfigureWindow(dpy, c->win,
                                CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
                configure(c);
                XConfigureWindow(dpy, c->win,
                                CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
                configure(c);


@@ -1286,25 +1115,27 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
 }
 
 void

-resizemouse(Client *c) {
+resizemouse(const Arg *arg) {

        int ocx, ocy;
        int nw, nh;
        int ocx, ocy;
        int nw, nh;

-       View *v;
+       Client *c;

        XEvent ev;
 
        XEvent ev;
 

+       if(!(c = sel))
+               return;
+       restack();

        ocx = c->x;
        ocy = c->y;
        ocx = c->x;
        ocy = c->y;

-       v = c->view;

        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

-                       None, cursor[CurResize], CurrentTime) != GrabSuccess)
+       None, cursor[CurResize], CurrentTime) != GrabSuccess)

                return;
                return;

-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);

        for(;;) {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
                switch(ev.type) {
                case ButtonRelease:
                        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
                switch(ev.type) {
                case ButtonRelease:
                        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,

-                                       c->w + c->border - 1, c->h + c->border - 1);
+                                       c->w + c->bw - 1, c->h + c->bw - 1);

                        XUngrabPointer(dpy, CurrentTime);
                        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
                        return;
                        XUngrabPointer(dpy, CurrentTime);
                        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
                        return;


@@ -1315,13 +1146,16 @@ resizemouse(Client *c) {
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);

-                       if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
-                               nw = 1;
-                       if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
-                               nh = 1;
-                       if(!c->isfloating && (v->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
-                               togglefloating(NULL);
-                       if((v->layout->arrange == floating) || c->isfloating)
+                       nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+                       nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+
+                       if(snap && nw >= wx && nw <= wx + ww
+                               && nh >= wy && nh <= wy + wh) {
+                               if(!c->isfloating && lt[sellt]->arrange
+                                  && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                                       togglefloating(NULL);
+                       }
+                       if(!lt[sellt]->arrange || c->isfloating)

                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }


@@ -1329,29 +1163,24 @@ resizemouse(Client *c) {
 }
 
 void
 }
 
 void

-restack(View *v) {
+restack(void) {

        Client *c;
        XEvent ev;
        XWindowChanges wc;
 
        Client *c;
        XEvent ev;
        XWindowChanges wc;
 

-       drawbar(v);
+       drawbar();

        if(!sel)
                return;
        if(!sel)
                return;

-       if(sel->isfloating || (v->layout->arrange == floating))
+       if(sel->isfloating || !lt[sellt]->arrange)

                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->win);

-       if(v->layout->arrange != floating) {
+       if(lt[sellt]->arrange) {

                wc.stack_mode = Below;
                wc.stack_mode = Below;

-               wc.sibling = v->barwin;
-               if(!sel->isfloating) {
-                       XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
-                       wc.sibling = sel->win;
-               }
-               for(c = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
-                       if(c == sel)
-                               continue;
-                       XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
-                       wc.sibling = c->win;
-               }
+               wc.sibling = barwin;
+               for(c = stack; c; c = c->snext)
+                       if(!c->isfloating && ISVISIBLE(c)) {
+                               XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+                               wc.sibling = c->win;
+                       }

        }
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
        }
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));


@@ -1369,7 +1198,6 @@ run(void) {
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        xfd = ConnectionNumber(dpy);
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        xfd = ConnectionNumber(dpy);

-       readin = True;

        offset = 0;
        len = sizeof stext - 1;
        sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
        offset = 0;
        len = sizeof stext - 1;
        sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */


@@ -1381,7 +1209,7 @@ run(void) {
                if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
                        if(errno == EINTR)
                                continue;
                if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
                        if(errno == EINTR)
                                continue;

-                       eprint("select failed\n");
+                       die("select failed\n");

                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
                        switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
                        switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {


@@ -1407,7 +1235,7 @@ run(void) {
                                        }
                                break;
                        }
                                        }
                                break;
                        }

-                       drawbar(selview);
+                       drawbar();

                }
                while(XPending(dpy)) {
                        XNextEvent(dpy, &ev);
                }
                while(XPending(dpy)) {
                        XNextEvent(dpy, &ev);


@@ -1427,7 +1255,7 @@ scan(void) {
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)

-                                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))

                                continue;
                        if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
                                manage(wins[i], &wa);
                                continue;
                        if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
                                manage(wins[i], &wa);


@@ -1436,7 +1264,7 @@ scan(void) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
                                continue;
                        if(XGetTransientForHint(dpy, wins[i], &d1)
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
                                continue;
                        if(XGetTransientForHint(dpy, wins[i], &d1)

-                                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))

                                manage(wins[i], &wa);
                }
        }
                                manage(wins[i], &wa);
                }
        }


@@ -1453,58 +1281,49 @@ setclientstate(Client *c, long state) {
 }
 
 void
 }
 
 void

-setlayout(const char *arg) {
-       unsigned int i;
-       View *v = selview;
-
-       if(!arg) {
-               v->layout++;
-               if(v->layout == &layouts[LENGTH(layouts)])
-                       v->layout = &layouts[0];
-       }
-       else {
-               for(i = 0; i < LENGTH(layouts); i++)
-                       if(!strcmp(arg, layouts[i].symbol))
-                               break;
-               if(i == LENGTH(layouts))
-                       return;
-               v->layout = &layouts[i];
-       }
+setlayout(const Arg *arg) {
+       if(!arg || !arg->v || arg->v != lt[sellt])
+               sellt ^= 1;
+       if(arg && arg->v)
+               lt[sellt] = (Layout *)arg->v;

        if(sel)
                arrange();
        else
        if(sel)
                arrange();
        else

-               drawbar(selview);
+               drawbar();

 }
 
 }
 

+/* arg > 1.0 will set mfact absolutly */

 void
 void

-setmwfact(const char *arg) {
-       double delta;
-       View *v = selview;
+setmfact(const Arg *arg) {
+       float f;

 
 

-       if(!domwfact)
+       if(!arg || !lt[sellt]->arrange)

                return;
                return;

-       /* arg handling, manipulate mwfact */
-       if(arg == NULL)
-               v->mwfact = MWFACT;
-       else if(sscanf(arg, "%lf", &delta) == 1) {
-               if(arg[0] == '+' || arg[0] == '-')
-                       v->mwfact += delta;
-               else
-                       v->mwfact = delta;
-               if(v->mwfact < 0.1)
-                       v->mwfact = 0.1;
-               else if(v->mwfact > 0.9)
-                       v->mwfact = 0.9;
-       }
+       f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+       if(f < 0.1 || f > 0.9)
+               return;
+       mfact = f;

        arrange();
 }
 
 void
 setup(void) {
        unsigned int i;
        arrange();
 }
 
 void
 setup(void) {
        unsigned int i;

-       View *v;
+       int w;

        XSetWindowAttributes wa;
        XSetWindowAttributes wa;

-       XineramaScreenInfo *info = NULL;
+
+       /* init screen */
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+       initfont(font);
+       sx = 0;
+       sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+       bh = dc.h = dc.font.height + 2;
+       lt[0] = &layouts[0];
+       lt[1] = &layouts[1 % LENGTH(layouts)];
+       updategeom();

 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);


@@ -1519,116 +1338,54 @@ setup(void) {
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 

-       if((isxinerama = XineramaIsActive(dpy)))
-               info = XineramaQueryScreens(dpy, &nviews);
-#if defined(AIM_XINERAMA)
-isxinerama = True;
-nviews = 2; /* aim Xinerama */
-#endif
-       views = emallocz(nviews * sizeof(View));
-
-       screen = DefaultScreen(dpy);
-       root = RootWindow(dpy, screen);
-

        /* init appearance */
        /* init appearance */

-       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
-       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-       dc.sel[ColBG] = getcolor(SELBGCOLOR);
-       dc.sel[ColFG] = getcolor(SELFGCOLOR);
-       initfont(FONT);
-       dc.h = bh = dc.font.height + 2;
+       dc.norm[ColBorder] = getcolor(normbordercolor);
+       dc.norm[ColBG] = getcolor(normbgcolor);
+       dc.norm[ColFG] = getcolor(normfgcolor);
+       dc.sel[ColBorder] = getcolor(selbordercolor);
+       dc.sel[ColBG] = getcolor(selbgcolor);
+       dc.sel[ColFG] = getcolor(selfgcolor);

        dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 

-       for(blw = i = 0; i < LENGTH(layouts); i++) {
-               i = textw(layouts[i].symbol);
-               if(i > blw)
-                       blw = i;
+       /* init bar */
+       for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+               w = TEXTW(layouts[i].symbol);
+               blw = MAX(blw, w);

        }
 
        }
 

-       seltags = emallocz(sizeof initags);
-       prevtags = emallocz(sizeof initags);
-       memcpy(seltags, initags, sizeof initags);
-       memcpy(prevtags, initags, sizeof initags);
-
-       for(i = 0; i < nviews; i++) {
-               /* init geometry */
-               v = &views[i];
-
-               if(nviews != 1 && isxinerama) {
-
-#if defined(AIM_XINERAMA)
-v->w = DisplayWidth(dpy, screen) / 2;
-v->x = (i == 0) ? 0 : v->w;
-v->y = 0;
-v->h = DisplayHeight(dpy, screen);
-#else
-                       v->x = info[i].x_org;
-                       v->y = info[i].y_org;
-                       v->w = info[i].width;
-                       v->h = info[i].height;
-#endif
-               }
-               else {
-                       v->x = 0;
-                       v->y = 0;
-                       v->w = DisplayWidth(dpy, screen);
-                       v->h = DisplayHeight(dpy, screen);
-               }
+       wa.override_redirect = 1;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask|ExposureMask;

 
 

-               /* init layouts */
-               v->mwfact = MWFACT;
-               v->layout = &layouts[0];
-
-               // TODO: bpos per screen?
-               bpos = BARPOS;
-               wa.override_redirect = 1;
-               wa.background_pixmap = ParentRelative;
-               wa.event_mask = ButtonPressMask|ExposureMask;
-
-               /* init bars */
-               v->barwin = XCreateWindow(dpy, root, v->x, v->y, v->w, bh, 0,
-                               DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-                               CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-               XDefineCursor(dpy, v->barwin, cursor[CurNormal]);
-               updatebarpos(v);
-               XMapRaised(dpy, v->barwin);
-               strcpy(stext, "dwm-"VERSION);
-
-               /* EWMH support per view */
-               XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-                               PropModeReplace, (unsigned char *) netatom, NetLast);
-
-               /* select for events */
-               wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
-                               |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
-               XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
-               XSelectInput(dpy, root, wa.event_mask);
-
-               drawbar(v);
-       }
-       if(info)
-               XFree(info);
+       barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
+                       CopyFromParent, DefaultVisual(dpy, screen),
+                       CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+       XDefineCursor(dpy, barwin, cursor[CurNormal]);
+       XMapRaised(dpy, barwin);
+       strcpy(stext, "dwm-"VERSION);
+       drawbar();
+
+       /* EWMH support per view */
+       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char *) netatom, NetLast);
+
+       /* select for events */
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+       XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+       XSelectInput(dpy, root, wa.event_mask);

 
 

-       selview = viewat();

 
        /* grab keys */
        grabkeys();
 }
 
 void
 
        /* grab keys */
        grabkeys();
 }
 
 void

-spawn(const char *arg) {
-       static char *shell = NULL;
-
-       if(!shell && !(shell = getenv("SHELL")))
-               shell = "/bin/sh";
-       if(!arg)
-               return;
+spawn(const Arg *arg) {

        /* The double-fork construct avoids zombie processes and keeps the code
         * clean from stupid signal handlers. */
        if(fork() == 0) {
        /* The double-fork construct avoids zombie processes and keeps the code
         * clean from stupid signal handlers. */
        if(fork() == 0) {


@@ -1636,8 +1393,8 @@ spawn(const char *arg) {
                        if(dpy)
                                close(ConnectionNumber(dpy));
                        setsid();
                        if(dpy)
                                close(ConnectionNumber(dpy));
                        setsid();

-                       execl(shell, shell, "-c", arg, (char *)NULL);
-                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+                       execvp(((char **)arg->v)[0], (char **)arg->v);
+                       fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);

                        perror(" failed");
                }
                exit(0);
                        perror(" failed");
                }
                exit(0);


@@ -1646,18 +1403,14 @@ spawn(const char *arg) {
 }
 
 void
 }
 
 void

-tag(const char *arg) {
-       unsigned int i;
-
-       if(!sel)
-               return;
-       for(i = 0; i < LENGTH(tags); i++)
-               sel->tags[i] = (NULL == arg);
-       sel->tags[idxoftag(arg)] = True;
-       arrange();
+tag(const Arg *arg) {
+       if(sel && arg->ui & TAGMASK) {
+               sel->tags = arg->ui & TAGMASK;
+               arrange();
+       }

 }
 
 }
 

-unsigned int
+int

 textnw(const char *text, unsigned int len) {
        XRectangle r;
 
 textnw(const char *text, unsigned int len) {
        XRectangle r;
 


@@ -1668,116 +1421,84 @@ textnw(const char *text, unsigned int len) {
        return XTextWidth(dc.font.xfont, text, len);
 }
 
        return XTextWidth(dc.font.xfont, text, len);
 }
 

-unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
-}
-

 void
 void

-tile(View *v) {
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
-       Client *c, *mc;
-
-       domwfact = dozoom = True;
-       nx = v->wax;
-       ny = v->way;
-       nw = 0;
-       for(n = 0, c = nexttiled(clients, v); c; c = nexttiled(c->next, v))
-               n++;
-
-       /* window geoms */
-       mw = (n == 1) ? v->waw : v->mwfact * v->waw;
-       th = (n > 1) ? v->wah / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = v->wah;
-
-       for(i = 0, c = mc = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
-               if(i == 0) { /* master */
-                       nx = v->wax;
-                       ny = v->way;
-                       nw = mw - 2 * c->border;
-                       nh = v->wah - 2 * c->border;
-               }
-               else {  /* tile window */
-                       if(i == 1) {
-                               ny = v->way;
-                               nx += mc->w + 2 * mc->border;
-                               nw = v->waw - mw - 2 * c->border;
-                       }
-                       if(i + 1 == n) /* remainder */
-                               nh = (v->way + v->wah) - ny - 2 * c->border;
-                       else
-                               nh = th - 2 * c->border;
-               }
-               resize(c, nx, ny, nw, nh, RESIZEHINTS);
-               if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
-                       /* client doesn't accept size constraints */
-                       resize(c, nx, ny, nw, nh, False);
-               if(n > 1 && th != v->wah)
-                       ny = c->y + c->h + 2 * c->border;
-               i++;
+tile(void) {
+       int x, y, h, w, mw;
+       unsigned int i, n;
+       Client *c;
+
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+       if(n == 0)
+               return;
+
+       /* master */
+       c = nexttiled(clients);
+       mw = mfact * ww;
+       resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+
+       if(--n == 0)
+               return;
+
+       /* tile stack */
+       x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
+       y = wy;
+       w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
+       h = wh / n;
+       if(h < bh)
+               h = wh;
+
+       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+               resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+                      ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+               if(h != wh)
+                       y = c->y + c->h + 2 * c->bw;

        }
 }
 
 void
        }
 }
 
 void

-togglebar(const char *arg) {
-       if(bpos == BarOff)
-               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-       else
-               bpos = BarOff;
-       updatebarpos(selview);
+togglebar(const Arg *arg) {
+       showbar = !showbar;
+       updategeom();
+       updatebar();

        arrange();
 }
 
 void
        arrange();
 }
 
 void

-togglefloating(const char *arg) {
+togglefloating(const Arg *arg) {

        if(!sel)
                return;
        if(!sel)
                return;

-       sel->isfloating = !sel->isfloating;
+       sel->isfloating = !sel->isfloating || sel->isfixed;

        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        arrange();
 }
 
 void
        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        arrange();
 }
 
 void

-toggletag(const char *arg) {
-       unsigned int i, j;
+toggletag(const Arg *arg) {
+       unsigned int mask = sel->tags ^ (arg->ui & TAGMASK);

 
 

-       if(!sel)
-               return;
-       i = idxoftag(arg);
-       sel->tags[i] = !sel->tags[i];
-       for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
-       if(j == LENGTH(tags))
-               sel->tags[i] = True; /* at least one tag must be enabled */
-       arrange();
+       if(sel && mask) {
+               sel->tags = mask;
+               arrange();
+       }

 }
 
 void
 }
 
 void

-toggleview(const char *arg) {
-       unsigned int i, j;
+toggleview(const Arg *arg) {
+       unsigned int mask = tagset[seltags] ^ (arg->ui & TAGMASK);

 
 

-       i = idxoftag(arg);
-       seltags[i] = !seltags[i];
-       for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
-       if(j == LENGTH(tags))
-               seltags[i] = True; /* at least one tag must be viewed */
-       arrange();
-}
-
-void
-unban(Client *c) {
-       if(!c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x, c->y);
-       c->isbanned = False;
+       if(mask) {
+               tagset[seltags] = mask;
+               clearurgent();
+               arrange();
+       }

 }
 
 void
 unmanage(Client *c) {
        XWindowChanges wc;
 
 }
 
 void
 unmanage(Client *c) {
        XWindowChanges wc;
 

-       wc.border_width = c->oldborder;
+       wc.border_width = c->oldbw;

        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);


@@ -1788,7 +1509,6 @@ unmanage(Client *c) {
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);

-       free(c->tags);

        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);


@@ -1806,29 +1526,47 @@ unmapnotify(XEvent *e) {
 }
 
 void
 }
 
 void

-updatebarpos(View *v) {
-       XEvent ev;
+updatebar(void) {
+       if(dc.drawable != 0)
+               XFreePixmap(dpy, dc.drawable);
+       dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+       XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
+}
+
+void
+updategeom(void) {
+#ifdef XINERAMA
+       int n, i = 0;
+       XineramaScreenInfo *info = NULL;

 
 

-       v->wax = v->x;
-       v->way = v->y;
-       v->wah = v->h;
-       v->waw = v->w;
-       switch(bpos) {
-       default:
-               v->wah -= bh;
-               v->way += bh;
-               XMoveWindow(dpy, v->barwin, v->x, v->y);
-               break;
-       case BarBot:
-               v->wah -= bh;
-               XMoveWindow(dpy, v->barwin, v->x, v->y + v->wah);
-               break;
-       case BarOff:
-               XMoveWindow(dpy, v->barwin, v->x, v->y - bh);
-               break;
+       /* window area geometry */
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 
+               if(n > 1) {
+                       int di, x, y;
+                       unsigned int dui;
+                       Window dummy;
+                       if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+                               for(i = 0; i < n; i++)
+                                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+                                               break;
+               }
+               wx = info[i].x_org;
+               wy = showbar && topbar ?  info[i].y_org + bh : info[i].y_org;
+               ww = info[i].width;
+               wh = showbar ? info[i].height - bh : info[i].height;
+               XFree(info);

        }
        }

-       XSync(dpy, False);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+       else
+#endif
+       {
+               wx = sx;
+               wy = showbar && topbar ? sy + bh : sy;
+               ww = sw;
+               wh = showbar ? sh - bh : sh;
+       }
+
+       /* bar position */
+       by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;

 }
 
 void
 }
 
 void


@@ -1836,49 +1574,45 @@ updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 

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

                c->basew = size.base_width;
                c->baseh = size.base_height;
        }
                c->basew = size.base_width;
                c->baseh = size.base_height;
        }

-       else if(c->flags & PMinSize) {
+       else if(size.flags & PMinSize) {

                c->basew = size.min_width;
                c->baseh = size.min_height;
        }
        else
                c->basew = c->baseh = 0;
                c->basew = size.min_width;
                c->baseh = size.min_height;
        }
        else
                c->basew = c->baseh = 0;

-       if(c->flags & PResizeInc) {
+       if(size.flags & PResizeInc) {

                c->incw = size.width_inc;
                c->inch = size.height_inc;
        }
        else
                c->incw = c->inch = 0;
                c->incw = size.width_inc;
                c->inch = size.height_inc;
        }
        else
                c->incw = c->inch = 0;

-       if(c->flags & PMaxSize) {
+       if(size.flags & PMaxSize) {

                c->maxw = size.max_width;
                c->maxh = size.max_height;
        }
        else
                c->maxw = c->maxh = 0;
                c->maxw = size.max_width;
                c->maxh = size.max_height;
        }
        else
                c->maxw = c->maxh = 0;

-       if(c->flags & PMinSize) {
+       if(size.flags & PMinSize) {

                c->minw = size.min_width;
                c->minh = size.min_height;
        }
                c->minw = size.min_width;
                c->minh = size.min_height;
        }

-       else if(c->flags & PBaseSize) {
+       else if(size.flags & PBaseSize) {

                c->minw = size.base_width;
                c->minh = size.base_height;
        }
        else
                c->minw = c->minh = 0;
                c->minw = size.base_width;
                c->minh = size.base_height;
        }
        else
                c->minw = c->minh = 0;

-       if(c->flags & PAspect) {
-               c->minax = size.min_aspect.x;
-               c->maxax = size.max_aspect.x;
-               c->minay = size.min_aspect.y;
-               c->maxay = size.max_aspect.y;
+       if(size.flags & PAspect) {
+               c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
+               c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;

        }
        else
        }
        else

-               c->minax = c->maxax = c->minay = c->maxay = 0;
+               c->maxa = c->mina = 0.0;

        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
                        && c->maxw == c->minw && c->maxh == c->minh);
 }
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
                        && c->maxw == c->minw && c->maxh == c->minh);
 }


@@ -1894,49 +1628,25 @@ updatewmhints(Client *c) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {

-               c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
-               XFree(wmh);
-       }
-}
-
-void
-view(const char *arg) {
-       unsigned int i;
-       Bool tmp[LENGTH(tags)];
-
-       for(i = 0; i < LENGTH(tags); i++)
-               tmp[i] = (NULL == arg);
-       tmp[idxoftag(arg)] = True;
-
-       if(memcmp(seltags, tmp, sizeof initags) != 0) {
-               memcpy(prevtags, seltags, sizeof initags);
-               memcpy(seltags, tmp, sizeof initags);
-               arrange();
-       }
-}
-
-View *
-viewat() {
-       int i, x, y;
-       Window win;
-       unsigned int mask;
+               if(ISVISIBLE(c) && wmh->flags & XUrgencyHint) {
+                       wmh->flags &= ~XUrgencyHint;
+                       XSetWMHints(dpy, c->win, wmh);
+               }
+               else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;

 
 

-       XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
-       for(i = 0; i < nviews; i++) {
-               if((x >= views[i].x && x < views[i].x + views[i].w)
-               && (y >= views[i].y && y < views[i].y + views[i].h))
-                       return &views[i];
+               XFree(wmh);

        }
        }

-       return NULL;

 }
 
 void
 }
 
 void

-viewprevtag(const char *arg) {
-       static Bool tmp[LENGTH(tags)];
-
-       memcpy(tmp, seltags, sizeof initags);
-       memcpy(seltags, prevtags, sizeof initags);
-       memcpy(prevtags, tmp, sizeof initags);
+view(const Arg *arg) {
+       if(arg && (arg->ui & TAGMASK) == tagset[seltags])
+               return;
+       seltags ^= 1; /* toggle sel tagset */
+       if(arg && (arg->ui & TAGMASK))
+               tagset[seltags] = arg->ui & TAGMASK;
+       clearurgent();

        arrange();
 }
 
        arrange();
 }
 


@@ -1951,11 +1661,12 @@ xerror(Display *dpy, XErrorEvent *ee) {
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)

+       || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)

        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",

-               ee->request_code, ee->error_code);
+                       ee->request_code, ee->error_code);

        return xerrorxlib(dpy, ee); /* may call exit */
 }
 
        return xerrorxlib(dpy, ee); /* may call exit */
 }
 


@@ -1973,13 +1684,13 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 }
 
 void
 }
 
 void

-zoom(const char *arg) {
+zoom(const Arg *arg) {

        Client *c = sel;
 
        Client *c = sel;
 

-       if(!sel || !dozoom || sel->isfloating)
+       if(!lt[sellt]->arrange || lt[sellt]->arrange == monocle || (sel && sel->isfloating))

                return;
                return;

-       if(c == nexttiled(clients, c->view))
-               if(!(c = nexttiled(c->next, c->view)))
+       if(c == nexttiled(clients))
+               if(!c || !(c = nexttiled(c->next)))

                        return;
        detach(c);
        attach(c);
                        return;
        detach(c);
        attach(c);


@@ -1990,13 +1701,15 @@ zoom(const char *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
        else if(argc != 1)

-               eprint("usage: dwm [-v]\n");
+               die("usage: dwm [-v]\n");
+
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fprintf(stderr, "warning: no locale support\n");

 
 

-       setlocale(LC_CTYPE, "");

        if(!(dpy = XOpenDisplay(0)))
        if(!(dpy = XOpenDisplay(0)))

-               eprint("dwm: cannot open display\n");
+               die("dwm: cannot open display\n");

 
        checkotherwm();
        setup();
 
        checkotherwm();
        setup();