JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
removed View cruft, now back to the roots
[dwm.git] / dwm.c
diff --git a/dwm.c b/dwm.c
index a27a1ca..018f929 100644 (file)
--- a/dwm.c
+++ b/dwm.c
  * 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.
+ * global tags array to indicate the tags of a client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
  * To understand everything else, start reading main().
  */
-#include "dwm.h"
-
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
 
 /* macros */
-#define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
-#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
+#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)
+
+
+/* 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 { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+
+/* typedefs */
+typedef struct Client Client;
+struct Client {
+       char name[256];
+       int x, y, w, h;
+       int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+       int minax, maxax, minay, maxay;
+       long flags;
+       unsigned int border, oldborder;
+       Bool isbanned, isfixed, isfloating, isurgent;
+       Bool *tags;
+       Client *next;
+       Client *prev;
+       Client *snext;
+       Window win;
+};
+
+typedef struct {
+       int x, y, w, h;
+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];
+       Drawable drawable;
+       GC gc;
+       struct {
+               int ascent;
+               int descent;
+               int height;
+               XFontSet set;
+               XFontStruct *xfont;
+       } font;
+} DC; /* draw context */
+
+typedef struct {
+       unsigned long mod;
+       KeySym keysym;
+       void (*func)(const char *arg);
+       const char *arg;
+} Key;
+
+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
 
-/* local typedefs */
 typedef struct {
        const char *prop;
-       const char *tags;
+       const char *tag;
        Bool isfloating;
 } Rule;
 
-typedef struct {
-       regex_t *propregex;
-       regex_t *tagregex;
-} Regs;
+/* function declarations */
+void applyrules(Client *c);
+void arrange(void);
+void attach(Client *c);
+void attachstack(Client *c);
+void ban(Client *c);
+void buttonpress(XEvent *e);
+void checkotherwm(void);
+void cleanup(void);
+void configure(Client *c);
+void configurenotify(XEvent *e);
+void configurerequest(XEvent *e);
+void destroynotify(XEvent *e);
+void detach(Client *c);
+void detachstack(Client *c);
+void drawbar(void);
+void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
+void *emallocz(unsigned int size);
+void enternotify(XEvent *e);
+void eprint(const char *errstr, ...);
+void expose(XEvent *e);
+void floating(void); /* default floating layout */
+void focus(Client *c);
+void focusin(XEvent *e);
+void focusnext(const char *arg);
+void focusprev(const char *arg);
+Client *getclient(Window w);
+unsigned long getcolor(const char *colstr);
+long getstate(Window w);
+Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+void grabbuttons(Client *c, Bool focused);
+void grabkeys(void);
+unsigned int idxoftag(const char *t);
+void initfont(const char *fontstr);
+Bool isoccupied(unsigned int t);
+Bool isprotodel(Client *c);
+Bool isurgent(unsigned int t);
+Bool isvisible(Client *c);
+void keypress(XEvent *e);
+void killclient(const char *arg);
+void manage(Window w, XWindowAttributes *wa);
+void mappingnotify(XEvent *e);
+void maprequest(XEvent *e);
+void movemouse(Client *c);
+Client *nexttiled(Client *c);
+void propertynotify(XEvent *e);
+void quit(const char *arg);
+void reapply(const char *arg);
+void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+void resizemouse(Client *c);
+void restack(void);
+void run(void);
+void scan(void);
+void setclientstate(Client *c, long state);
+void setlayout(const char *arg);
+void setmwfact(const char *arg);
+void setup(void);
+void spawn(const char *arg);
+void tag(const char *arg);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
+void tile(void);
+void togglebar(const char *arg);
+void togglefloating(const char *arg);
+void toggletag(const char *arg);
+void toggleview(const char *arg);
+void unban(Client *c);
+void unmanage(Client *c);
+void unmapnotify(XEvent *e);
+void updatebarpos(void);
+void updatesizehints(Client *c);
+void updatetitle(Client *c);
+void updatewmhints(Client *c);
+void view(const char *arg);
+void viewprevtag(const char *arg);     /* views previous selected tags */
+int xerror(Display *dpy, XErrorEvent *ee);
+int xerrordummy(Display *dpy, XErrorEvent *ee);
+int xerrorstart(Display *dpy, XErrorEvent *ee);
+void zoom(const char *arg);
+void selectview(const char *arg);
 
 /* variables */
-char stext[256];
+char stext[256], buf[256];
 double mwfact;
-int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int screen, sx, sy, sw, sh, wax, way, waw, wah, xscreens;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
-unsigned int ltidx = 0; /* default */
-unsigned int nlayouts = 0;
-unsigned int nrules = 0;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
@@ -78,8 +205,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
-       [LeaveNotify] = leavenotify,
        [Expose] = expose,
+       [FocusIn] = focusin,
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
@@ -87,56 +214,59 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
+Bool domwfact = True;
+Bool dozoom = True;
 Bool otherwm, readin;
 Bool running = True;
-Bool selscreen = True;
+Bool *prevtags;
+Bool *seltags;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Window barwin, root;
-Regs *regs = NULL;
+Layout *lt;
+Window root, barwin;
+#ifdef XINERAMA
+XineramaScreenInfo *info = NULL;
+#endif
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
+#define TAGSZ (LENGTH(tags) * sizeof(Bool))
+static Bool tmp[LENGTH(tags)];
 
-/* Statically define the number of tags. */
-unsigned int ntags = sizeof tags / sizeof tags[0];
-Bool seltags[sizeof tags / sizeof tags[0]] = {[0] = True};
-Bool prevtags[sizeof tags / sizeof tags[0]] = {[0] = True};
+/* function implementations */
 
-/* functions*/
 void
 applyrules(Client *c) {
-       static char buf[512];
-       unsigned int i, j;
-       regmatch_t tmp;
+       unsigned int i;
        Bool matched = False;
+       Rule *r;
        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(strstr(c->name, r->prop)
+               || (ch.res_class && strstr(ch.res_class, r->prop))
+               || (ch.res_name && strstr(ch.res_name, r->prop)))
+               {
+                       c->isfloating = r->isfloating;
+                       if(r->tag) {
+                               c->tags[idxoftag(r->tag)] = True;
+                               matched = True;
                        }
                }
+       }
        if(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);
        if(!matched)
-               memcpy(c->tags, seltags, sizeof seltags);
+               memcpy(c->tags, seltags, TAGSZ);
 }
 
 void
@@ -148,8 +278,9 @@ arrange(void) {
                        unban(c);
                else
                        ban(c);
-       layouts[ltidx].arrange();
+
        focus(NULL);
+       lt->arrange();
        restack();
 }
 
@@ -171,7 +302,7 @@ void
 ban(Client *c) {
        if(c->isbanned)
                return;
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);
        c->isbanned = True;
 }
 
@@ -181,9 +312,9 @@ buttonpress(XEvent *e) {
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
-       if(barwin == ev->window) {
+       if(ev->window == barwin) {
                x = 0;
-               for(i = 0; i < ntags; i++) {
+               for(i = 0; i < LENGTH(tags); i++) {
                        x += textw(tags[i]);
                        if(ev->x < x) {
                                if(ev->button == Button1) {
@@ -209,23 +340,17 @@ buttonpress(XEvent *e) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1) {
-                       if(isarrange(floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();
                        movemouse(c);
                }
                else if(ev->button == Button2) {
-                       if(ISTILE && !c->isfixed && c->isfloating)
+                       if((floating != lt->arrange) && c->isfloating)
                                togglefloating(NULL);
                        else
                                zoom(NULL);
                }
                else if(ev->button == Button3 && !c->isfixed) {
-                       if(isarrange(floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();
                        resizemouse(c);
                }
        }
@@ -237,7 +362,7 @@ checkotherwm(void) {
        XSetErrorHandler(xerrorstart);
 
        /* this causes an error if some other window manager is running */
-       XSelectInput(dpy, root, SubstructureRedirectMask);
+       XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
@@ -249,6 +374,7 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
+
        close(STDIN_FILENO);
        while(stack) {
                unban(stack);
@@ -258,42 +384,20 @@ cleanup(void) {
                XFreeFontSet(dpy, dc.font.set);
        else
                XFreeFont(dpy, dc.font.xfont);
+
        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]);
-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       XDestroyWindow(dpy, barwin);
+#if XINERAMA
+       if(info)
+               XFree(info);
+#endif
        XSync(dpy, False);
-}
-
-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);
 }
 
 void
@@ -319,10 +423,11 @@ configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 
        if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+               /* TODO -- use Xinerama dimensions here ? */
                sw = ev->width;
                sh = ev->height;
                XFreePixmap(dpy, dc.drawable);
-               dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+               dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
                XResizeWindow(dpy, barwin, sw, bh);
                updatebarpos();
                arrange();
@@ -335,25 +440,25 @@ configurerequest(XEvent *e) {
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
+       /* TODO -- consider Xinerama if necessary when centering */
        if((c = getclient(ev->window))) {
-               c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               if(c->isfixed || c->isfloating || isarrange(floating)) {
+               if(c->isfixed || c->isfloating || (floating == lt->arrange)) {
                        if(ev->value_mask & CWX)
-                               c->x = ev->x;
+                               c->x = sx + ev->x;
                        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((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);
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
@@ -374,6 +479,16 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
+Bool
+conflicts(Client *c, unsigned int tidx) {
+       unsigned int i;
+
+       for(i = 0; i < LENGTH(tags); i++)
+               if(c->tags[i])
+                       return True; /* conflict */
+       return False;
+}
+
 void
 destroynotify(XEvent *e) {
        Client *c;
@@ -405,22 +520,24 @@ detachstack(Client *c) {
 void
 drawbar(void) {
        int i, x;
+       Client *c;
 
-       dc.x = dc.y = 0;
-       for(i = 0; i < ntags; i++) {
+       dc.x = 0;
+       for(c = stack; c && !isvisible(c); c = c->snext);
+       for(i = 0; i < LENGTH(tags); i++) {
                dc.w = textw(tags[i]);
                if(seltags[i]) {
-                       drawtext(tags[i], dc.sel);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
+                       drawtext(tags[i], dc.sel, isurgent(i));
+                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
                }
                else {
-                       drawtext(tags[i], dc.norm);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+                       drawtext(tags[i], dc.norm, isurgent(i));
+                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
                }
                dc.x += dc.w;
        }
        dc.w = blw;
-       drawtext(layouts[ltidx].symbol, dc.norm);
+       drawtext(lt->symbol, dc.norm, False);
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = sw - dc.w;
@@ -428,27 +545,27 @@ drawbar(void) {
                dc.x = x;
                dc.w = sw - x;
        }
-       drawtext(stext, dc.norm);
+       drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
-               if(sel) {
-                       drawtext(sel->name, dc.sel);
-                       drawsquare(sel->ismax, sel->isfloating, dc.sel);
+               if(c) {
+                       drawtext(c->name, dc.sel, False);
+                       drawsquare(False, c->isfloating, False, dc.sel);
                }
                else
-                       drawtext(NULL, dc.norm);
+                       drawtext(NULL, dc.norm, False);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
        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;
@@ -464,13 +581,12 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 }
 
 void
-drawtext(const char *text, unsigned long col[ColLast]) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
        int x, y, w, h;
-       static char buf[256];
        unsigned int len, olen;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-       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;
@@ -496,7 +612,7 @@ drawtext(const char *text, unsigned long col[ColLast]) {
        }
        if(w > dc.w)
                return; /* too long */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
+       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
@@ -517,14 +633,12 @@ 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);
-       else if(ev->window == root) {
-               selscreen = True;
+       else
                focus(NULL);
-       }
 }
 
 void
@@ -541,16 +655,15 @@ void
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
-       if(ev->count == 0) {
-               if(barwin == ev->window)
-                       drawbar();
-       }
+       if(ev->count == 0 && (ev->window == barwin))
+               drawbar();
 }
 
 void
 floating(void) { /* default floating layout */
        Client *c;
 
+       domwfact = dozoom = False;
        for(c = clients; c; c = c->next)
                if(isvisible(c))
                        resize(c, c->x, c->y, c->w, c->h, True);
@@ -558,7 +671,7 @@ floating(void) { /* default floating layout */
 
 void
 focus(Client *c) {
-       if((!c && selscreen) || (c && !isvisible(c)))
+       if(!c || (c && !isvisible(c)))
                for(c = stack; c && !isvisible(c); c = c->snext);
        if(sel && sel != c) {
                grabbuttons(sel, False);
@@ -570,15 +683,21 @@ focus(Client *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);
+       drawbar();
+}
+
+void
+focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+       XFocusChangeEvent *ev = &e->xfocus;
+
+       if(sel && ev->window != sel->win)
+               XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
 }
 
 void
@@ -665,8 +784,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
-               && n > 0 && *list)
-               {
+               && n > 0 && *list) {
                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }
@@ -683,29 +801,29 @@ grabbuttons(Client *c, Bool focused) {
        if(focused) {
                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button1, MODKEY|LockMask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button1, MODKEY|numlockmask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+               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,
+               XGrabButton(dpy, Button2, MODKEY|LockMask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button2, MODKEY|numlockmask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+               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,
+               XGrabButton(dpy, Button3, MODKEY|LockMask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button3, MODKEY|numlockmask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button3, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
        }
        else
@@ -713,14 +831,41 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
+void
+grabkeys(void)  {
+       unsigned int i, j;
+       KeyCode code;
+       XModifierKeymap *modmap;
+
+       /* 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);
+
+       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);
+       }
+}
+
 unsigned int
-idxoftag(const char *tag) {
+idxoftag(const char *t) {
        unsigned int i;
 
-       for(i = 0; i < ntags; i++)
-               if(tags[i] == tag)
-                       return i;
-       return 0;
+       for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
+       return (i < LENGTH(tags)) ? i : 0;
 }
 
 void
@@ -766,12 +911,6 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isarrange(void (*func)())
-{
-       return func == layouts[ltidx].arrange;
-}
-
-Bool
 isoccupied(unsigned int t) {
        Client *c;
 
@@ -797,10 +936,20 @@ isprotodel(Client *c) {
 }
 
 Bool
+isurgent(unsigned int t) {
+       Client *c;
+
+       for(c = clients; c; c = c->next)
+               if(c->isurgent && c->tags[t])
+                       return True;
+       return False;
+}
+
+Bool
 isvisible(Client *c) {
        unsigned int i;
 
-       for(i = 0; i < ntags; i++)
+       for(i = 0; i < LENGTH(tags); i++)
                if(c->tags[i] && seltags[i])
                        return True;
        return False;
@@ -808,31 +957,13 @@ isvisible(Client *c) {
 
 void
 keypress(XEvent *e) {
-       KEYS
-       unsigned int len = sizeof keys / sizeof keys[0];
        unsigned int i;
-       KeyCode code;
        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);
-       for(i = 0; i < len; i++)
+       for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
                {
@@ -861,30 +992,24 @@ killclient(const char *arg) {
 }
 
 void
-leavenotify(XEvent *e) {
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen) {
-               selscreen = False;
-               focus(NULL);
-       }
-}
-
-void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
-       Window trans;
        Status rettrans;
+       Window trans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
-       c->tags = emallocz(sizeof seltags);
+       c->tags = emallocz(TAGSZ);
        c->win = w;
-       c->x = wa->x;
-       c->y = wa->y;
+
+       applyrules(c);
+
+       c->x = wa->x + sx;
+       c->y = wa->y + sy;
        c->w = wa->width;
        c->h = wa->height;
        c->oldborder = wa->border_width;
+
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
@@ -906,15 +1031,13 @@ manage(Window w, XWindowAttributes *wa) {
        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)
-               memcpy(c->tags, t->tags, sizeof seltags);
-       applyrules(c);
+               memcpy(c->tags, t->tags, TAGSZ);
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
        attach(c);
@@ -932,7 +1055,7 @@ mappingnotify(XEvent *e) {
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)
-               keypress(NULL);
+               grabkeys();
 }
 
 void
@@ -960,10 +1083,9 @@ movemouse(Client *c) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
-       c->ismax = False;
        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);
@@ -977,7 +1099,7 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);
-                       if(abs(wax + nx) < SNAP)
+                       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;
@@ -985,7 +1107,10 @@ movemouse(Client *c) {
                                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(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+                               togglefloating(NULL);
+                       if((lt->arrange == floating) || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, False);
                        break;
                }
        }
@@ -1007,15 +1132,19 @@ propertynotify(XEvent *e) {
                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);
@@ -1031,51 +1160,64 @@ quit(const char *arg) {
 }
 
 void
+reapply(const char *arg) {
+       static Bool zerotags[LENGTH(tags)] = { 0 };
+       Client *c;
+
+       for(c = clients; c; c = c->next) {
+               memcpy(c->tags, zerotags, sizeof zerotags);
+               applyrules(c);
+       }
+       arrange();
+}
+
+void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-       double dx, dy, max, min, ratio;
        XWindowChanges wc;
 
        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 */
+               if (w < 1)
+                       w = 1;
+               if (h < 1)
+                       h = 1;
+
+               /* temporarily remove base dimensions */
+               w -= c->basew;
+               h -= c->baseh;
+
+               /* adjust for aspect limits */
+               if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+                       if (w * c->maxay > h * c->maxax)
+                               w = h * c->maxax / c->maxay;
+                       else if (w * c->minay < h * c->minax)
+                               h = w * c->minay / c->minax;
                }
-               if(c->minw && w < c->minw)
+
+               /* adjust for increment value */
+               if(c->incw)
+                       w -= w % c->incw;
+               if(c->inch)
+                       h -= h % c->inch;
+
+               /* restore base dimensions */
+               w += c->basew;
+               h += c->baseh;
+
+               if(c->minw > 0 && w < c->minw)
                        w = c->minw;
-               if(c->minh && h < c->minh)
+               if(c->minh > 0 && h < c->minh)
                        h = c->minh;
-               if(c->maxw && w > c->maxw)
+               if(c->maxw > 0 && w > c->maxw)
                        w = c->maxw;
-               if(c->maxh && h > c->maxh)
+               if(c->maxh > 0 && h > c->maxh)
                        h = c->maxh;
-               if(c->incw)
-                       w -= (w - c->basew) % c->incw;
-               if(c->inch)
-                       h -= (h - c->baseh) % c->inch;
        }
        if(w <= 0 || h <= 0)
                return;
-       /* offscreen appearance fixes */
-       if(x > sw)
+       if(x > sx + sw)
                x = sw - w - 2 * c->border;
-       if(y > sh)
+       if(y > sy + sh)
                y = sh - h - 2 * c->border;
        if(x + w + 2 * c->border < sx)
                x = sx;
@@ -1087,7 +1229,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                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);
+               XConfigureWindow(dpy, c->win,
+                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
                configure(c);
                XSync(dpy, False);
        }
@@ -1104,10 +1247,9 @@ resizemouse(Client *c) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
-       c->ismax = False;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
        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,
@@ -1126,7 +1268,10 @@ resizemouse(Client *c) {
                                nw = 1;
                        if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
                                nh = 1;
-                       resize(c, c->x, c->y, nw, nh, True);
+                       if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+                               togglefloating(NULL);
+                       if((lt->arrange == floating) || c->isfloating)
+                               resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
        }
@@ -1141,19 +1286,19 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
-       if(sel->isfloating || isarrange(floating))
+       if(sel->isfloating || (lt->arrange == floating))
                XRaiseWindow(dpy, sel->win);
-       if(!isarrange(floating)) {
+       if(lt->arrange != floating) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
                if(!sel->isfloating) {
-                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+                       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);
+                       XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                        wc.sibling = c->win;
                }
        }
@@ -1164,14 +1309,19 @@ restack(void) {
 void
 run(void) {
        char *p;
-       int r, xfd;
+       char sbuf[sizeof stext];
        fd_set rd;
+       int r, xfd;
+       unsigned int 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)
@@ -1183,10 +1333,9 @@ run(void) {
                        eprint("select failed\n");
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+                       switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
                        case -1:
-                               strncpy(stext, strerror(errno), sizeof stext - 1);
-                               stext[sizeof stext - 1] = '\0';
+                               strncpy(stext, strerror(errno), len);
                                readin = False;
                                break;
                        case 0:
@@ -1194,10 +1343,18 @@ run(void) {
                                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);
+                               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();
                }
@@ -1219,7 +1376,7 @@ scan(void) {
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
-                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+                                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
                                manage(wins[i], &wa);
@@ -1228,7 +1385,7 @@ scan(void) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
                                continue;
                        if(XGetTransientForHint(dpy, wins[i], &d1)
-                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+                                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }
        }
@@ -1249,16 +1406,17 @@ setlayout(const char *arg) {
        unsigned int i;
 
        if(!arg) {
-               if(++ltidx == nlayouts)
-                       ltidx = 0;;
+               lt++;
+               if(lt == &layouts[LENGTH(layouts)])
+                       lt = &layouts[0];
        }
        else {
-               for(i = 0; i < nlayouts; i++)
-                       if(!strcmp(arg, layouts[i].symbol))
+               for(i = 0; i < LENGTH(layouts); i++)
+                       if(arg == layouts[i].symbol)
                                break;
-               if(i == nlayouts)
+               if(i == LENGTH(layouts))
                        return;
-               ltidx = i;
+               lt = &layouts[i];
        }
        if(sel)
                arrange();
@@ -1270,12 +1428,12 @@ void
 setmwfact(const char *arg) {
        double delta;
 
-       if(!ISTILE)
+       if(!domwfact)
                return;
        /* arg handling, manipulate mwfact */
        if(arg == NULL)
                mwfact = MWFACT;
-       else if(1 == sscanf(arg, "%lf", &delta)) {
+       else if(sscanf(arg, "%lf", &delta) == 1) {
                if(arg[0] == '+' || arg[0] == '-')
                        mwfact += delta;
                else
@@ -1290,12 +1448,17 @@ setmwfact(const char *arg) {
 
 void
 setup(void) {
-       int d;
-       unsigned int i, j, mask;
-       Window w;
-       XModifierKeymap *modmap;
+       unsigned int i;
        XSetWindowAttributes wa;
 
+       /* init screen */
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+       sx = 0;
+       sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
@@ -1303,41 +1466,16 @@ setup(void) {
        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 */
-       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);
 
-       /* init geometry */
-       sx = sy = 0;
-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-
-       /* 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);
-
-       /* select for events */
-       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-               | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
-       wa.cursor = cursor[CurNormal];
-       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-       XSelectInput(dpy, root, wa.event_mask);
-
-       /* grab keys */
-       keypress(NULL);
-
-       /* init tags */
-       compileregs();
+#ifdef XINERAMA
+       if(XineramaIsActive(dpy))
+               info = XineramaQueryScreens(dpy, &xscreens);
+#endif
 
        /* init appearance */
        dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
@@ -1348,36 +1486,56 @@ setup(void) {
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        initfont(FONT);
        dc.h = bh = dc.font.height + 2;
+       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 tags */
+       seltags = emallocz(TAGSZ);
+       prevtags = emallocz(TAGSZ);
+       seltags[0] = prevtags[0] = True;
 
        /* init layouts */
        mwfact = MWFACT;
-       nlayouts = sizeof layouts / sizeof layouts[0];
-       for(blw = i = 0; i < nlayouts; i++) {
-               j = textw(layouts[i].symbol);
-               if(j > blw)
-                       blw = j;
-       }
+       lt = &layouts[0];
 
+       /* TODO: Xinerama hints ? */
        /* init bar */
+       for(blw = i = 0; i < LENGTH(layouts); i++) {
+               i = textw(layouts[i].symbol);
+               if(i > blw)
+                       blw = i;
+       }
+
        bpos = BARPOS;
        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);
+       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);
+       drawbar();
+
+       /* EWMH support per view */
+       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char *) netatom, NetLast);
+
+       /* select for events */
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+       XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+       XSelectInput(dpy, root, wa.event_mask);
 
-       /* multihead support */
-       selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+
+       /* grab keys */
+       grabkeys();
 }
 
 void
@@ -1410,11 +1568,9 @@ tag(const char *arg) {
 
        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;
+       for(i = 0; i < LENGTH(tags); i++)
+               sel->tags[i] = (NULL == arg);
+       sel->tags[idxoftag(arg)] = True;
        arrange();
 }
 
@@ -1439,6 +1595,10 @@ tile(void) {
        unsigned int i, n, nx, ny, nw, nh, mw, th;
        Client *c, *mc;
 
+       domwfact = dozoom = True;
+       nx = wax;
+       ny = way;
+       nw = 0;
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
@@ -1448,11 +1608,7 @@ tile(void) {
        if(n > 1 && th < bh)
                th = wah;
 
-       nx = wax;
-       ny = way;
-       nw = 0; /* gcc stupidity requires this */
-       for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
-               c->ismax = False;
+       for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {
                if(i == 0) { /* master */
                        nw = mw - 2 * c->border;
                        nh = wah - 2 * c->border;
@@ -1461,7 +1617,7 @@ tile(void) {
                        if(i == 1) {
                                ny = way;
                                nx += mc->w + 2 * mc->border;
-                               nw = waw - nx - 2 * c->border;
+                               nw = waw - mw - 2 * c->border;
                        }
                        if(i + 1 == n) /* remainder */
                                nh = (way + wah) - ny - 2 * c->border;
@@ -1469,8 +1625,12 @@ tile(void) {
                                nh = th - 2 * c->border;
                }
                resize(c, nx, ny, nw, nh, RESIZEHINTS);
+               if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
+                       /* client doesn't accept size constraints */
+                       resize(c, nx, ny, nw, nh, False);
                if(n > 1 && th != wah)
                        ny = c->y + c->h + 2 * c->border;
+               i++;
        }
 }
 
@@ -1495,44 +1655,18 @@ togglefloating(const char *arg) {
 }
 
 void
-togglemax(const char *arg) {
-       XEvent ev;
-
-       if(!sel || sel->isfixed)
-               return;
-       if((sel->ismax = !sel->ismax)) {
-               if(isarrange(floating) || sel->isfloating)
-                       sel->wasfloating = True;
-               else {
-                       togglefloating(NULL);
-                       sel->wasfloating = False;
-               }
-               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);
-       }
-       else {
-               resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-               if(!sel->wasfloating)
-                       togglefloating(NULL);
-       }
-       drawbar();
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
 toggletag(const char *arg) {
        unsigned int i, j;
 
        if(!sel)
                return;
        i = idxoftag(arg);
+       if(conflicts(sel, i))
+               return;
        sel->tags[i] = !sel->tags[i];
-       for(j = 0; j < ntags && !sel->tags[j]; j++);
-       if(j == ntags)
-               sel->tags[i] = True;
+       for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
+       if(j == LENGTH(tags))
+               sel->tags[i] = True; /* at least one tag must be enabled */
        arrange();
 }
 
@@ -1542,8 +1676,8 @@ toggleview(const char *arg) {
 
        i = idxoftag(arg);
        seltags[i] = !seltags[i];
-       for(j = 0; j < ntags && !seltags[j]; j++);
-       if(j == ntags)
+       for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+       if(j == LENGTH(tags))
                seltags[i] = True; /* at least one tag must be viewed */
        arrange();
 }
@@ -1672,6 +1806,41 @@ updatetitle(Client *c) {
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 
+void
+updatewmhints(Client *c) {
+       XWMHints *wmh;
+
+       if((wmh = XGetWMHints(dpy, c->win))) {
+               c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+               XFree(wmh);
+       }
+}
+
+
+void
+view(const char *arg) {
+       unsigned int i;
+
+       for(i = 0; i < LENGTH(tags); i++)
+               tmp[i] = (NULL == arg);
+       tmp[idxoftag(arg)] = True;
+
+       if(memcmp(seltags, tmp, TAGSZ) != 0) {
+               memcpy(prevtags, seltags, TAGSZ);
+               memcpy(seltags, tmp, TAGSZ);
+               arrange();
+       }
+}
+
+void
+viewprevtag(const char *arg) {
+
+       memcpy(tmp, seltags, TAGSZ);
+       memcpy(seltags, prevtags, TAGSZ);
+       memcpy(prevtags, tmp, TAGSZ);
+       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.  */
@@ -1692,48 +1861,25 @@ xerror(Display *dpy, XErrorEvent *ee) {
 }
 
 int
-xerrordummy(Display *dsply, XErrorEvent *ee) {
+xerrordummy(Display *dpy, XErrorEvent *ee) {
        return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
 int
-xerrorstart(Display *dsply, XErrorEvent *ee) {
+xerrorstart(Display *dpy, XErrorEvent *ee) {
        otherwm = True;
        return -1;
 }
 
 void
-view(const char *arg) {
-       unsigned int i;
-
-       memcpy(prevtags, seltags, sizeof seltags);
-       for(i = 0; i < ntags; i++)
-               seltags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               seltags[i] = True;
-       arrange();
-}
-
-void
-viewprevtag(const char *arg) {
-       static Bool tmptags[sizeof tags / sizeof tags[0]];
-
-       memcpy(tmptags, seltags, sizeof seltags);
-       memcpy(seltags, prevtags, sizeof seltags);
-       memcpy(prevtags, tmptags, sizeof seltags);
-       arrange();
-}
-
-void
 zoom(const char *arg) {
-       Client *c;
+       Client *c = sel;
 
-       if(!sel || !ISTILE || sel->isfloating)
+       if(!sel || !dozoom || sel->isfloating)
                return;
-       if((c = sel) == nexttiled(clients))
+       if(c == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
@@ -1745,19 +1891,16 @@ zoom(const char *arg) {
 int
 main(int argc, char *argv[]) {
        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");
 
        setlocale(LC_CTYPE, "");
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
-       screen = DefaultScreen(dpy);
-       root = RootWindow(dpy, screen);
 
        checkotherwm();
        setup();
-       drawbar();
        scan();
        run();
        cleanup();