removed useless comment

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index b6659ae..a13f07b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -16,68 +16,92 @@
  * 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.  For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * 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 the config.h
- * file. These arrays are kept static in event.o and tag.o respectively,
- * because no other part of dwm needs access to them.  The current layout is
- * represented by the lt pointer.
+ * Keys and tagging rules are organized as arrays and defined in config.h.

  *
  * To understand everything else, start reading main().
  */
 #include <errno.h>
 #include <locale.h>
  *
  * To understand everything else, start reading main().
  */
 #include <errno.h>
 #include <locale.h>

-#include <regex.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>

+#include <sys/types.h>

 #include <sys/wait.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <sys/wait.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/Xproto.h>
 #include <X11/Xutil.h>

+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif

 
 /* macros */
 
 /* macros */

-#define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
-#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
+#define MAX(a, b)       ((a) > (b) ? (a) : (b))
+#define MIN(a, b)       ((a) < (b) ? (a) : (b))
+#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 TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
+#define ISVISIBLE(x)    (x->tags & tagset[seltags])

 
 /* 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 */

 
 /* typedefs */
 
 /* typedefs */

+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+typedef union {
+       int i;
+       uint ui;
+       float f;
+       void *v;
+} Arg;
+
+typedef struct {
+       uint click;
+       uint mask;
+       uint button;
+       void (*func)(const Arg *arg);
+       const Arg arg;
+} Button;
+

 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 x, y, w, h;

-       int rx, ry, rw, rh; /* revert geometry */

        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;

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

        Client *next;
        Client *next;

-       Client *prev;

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

+       void *aux;
+       void (*freeaux)(void *);

 };
 
 typedef struct {
        int x, y, w, h;
 };
 
 typedef struct {
        int x, y, w, h;

-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];
+       ulong norm[ColLast];
+       ulong sel[ColLast];

        Drawable drawable;
        GC gc;
        struct {
        Drawable drawable;
        GC gc;
        struct {


@@ -90,10 +114,10 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
 } DC; /* draw context */
 
 typedef struct {

-       unsigned long mod;
+       uint mod;

        KeySym keysym;
        KeySym keysym;

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

 } Key;
 
 typedef struct {
 } Key;
 
 typedef struct {


@@ -102,26 +126,21 @@ typedef struct {
 } Layout;
 
 typedef struct {
 } Layout;
 
 typedef struct {

-       const char *prop;
-       const char *tags;
+       const char *class;
+       const char *instance;
+       const char *title;
+       uint tags;

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

-typedef struct {
-       regex_t *propregex;
-       regex_t *tagregex;
-} Regs;
-
-/* functions */
-
+/* function declarations */

 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);

-static void ban(Client *c);

 static void buttonpress(XEvent *e);
 static void buttonpress(XEvent *e);

+static void checkotherwm(void);

 static void cleanup(void);
 static void cleanup(void);

-static void compileregs(void);

 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);


@@ -129,90 +148,79 @@ static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void drawbar(void);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void drawbar(void);

-static void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-static void *emallocz(unsigned int size);
+static void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+static void drawtext(const char *text, ulong col[ColLast], Bool invert);

 static void enternotify(XEvent *e);
 static void eprint(const char *errstr, ...);
 static void expose(XEvent *e);
 static void enternotify(XEvent *e);
 static void eprint(const char *errstr, ...);
 static void expose(XEvent *e);

-static void floating(void); /* default floating layout */

 static void focus(Client *c);
 static void focus(Client *c);

-static void focusnext(const char *arg);
-static void focusprev(const char *arg);
+static void focusin(XEvent *e);
+static void focusstack(const Arg *arg);

 static Client *getclient(Window w);
 static Client *getclient(Window w);

+static ulong getcolor(const char *colstr);

 static long getstate(Window w);
 static long getstate(Window w);

-static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+static Bool gettextprop(Window w, Atom atom, char *text, uint size);

 static void grabbuttons(Client *c, Bool focused);
 static void grabbuttons(Client *c, Bool focused);

-static unsigned int idxoftag(const char *tag);
-static void initbar(void);
-static unsigned long initcolor(const char *colstr);
+static void grabkeys(void);

 static void initfont(const char *fontstr);
 static void initfont(const char *fontstr);

-static void initlayouts(void);
-static void initstyle(void);
-static Bool isarrange(void (*func)());
-static Bool isfloating(void);
-static Bool isoccupied(unsigned int t);
+static Bool isoccupied(uint t);

 static Bool isprotodel(Client *c);
 static Bool isprotodel(Client *c);

-static Bool isvisible(Client *c);
+static Bool isurgent(uint t);

 static void keypress(XEvent *e);
 static void keypress(XEvent *e);

-static void killclient(const char *arg);
-static void leavenotify(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 manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);

-static void movemouse(Client *c);
+static void monocle(void);
+static void movemouse(const Arg *arg);

 static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);
 static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);

-static void quit(const char *arg);
+static void quit(const Arg *arg);

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

-static void resizemouse(Client *c);
+static void resizemouse(const Arg *arg);

 static void restack(void);
 static void restack(void);

+static void run(void);

 static void scan(void);
 static void setclientstate(Client *c, long state);
 static void scan(void);
 static void setclientstate(Client *c, long state);

-static void setlayout(const char *arg);
-static void setmwfact(const char *arg);
+static void setlayout(const Arg *arg);
+static void setmfact(const Arg *arg);

 static void setup(void);
 static void setup(void);

-static void spawn(const char *arg);
-static void tag(const char *arg);
-static unsigned int textnw(const char *text, unsigned int len);
-static unsigned int textw(const char *text);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, uint len);

 static void tile(void);
 static void tile(void);

-static void togglebar(const char *arg);
-static void togglefloating(const char *arg);
-static void togglemax(const char *arg);
-static void toggletag(const char *arg);
-static void toggleview(const char *arg);
-static void unban(Client *c);
+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 unmanage(Client *c);
 static void unmapnotify(XEvent *e);

-static void updatebarpos(void);
+static void updatebar(void);
+static void updategeom(void);

 static void updatesizehints(Client *c);
 static void updatetitle(Client *c);
 static void updatesizehints(Client *c);
 static void updatetitle(Client *c);

-static void view(const char *arg);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);

 static int xerror(Display *dpy, XErrorEvent *ee);
 static int xerror(Display *dpy, XErrorEvent *ee);

-static int xerrordummy(Display *dsply, XErrorEvent *ee);
-static int xerrorstart(Display *dsply, XErrorEvent *ee);
-static void zoom(const char *arg);
+static int xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);

 
 /* variables */
 static char stext[256];
 
 /* variables */
 static char stext[256];

-static double mwfact;
-static int screen, sx, sy, sw, sh, wax, way, waw, wah;
+static int screen, sx, sy, sw, sh;
+static int by, bh, blw, wx, wy, ww, wh;
+static uint seltags = 0, sellt = 0;

 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static int (*xerrorxlib)(Display *, XErrorEvent *);

-static unsigned int bh, bpos, ntags;
-static unsigned int blw = 0;
-static unsigned int ltidx = 0; /* default */
-static unsigned int nlayouts = 0;
-static unsigned int nrules = 0;
-static unsigned int numlockmask = 0;
+static uint numlockmask = 0;

 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,

-       [LeaveNotify] = leavenotify,

        [Expose] = expose,
        [Expose] = expose,

+       [FocusIn] = focusin,

        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,


@@ -222,144 +230,137 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 static Atom wmatom[WMLast], netatom[NetLast];
 static Bool otherwm, readin;
 static Bool running = True;
 static Atom wmatom[WMLast], netatom[NetLast];
 static Bool otherwm, readin;
 static Bool running = True;

-static Bool *seltags;
-static Bool selscreen = True;
+static uint 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 Client *clients = NULL;
 static Client *sel = NULL;
 static Client *stack = NULL;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc = {0};

-static Window barwin, root;
-static Regs *regs = NULL;
-
+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"
 

-/* implementation */
-static void
+/* compile-time check if all tags fit into an uint bit array. */
+struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
+
+/* function implementations */
+void

 applyrules(Client *c) {
 applyrules(Client *c) {

-       static char buf[512];
-       unsigned int i, j;
-       regmatch_t tmp;
-       Bool matched = False;
+       uint i;
+       Rule *r;

        XClassHint ch = { 0 };
 
        /* rule matching */
        XGetClassHint(dpy, c->win, &ch);
        XClassHint ch = { 0 };
 
        /* rule matching */
        XGetClassHint(dpy, c->win, &ch);

-       snprintf(buf, sizeof buf, "%s:%s:%s",
-                       ch.res_class ? ch.res_class : "",
-                       ch.res_name ? ch.res_name : "", c->name);
-       for(i = 0; i < nrules; i++)
-               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
-                       c->isfloating = rules[i].isfloating;
-                       for(j = 0; regs[i].tagregex && j < ntags; j++) {
-                               if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
-                                       matched = True;
-                                       c->tags[j] = True;
-                               }
-                       }
+       for(i = 0; i < LENGTH(rules); i++) {
+               r = &rules[i];
+               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->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)
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = seltags[i];
+       if(!c->tags)
+               c->tags = tagset[seltags];

 }
 
 }
 

-static void
+void

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

-               if(isvisible(c))
-                       unban(c);
-               else
-                       ban(c);
-       layouts[ltidx].arrange();
+               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);
+               }
+

        focus(NULL);
        focus(NULL);

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

        restack();
 }
 
        restack();
 }
 

-static void
+void

 attach(Client *c) {
 attach(Client *c) {

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

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

-static void
+void

 attachstack(Client *c) {
        c->snext = stack;
        stack = c;
 }
 
 attachstack(Client *c) {
        c->snext = stack;
        stack = c;
 }
 

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

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

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

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

-       if(barwin == ev->window) {
-               x = 0;
-               for(i = 0; i < ntags; i++) {
-                       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 && (isfloating() || c->isfloating)) {
-                       restack();
-                       movemouse(c);
-               }
-               else if(ev->button == Button2)
-                       zoom(NULL);
-               else if(ev->button == Button3
-               && (isfloating() || c->isfloating) && !c->isfixed)
-               {
-                       restack();
-                       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);

 }
 
 }
 

-static void
+void
+checkotherwm(void) {
+       otherwm = False;
+       XSetErrorHandler(xerrorstart);
+
+       /* this causes an error if some other window manager is running */
+       XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
+       XSync(dpy, False);
+       if(otherwm)
+               eprint("dwm: another window manager is already running\n");
+       XSetErrorHandler(NULL);
+       xerrorxlib = XSetErrorHandler(xerror);
+       XSync(dpy, False);
+}
+
+void

 cleanup(void) {
 cleanup(void) {

+       Arg a = {.i = ~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
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        else


@@ -367,43 +368,15 @@ cleanup(void) {
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);

-       XDestroyWindow(dpy, barwin);

        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);

-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       XDestroyWindow(dpy, barwin);

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

-       free(seltags);
-}
-
-static void
-compileregs(void) {
-       unsigned int i;
-       regex_t *reg;
-
-       if(regs)
-               return;
-       nrules = sizeof rules / sizeof rules[0];
-       regs = emallocz(nrules * sizeof(Regs));
-       for(i = 0; i < nrules; i++) {
-               if(rules[i].prop) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regs[i].propregex = reg;
-               }
-               if(rules[i].tags) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regs[i].tagregex = reg;
-               }
-       }
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

 }
 
 }
 

-static void
+void

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


@@ -415,54 +388,50 @@ 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);
 }
 

-static void
+void

 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 

-       if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+       if(ev->window == root && (ev->width != sw || ev->height != sh)) {

                sw = ev->width;
                sh = ev->height;
                sw = ev->width;
                sh = ev->height;

-               XFreePixmap(dpy, dc.drawable);
-               dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-               XResizeWindow(dpy, barwin, sw, bh);
-               updatebarpos();
+               updategeom();
+               updatebar();

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

-static void
+void

 configurerequest(XEvent *e) {
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
 configurerequest(XEvent *e) {
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {

-               c->ismax = False;

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

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

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

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

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

-                               c->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 + c->w) > sw && c->isfloating)
-                               c->x = sw / 2 - c->w / 2; /* center in x direction */
-                       if((c->y + c->h) > sh && c->isfloating)
-                               c->y = sh / 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


@@ -481,7 +450,7 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

-static void
+void

 destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;


@@ -490,72 +459,79 @@ destroynotify(XEvent *e) {
                unmanage(c);
 }
 
                unmanage(c);
 }
 

-static void
+void

 detach(Client *c) {
 detach(Client *c) {

-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
+       Client *i;
+
+       if (c != clients) {
+               for(i = clients; i->next != c; i = i->next);
+               i->next = c->next;
+       }
+       else {

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

-       c->next = c->prev = NULL;
+       }
+       c->next =  NULL;

 }
 
 }
 

-static void
+void

 detachstack(Client *c) {
        Client **tc;
 
 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;
 }
 
        *tc = c->snext;
 }
 

-static void
+void

 drawbar(void) {
        int i, x;
 
 drawbar(void) {
        int i, x;
 

-       dc.x = dc.y = 0;
-       for(i = 0; i < ntags; i++) {
-               dc.w = textw(tags[i]);
-               if(seltags[i]) {
-                       drawtext(tags[i], dc.sel);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
+       dc.x = 0;
+       for(i = 0; i < LENGTH(tags); i++) {
+               dc.w = TEXTW(tags[i]);
+               if(tagset[seltags] & 1 << i) {
+                       drawtext(tags[i], dc.sel, isurgent(i));
+                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);

                }
                else {
                }
                else {

-                       drawtext(tags[i], dc.norm);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+                       drawtext(tags[i], dc.norm, isurgent(i));
+                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);

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

-       dc.w = blw;
-       drawtext(layouts[ltidx].symbol, dc.norm);
-       x = dc.x + dc.w;
-       dc.w = textw(stext);
-       dc.x = sw - dc.w;
+       if(blw > 0) {
+               dc.w = blw;
+               drawtext(lt[sellt]->symbol, dc.norm, False);
+               x = dc.x + dc.w;
+       }
+       else
+               x = dc.x;
+       dc.w = TEXTW(stext);
+       dc.x = ww - dc.w;

        if(dc.x < x) {
                dc.x = x;
        if(dc.x < x) {
                dc.x = x;

-               dc.w = sw - x;
+               dc.w = ww - x;

        }
        }

-       drawtext(stext, dc.norm);
+       drawtext(stext, dc.norm, False);

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

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

                }
                else
                }
                else

-                       drawtext(NULL, dc.norm);
+                       drawtext(NULL, dc.norm, False);

        }
        }

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

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

-static void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+void
+drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {

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

-       gcv.foreground = col[ColFG];
+       gcv.foreground = col[invert ? ColBG : ColFG];

        XChangeGC(dpy, dc.gc, GCForeground, &gcv);
        x = (dc.font.ascent + dc.font.descent + 2) / 4;
        r.x = dc.x + 1;
        XChangeGC(dpy, dc.gc, GCForeground, &gcv);
        x = (dc.font.ascent + dc.font.descent + 2) / 4;
        r.x = dc.x + 1;


@@ -570,71 +546,49 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
        }
 }
 
        }
 }
 

-static void
-drawtext(const char *text, unsigned long col[ColLast]) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
+void
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
+       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[ColBG]);
+       XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
        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 */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
+       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);
        else
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
        if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        else
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 

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

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

-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+       if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)

                return;
        if((c = getclient(ev->window)))
                focus(c);
                return;
        if((c = getclient(ev->window)))
                focus(c);

-       else if(ev->window == root) {
-               selscreen = True;
+       else

                focus(NULL);
                focus(NULL);

-       }

 }
 
 }
 

-static void
+void

 eprint(const char *errstr, ...) {
        va_list ap;
 
 eprint(const char *errstr, ...) {
        va_list ap;
 


@@ -644,29 +598,18 @@ eprint(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 

-static void
+void

 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 

-       if(ev->count == 0) {
-               if(barwin == ev->window)
-                       drawbar();
-       }
-}
-
-static void
-floating(void) { /* default floating layout */
-       Client *c;
-
-       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();

 }
 
 }
 

-static void
+void

 focus(Client *c) {
 focus(Client *c) {

-       if((!c && selscreen) || (c && !isvisible(c)))
-               for(c = stack; c && !isvisible(c); 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]);


@@ -675,44 +618,42 @@ focus(Client *c) {
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);

-       }
-       sel = c;
-       drawbar();
-       if(!selscreen)
-               return;
-       if(c) {

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

+       sel = c;
+       drawbar();

 }
 
 }
 

-static void
-focusnext(const char *arg) {
-       Client *c;
+void
+focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+       XFocusChangeEvent *ev = &e->xfocus;

 
 

-       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();
-       }
+       if(sel && ev->window != sel->win)
+               XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);

 }
 
 }
 

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

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

-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
-       if(!c) {
-               for(c = clients; c && c->next; c = c->next);
-               for(; c && !isvisible(c); c = c->prev);
+       if (arg->i > 0) {
+               for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
+               if(!c)
+                       for(c = clients; c && !ISVISIBLE(c); c = c->next);
+       }
+       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);


@@ -720,7 +661,7 @@ focusprev(const char *arg) {
        }
 }
 
        }
 }
 

-static Client *
+Client *

 getclient(Window w) {
        Client *c;
 
 getclient(Window w) {
        Client *c;
 


@@ -728,12 +669,22 @@ getclient(Window w) {
        return c;
 }
 
        return c;
 }
 

-static long
+ulong
+getcolor(const char *colstr) {
+       Colormap cmap = DefaultColormap(dpy, screen);
+       XColor color;
+
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);
+       return color.pixel;
+}
+
+long

 getstate(Window w) {
        int format, status;
        long result = -1;
        unsigned char *p = NULL;
 getstate(Window w) {
        int format, status;
        long result = -1;
        unsigned char *p = NULL;

-       unsigned long n, extra;
+       ulong n, extra;

        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],


@@ -746,8 +697,8 @@ getstate(Window w) {
        return result;
 }
 
        return result;
 }
 

-static Bool
-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+Bool
+gettextprop(Window w, Atom atom, char *text, uint size) {

        char **list = NULL;
        int n;
        XTextProperty name;
        char **list = NULL;
        int n;
        XTextProperty name;


@@ -762,8 +713,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
                strncpy(text, (char *)name.value, size - 1);
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                strncpy(text, (char *)name.value, size - 1);
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success

-               && n > 0 && *list)
-               {
+               && n > 0 && *list) {

                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }
                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }


@@ -773,85 +723,52 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
        return True;
 }
 
        return True;
 }
 

-static void
+void

 grabbuttons(Client *c, Bool focused) {
 grabbuttons(Client *c, Bool focused) {

-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       uint i, j;
+       uint 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);
-}
-
-static unsigned int
-idxoftag(const char *tag) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(tags[i] == tag)
-                       return i;
-       return 0;
-}
-
-static void
-initbar(void) {
-       XSetWindowAttributes wa;
-
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask | ExposureMask;
-       barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       updatebarpos();
-       XMapRaised(dpy, barwin);
-       strcpy(stext, "dwm-"VERSION);
-       dc.drawable = XCreatePixmap(dpy, root, sw, 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(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
+grabkeys(void) {
+       uint i, j;
+       KeyCode code;
+       XModifierKeymap *modmap;

 
 

-static unsigned long
-initcolor(const char *colstr) {
-       Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color;
+       /* init modifier map */
+       modmap = XGetModifierMapping(dpy);
+       for(i = 0; i < 8; i++)
+               for(j = 0; j < modmap->max_keypermod; j++) {
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+               }
+       XFreeModifiermap(modmap);

 
 

-       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-               eprint("error, cannot allocate color '%s'\n", colstr);
-       return color.pixel;
+       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);
+       }

 }
 
 }
 

-static void
+void

 initfont(const char *fontstr) {
        char *def, **missing;
        int i, n;
 initfont(const char *fontstr) {
        char *def, **missing;
        int i, n;


@@ -873,10 +790,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++;
                }
        }


@@ -885,7 +800,7 @@ initfont(const char *fontstr) {
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))

-               || !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))

                        eprint("error, cannot load font: '%s'\n", fontstr);
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
                        eprint("error, cannot load font: '%s'\n", fontstr);
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;


@@ -893,52 +808,17 @@ initfont(const char *fontstr) {
        dc.font.height = dc.font.ascent + dc.font.descent;
 }
 
        dc.font.height = dc.font.ascent + dc.font.descent;
 }
 

-static void
-initlayouts(void) {
-       unsigned int i, w;
-
-       nlayouts = sizeof layouts / sizeof layouts[0];
-       for(blw = i = 0; i < nlayouts; i++) {
-               w = textw(layouts[i].symbol);
-               if(w > blw)
-                       blw = w;
-       }
-}
-
-static void
-initstyle(void) {
-       dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
-       dc.norm[ColBG] = initcolor(NORMBGCOLOR);
-       dc.norm[ColFG] = initcolor(NORMFGCOLOR);
-       dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
-       dc.sel[ColBG] = initcolor(SELBGCOLOR);
-       dc.sel[ColFG] = initcolor(SELFGCOLOR);
-       initfont(FONT);
-       dc.h = bh = dc.font.height + 2;
-}
-
-static Bool
-isarrange(void (*func)())
-{
-       return func == layouts[ltidx].arrange;
-}
-
-static Bool
-isfloating(void) {
-       return layouts[ltidx].arrange == floating;
-}
-
-static Bool
-isoccupied(unsigned int t) {
+Bool
+isoccupied(uint t) {

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

-               if(c->tags[t])
+               if(c->tags & 1 << t)

                        return True;
        return False;
 }
 
                        return True;
        return False;
 }
 

-static Bool
+Bool

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


@@ -953,53 +833,33 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

-static Bool
-isvisible(Client *c) {
-       unsigned int i;
+Bool
+isurgent(uint t) {
+       Client *c;

 
 

-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltags[i])
+       for(c = clients; c; c = c->next)
+               if(c->isurgent && c->tags & 1 << t)

                        return True;
        return False;
 }
 
                        return True;
        return False;
 }
 

-static void
+void

 keypress(XEvent *e) {
 keypress(XEvent *e) {

-       KEYS
-       unsigned int len = sizeof keys / sizeof keys[0];
-       unsigned int i;
-       KeyCode code;
+       uint i;

        KeySym keysym;
        XKeyEvent *ev;
 
        KeySym keysym;
        XKeyEvent *ev;
 

-       if(!e) { /* grabkeys */
-               XUngrabKey(dpy, AnyKey, AnyModifier, root);
-               for(i = 0; i < len; 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);
-               }
-               return;
-       }

        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < len; i++)
+       for(i = 0; i < LENGTH(keys); i++)

                if(keysym == keys[i].keysym
                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));

 }
 
 }
 

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

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


@@ -1017,84 +877,75 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

-static void
-leavenotify(XEvent *e) {
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen) {
-               selscreen = False;
-               focus(NULL);
-       }
-}
-
-static void
+void

 manage(Window w, XWindowAttributes *wa) {
 manage(Window w, XWindowAttributes *wa) {

-       unsigned int i;

        Client *c, *t = NULL;
        Client *c, *t = NULL;

-       Window trans;

        Status rettrans;
        Status rettrans;

+       Window trans;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

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

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

+
+       /* geometry */

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

-       c->oldborder = wa->border_width;
+       c->oldbw = wa->border_width;

        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;

-               c->border = wa->border_width;
+               c->bw = wa->border_width;

        }
        else {
        }
        else {

-               if(c->x + c->w + 2 * c->border > wax + waw)
-                       c->x = wax + waw - c->w - 2 * c->border;
-               if(c->y + c->h + 2 * c->border > way + wah)
-                       c->y = way + wah - c->h - 2 * c->border;
-               if(c->x < wax)
-                       c->x = wax;
-               if(c->y < way)
-                       c->y = way;
-               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 */
        updatesizehints(c);
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);

-       XSelectInput(dpy, w,
-               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       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(t)
        grabbuttons(c, False);
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        if(t)

-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = t->tags[i];
-       applyrules(c);
+               c->tags = t->tags;
+       else
+               applyrules(c);

        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || 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();
 }
 

-static void
+void

 mappingnotify(XEvent *e) {
        XMappingEvent *ev = &e->xmapping;
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)
 mappingnotify(XEvent *e) {
        XMappingEvent *ev = &e->xmapping;
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)

-               keypress(NULL);
+               grabkeys();

 }
 
 }
 

-static void
+void

 maprequest(XEvent *e) {
        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;
 maprequest(XEvent *e) {
        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;


@@ -1107,22 +958,33 @@ maprequest(XEvent *e) {
                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 

-static void
-movemouse(Client *c) {
+void
+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 x1, y1, ocx, ocy, di, nx, ny;
        int x1, y1, ocx, ocy, di, nx, ny;

-       unsigned int dui;
+       uint dui;
+       Client *c;

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

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

        ocx = nx = c->x;
        ocy = ny = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        ocx = nx = c->x;
        ocy = ny = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

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

                return;
                return;

-       c->ismax = False;

        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {

-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);

                switch (ev.type) {
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
                switch (ev.type) {
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);


@@ -1136,27 +998,33 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);

-                       if(abs(wax + nx) < SNAP)
-                               nx = wax;
-                       else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
-                               nx = wax + waw - c->w - 2 * c->border;
-                       if(abs(way - ny) < SNAP)
-                               ny = way;
-                       else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
-                               ny = way + wah - c->h - 2 * c->border;
-                       resize(c, nx, ny, c->w, c->h, False);
+                       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;
                }
        }
 }
 
                        break;
                }
        }
 }
 

-static Client *
+Client *

 nexttiled(Client *c) {
 nexttiled(Client *c) {

-       for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+       for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 

-static void
+void

 propertynotify(XEvent *e) {
        Client *c;
        Window trans;
 propertynotify(XEvent *e) {
        Client *c;
        Window trans;


@@ -1166,15 +1034,19 @@ propertynotify(XEvent *e) {
                return; /* ignore */
        if((c = getclient(ev->window))) {
                switch (ev->atom) {
                return; /* ignore */
        if((c = getclient(ev->window))) {
                switch (ev->atom) {

-                       default: break;
-                       case XA_WM_TRANSIENT_FOR:
-                               XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-                                       arrange();
-                               break;
-                       case XA_WM_NORMAL_HINTS:
-                               updatesizehints(c);
-                               break;
+               default: break;
+               case XA_WM_TRANSIENT_FOR:
+                       XGetTransientForHint(dpy, c->win, &trans);
+                       if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+                               arrange();
+                       break;
+               case XA_WM_NORMAL_HINTS:
+                       updatesizehints(c);
+                       break;
+               case XA_WM_HINTS:
+                       updatewmhints(c);
+                       drawbar();
+                       break;

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


@@ -1184,93 +1056,100 @@ propertynotify(XEvent *e) {
        }
 }
 
        }
 }
 

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

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

-static void
+void

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

-       double dx, dy, max, min, ratio;
-       XWindowChanges wc; 
+       XWindowChanges wc;

 
        if(sizehints) {
 
        if(sizehints) {

-               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
-                       dx = (double)(w - c->basew);
-                       dy = (double)(h - c->baseh);
-                       min = (double)(c->minax) / (double)(c->minay);
-                       max = (double)(c->maxax) / (double)(c->maxay);
-                       ratio = dx / dy;
-                       if(max > 0 && min > 0 && ratio > 0) {
-                               if(ratio < min) {
-                                       dy = (dx * min + dy) / (min * min + 1);
-                                       dx = dy * min;
-                                       w = (int)dx + c->basew;
-                                       h = (int)dy + c->baseh;
-                               }
-                               else if(ratio > max) {
-                                       dy = (dx * min + dy) / (max * max + 1);
-                                       dx = dy * min;
-                                       w = (int)dx + c->basew;
-                                       h = (int)dy + c->baseh;
-                               }
-                       }
+               /* set minimum possible */
+               w = MAX(1, w);
+               h = MAX(1, h);
+
+               /* temporarily remove base dimensions */
+               w -= c->basew;
+               h -= c->baseh;
+
+               /* adjust for aspect limits */
+               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;

                }
                }

-               if(c->minw && w < c->minw)
-                       w = c->minw;
-               if(c->minh && h < c->minh)
-                       h = c->minh;
-               if(c->maxw && w > c->maxw)
-                       w = c->maxw;
-               if(c->maxh && h > c->maxh)
-                       h = c->maxh;
+
+               /* adjust for increment value */

                if(c->incw)
                if(c->incw)

-                       w -= (w - c->basew) % c->incw;
+                       w -= w % c->incw;

                if(c->inch)
                if(c->inch)

-                       h -= (h - c->baseh) % c->inch;
+                       h -= h % c->inch;
+
+               /* restore base dimensions */
+               w += c->basew;
+               h += c->baseh;
+
+               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;

-       /* offscreen appearance fixes */
-       if(x > sw)
-               x = sw - w - 2 * c->border;
-       if(y > sh)
-               y = sh - h - 2 * c->border;
-       if(x + w + 2 * c->border < sx)
+       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;
                x = sx;

-       if(y + h + 2 * c->border < sy)
+       if(y + h + 2 * c->bw < sy)

                y = 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;
-               XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+               wc.border_width = c->bw;
+               XConfigureWindow(dpy, c->win,
+                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);

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

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

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

+       Client *c;

        XEvent ev;
 
        XEvent ev;
 

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

        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

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

                return;
                return;

-       c->ismax = False;
-       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(;;) {
        for(;;) {

-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);

                switch(ev.type) {
                case ButtonRelease:
                        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
                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;


@@ -1281,17 +1160,23 @@ 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;
-                       resize(c, c->x, c->y, nw, nh, True);
+                       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;
                }
        }
 }
 
                        break;
                }
        }
 }
 

-static void
+void

 restack(void) {
        Client *c;
        XEvent ev;
 restack(void) {
        Client *c;
        XEvent ev;


@@ -1300,29 +1185,84 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
        drawbar();
        if(!sel)
                return;

-       if(sel->isfloating || isfloating())
+       if(sel->isfloating || !lt[sellt]->arrange)

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

-       if(!isfloating()) {
+       if(lt[sellt]->arrange) {

                wc.stack_mode = Below;
                wc.sibling = barwin;
                wc.stack_mode = Below;
                wc.sibling = barwin;

-               if(!sel->isfloating) {
-                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
-                       wc.sibling = sel->win;
-               }
-               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-                       if(c == sel)
-                               continue;
-                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-                       wc.sibling = c->win;
-               }
+               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));
 }
 

-static void
+void
+run(void) {
+       char *p;
+       char sbuf[sizeof stext];
+       fd_set rd;
+       int r, xfd;
+       uint len, offset;
+       XEvent ev;
+
+       /* 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 */
+       while(running) {
+               FD_ZERO(&rd);
+               if(readin)
+                       FD_SET(STDIN_FILENO, &rd);
+               FD_SET(xfd, &rd);
+               if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+                       if(errno == EINTR)
+                               continue;
+                       eprint("select failed\n");
+               }
+               if(FD_ISSET(STDIN_FILENO, &rd)) {
+                       switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
+                       case -1:
+                               strncpy(stext, strerror(errno), len);
+                               readin = False;
+                               break;
+                       case 0:
+                               strncpy(stext, "EOF", 4);
+                               readin = False;
+                               break;
+                       default:
+                               for(p = sbuf + offset; r > 0; p++, r--, offset++)
+                                       if(*p == '\n' || *p == '\0') {
+                                               *p = '\0';
+                                               strncpy(stext, sbuf, len);
+                                               p += r - 1; /* p is sbuf + offset + r - 1 */
+                                               for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+                                               offset = r;
+                                               if(r)
+                                                       memmove(sbuf, p - r + 1, r);
+                                               break;
+                                       }
+                               break;
+                       }
+                       drawbar();
+               }
+               while(XPending(dpy)) {
+                       XNextEvent(dpy, &ev);
+                       if(handler[ev.type])
+                               (handler[ev.type])(&ev); /* call handler */
+               }
+       }
+}
+
+void

 scan(void) {
 scan(void) {

-       unsigned int i, num;
+       uint i, num;

        Window *wins, d1, d2;
        XWindowAttributes wa;
 
        Window *wins, d1, d2;
        XWindowAttributes wa;
 


@@ -1347,7 +1287,7 @@ scan(void) {
                XFree(wins);
 }
 
                XFree(wins);
 }
 

-static void
+void

 setclientstate(Client *c, long state) {
        long data[] = {state, None};
 
 setclientstate(Client *c, long state) {
        long data[] = {state, None};
 


@@ -1355,58 +1295,51 @@ setclientstate(Client *c, long state) {
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
                        PropModeReplace, (unsigned char *)data, 2);
 }
 

-static void
-setlayout(const char *arg) {
-       unsigned int i;
-
-       if(!arg) {
-               if(++ltidx == nlayouts)
-                       ltidx = 0;;
-       }
-       else {
-               for(i = 0; i < nlayouts; i++)
-                       if(!strcmp(arg, layouts[i].symbol))
-                               break;
-               if(i == nlayouts)
-                       return;
-               ltidx = i;
-       }
+void
+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
                drawbar();
 }
 
        if(sel)
                arrange();
        else
                drawbar();
 }
 

-static void
-setmwfact(const char *arg) {
-       double delta;
+/* arg > 1.0 will set mfact absolutly */
+void
+setmfact(const Arg *arg) {
+       float f;

 
 

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

                return;
                return;

-       /* arg handling, manipulate mwfact */
-       if(arg == NULL)
-               mwfact = MWFACT;
-       else if(1 == sscanf(arg, "%lf", &delta)) {
-               if(arg[0] != '+' && arg[0] != '-')
-                       mwfact = delta;
-               else
-                       mwfact += delta;
-               if(mwfact < 0.1)
-                       mwfact = 0.1;
-               else if(mwfact > 0.9)
-                       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();
 }
 
        arrange();
 }
 

-static void
+void

 setup(void) {
 setup(void) {

-       int i, j;
-       unsigned int mask;
-       Window w;
-       XModifierKeymap *modmap;
+       uint i;
+       int w;

        XSetWindowAttributes wa;
 
        XSetWindowAttributes wa;
 

+       /* 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);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);


@@ -1414,51 +1347,60 @@ setup(void) {
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);

-       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-                       PropModeReplace, (unsigned char *) netatom, NetLast);
+

        /* init cursors */
        /* init cursors */

-       cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
+       wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);

        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);

-       /* init modifier map */
-       modmap = XGetModifierMapping(dpy);
-       for (i = 0; i < 8; i++)
-               for (j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
-                                       == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               numlockmask = (1 << i);
-               }
-       XFreeModifiermap(modmap);
+
+       /* 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);
+       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);
+
+       /* init bar */
+       for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+               w = TEXTW(layouts[i].symbol);
+               blw = MAX(blw, w);
+       }
+
+       wa.override_redirect = 1;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask|ExposureMask;
+
+       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 */
        /* select for events */

-       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-               | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
-       wa.cursor = cursor[CurNormal];
-       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+       XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);

        XSelectInput(dpy, root, wa.event_mask);
        XSelectInput(dpy, root, wa.event_mask);

-       keypress(NULL); /* grabkeys */
-       compileregs();
-       for(ntags = 0; tags[ntags]; ntags++);
-       seltags = emallocz(sizeof(Bool) * ntags);
-       seltags[0] = True;
-       /* geometry */
-       sx = sy = 0;
-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-       initstyle();
-       initlayouts();
-       initbar();
-       /* multihead support */
-       selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
-}

 
 

-static void
-spawn(const char *arg) {
-       static char *shell = NULL;

 
 

-       if(!shell && !(shell = getenv("SHELL")))
-               shell = "/bin/sh";
-       if(!arg)
-               return;
+       /* grab keys */
+       grabkeys();
+}
+
+void
+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) {


@@ -1466,8 +1408,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);


@@ -1475,22 +1417,16 @@ spawn(const char *arg) {
        wait(0);
 }
 
        wait(0);
 }
 

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

 }
 
 }
 

-static unsigned int
-textnw(const char *text, unsigned int len) {
+int
+textnw(const char *text, uint len) {

        XRectangle r;
 
        if(dc.font.set) {
        XRectangle r;
 
        if(dc.font.set) {


@@ -1500,128 +1436,83 @@ textnw(const char *text, unsigned int len) {
        return XTextWidth(dc.font.xfont, text, len);
 }
 
        return XTextWidth(dc.font.xfont, text, len);
 }
 

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

 tile(void) {
 tile(void) {

-       unsigned int i, n, nx, ny, nw, nh, mw, th;
+       int x, y, h, w, mw;
+       uint i, n;

        Client *c;
 
        Client *c;
 

-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       /* window geoms */
-       mw = (n == 1) ? waw : mwfact * waw;
-       th = (n > 1) ? wah / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = wah;
-
-       nx = wax;
-       ny = way;
-       for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
-               c->ismax = False;
-               if(i == 0) { /* master */
-                       nw = mw - 2 * c->border;
-                       nh = wah - 2 * c->border;
-               }
-               else {  /* tile window */
-                       if(i == 1) {
-                               ny = way;
-                               nx += mw;
-                       }
-                       nw = waw - mw - 2 * c->border;
-                       if(i + 1 == n) /* remainder */
-                               nh = (way + wah) - ny - 2 * c->border;
-                       else
-                               nh = th - 2 * c->border;
-               }
-               resize(c, nx, ny, nw, nh, RESIZEHINTS);
-               if(n > 1 && th != wah)
-                       ny += nh + 2 * c->border;
+       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;

        }
 }
 
        }
 }
 

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

        arrange();
 }
 
        arrange();
 }
 

-static void
-togglefloating(const char *arg) {
+void
+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();
 }
 
        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        arrange();
 }
 

-static void
-togglemax(const char *arg) {
-       XEvent ev;
+void
+toggletag(const Arg *arg) {
+       uint mask = sel->tags ^ (arg->ui & TAGMASK);

 
 

-       if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)
-               return;
-       if((sel->ismax = !sel->ismax)) {
-               sel->rx = sel->x;
-               sel->ry = sel->y;
-               sel->rw = sel->w;
-               sel->rh = sel->h;
-               resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
+       if(sel && mask) {
+               sel->tags = mask;
+               arrange();

        }
        }

-       else
-               resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-       drawbar();
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 }
 

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

 
 

-       if(!sel)
-               return;
-       i = idxoftag(arg);
-       sel->tags[i] = !sel->tags[i];
-       for(j = 0; j < ntags && !sel->tags[j]; j++);
-       if(j == ntags)
-               sel->tags[i] = True;
-       arrange();
-}
-
-static void
-toggleview(const char *arg) {
-       unsigned int i, j;
-
-       i = idxoftag(arg);
-       seltags[i] = !seltags[i];
-       for(j = 0; j < ntags && !seltags[j]; j++);
-       if(j == ntags)
-               seltags[i] = True; /* cannot toggle last view */
-       arrange();
-}
-
-static void
-unban(Client *c) {
-       if(!c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x, c->y);
-       c->isbanned = False;
+       if(mask) {
+               tagset[seltags] = mask;
+               arrange();
+       }

 }
 
 }
 

-static void
+void

 unmanage(Client *c) {
        XWindowChanges wc;
 
 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);


@@ -1630,9 +1521,10 @@ unmanage(Client *c) {
        detachstack(c);
        if(sel == c)
                focus(NULL);
        detachstack(c);
        if(sel == c)
                focus(NULL);

+       if(c->aux && c->freeaux)
+               c->freeaux(c->aux);

        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);
        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);


@@ -1640,7 +1532,7 @@ unmanage(Client *c) {
        arrange();
 }
 
        arrange();
 }
 

-static void
+void

 unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;


@@ -1649,94 +1541,123 @@ unmapnotify(XEvent *e) {
                unmanage(c);
 }
 
                unmanage(c);
 }
 

-static void
-updatebarpos(void) {
-       XEvent ev;
-
-       wax = sx;
-       way = sy;
-       wah = sh;
-       waw = sw;
-       switch(bpos) {
-       default:
-               wah -= bh;
-               way += bh;
-               XMoveWindow(dpy, barwin, sx, sy);
-               break;
-       case BarBot:
-               wah -= bh;
-               XMoveWindow(dpy, barwin, sx, sy + wah);
-               break;
-       case BarOff:
-               XMoveWindow(dpy, barwin, sx, sy - bh);
-               break;
+void
+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 i;
+       XineramaScreenInfo *info = NULL;
+
+       /* window area geometry */
+       if(XineramaIsActive(dpy)) {
+               info = XineramaQueryScreens(dpy, &i);
+               wx = info[xidx].x_org;
+               wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
+               ww = info[xidx].width;
+               wh = showbar ? info[xidx].height - bh : info[xidx].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;

 }
 
 }
 

-static void
+void

 updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
 updatesizehints(Client *c) {
        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);
 }
 

-static void
+void

 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 
 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 

+void
+updatewmhints(Client *c) {
+       XWMHints *wmh;
+
+       if((wmh = XGetWMHints(dpy, c->win))) {
+               if(c == sel)
+                       sel->isurgent = False;
+               else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+               XFree(wmh);
+       }
+}
+
+void
+view(const Arg *arg) {
+       if(arg && (arg->i & TAGMASK) == tagset[seltags])
+               return;
+       seltags ^= 1; /* toggle sel tagset */
+       if(arg && (arg->ui & TAGMASK))
+               tagset[seltags] = arg->i & TAGMASK;
+       arrange();
+}
+

 /* There's no way to check accesses to destroyed windows, thus those cases are
  * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
  * default error handler, which may call exit.  */
 /* There's no way to check accesses to destroyed windows, thus those cases are
  * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
  * default error handler, which may call exit.  */

-static int
+int

 xerror(Display *dpy, XErrorEvent *ee) {
        if(ee->error_code == BadWindow
        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
 xerror(Display *dpy, XErrorEvent *ee) {
        if(ee->error_code == BadWindow
        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)


@@ -1744,47 +1665,36 @@ 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 */
 }
 

-static int
-xerrordummy(Display *dsply, XErrorEvent *ee) {
+int
+xerrordummy(Display *dpy, XErrorEvent *ee) {

        return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
        return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */

-static int
-xerrorstart(Display *dsply, XErrorEvent *ee) {
+int
+xerrorstart(Display *dpy, XErrorEvent *ee) {

        otherwm = True;
        return -1;
 }
 
        otherwm = True;
        return -1;
 }
 

-static void
-view(const char *arg) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               seltags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               seltags[i] = True;
-       arrange();
-}
-
-static void
-zoom(const char *arg) {
-       Client *c;
+void
+zoom(const Arg *arg) {
+       Client *c = sel;

 
 

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

                return;
                return;

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

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


@@ -1794,81 +1704,23 @@ zoom(const char *arg) {
 
 int
 main(int argc, char *argv[]) {
 
 int
 main(int argc, char *argv[]) {

-       char *p;
-       int r, xfd;
-       fd_set rd;
-       XEvent ev;
-

        if(argc == 2 && !strcmp("-v", argv[1]))
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+               eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 

-       /* macros from config.h can be used at function level only */
-       mwfact = MWFACT;
-       bpos = BARPOS;
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fprintf(stderr, "warning: no locale support\n");

 
 

-       setlocale(LC_CTYPE, "");

        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");

-       xfd = ConnectionNumber(dpy);
-       screen = DefaultScreen(dpy);
-       root = RootWindow(dpy, screen);
-       otherwm = False;
-       XSetErrorHandler(xerrorstart);
-       /* this causes an error if some other window manager is running */
-       XSelectInput(dpy, root, SubstructureRedirectMask);
-       XSync(dpy, False);
-       if(otherwm)
-               eprint("dwm: another window manager is already running\n");

 
 

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

        setup();
        setup();

-       drawbar();

        scan();
        scan();

-
-       /* main event loop, also reads status text from stdin */
-       XSync(dpy, False);
-       readin = True;
-       while(running) {
-               FD_ZERO(&rd);
-               if(readin)
-                       FD_SET(STDIN_FILENO, &rd);
-               FD_SET(xfd, &rd);
-               if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
-                       if(errno == EINTR)
-                               continue;
-                       eprint("select failed\n");
-               }
-               if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
-                       case -1:
-                               strncpy(stext, strerror(errno), sizeof stext - 1);
-                               stext[sizeof stext - 1] = '\0';
-                               readin = False;
-                               break;
-                       case 0:
-                               strncpy(stext, "EOF", 4);
-                               readin = False;
-                               break;
-                       default:
-                               for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-                               for(; p >= stext && *p != '\n'; --p);
-                               if(p > stext)
-                                       strncpy(stext, p + 1, sizeof stext);
-                       }
-                       drawbar();
-               }
-               while(XPending(dpy)) {
-                       XNextEvent(dpy, &ev);
-                       if(handler[ev.type])
-                               (handler[ev.type])(&ev); /* call handler */
-               }
-       }
+       run();

        cleanup();
        cleanup();

+

        XCloseDisplay(dpy);
        return 0;
 }
        XCloseDisplay(dpy);
        return 0;
 }