removed some empty lines

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 164b5ef..d47da3f 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -6,71 +6,90 @@
  * events about window (dis-)appearance.  Only one X connection at a time is
  * allowed to select for this event mask.
  *
  * events about window (dis-)appearance.  Only one X connection at a time is
  * allowed to select for this event mask.
  *

- * Calls to fetch an X event from the event queue are blocking.  Due reading
- * status text from standard input, a select()-driven main loop has been
- * implemented which selects for reads on the X connection and STDIN_FILENO to
- * handle all data smoothly. The event handlers of dwm are organized in an
- * array which is accessed whenever a new event has been fetched. This allows
- * event dispatching in O(1) time.
+ * The event handlers of dwm are organized in an array which is accessed
+ * whenever a new event has been fetched. This allows event dispatching
+ * in O(1) time.

  *
  * 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
  *
  * 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.
+ * linked client list, the focus history is remembered through a global
+ * 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 <stdarg.h>

+#include <signal.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.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 /* XINERAMA */

 
 /* macros */
 
 /* 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 INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
+#define LENGTH(X)               (sizeof X / sizeof X[0])
+#define MAX(A, B)               ((A) > (B) ? (A) : (B))
+#define MIN(A, B)               ((A) < (B) ? (A) : (B))
+#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
+#define WIDTH(X)                ((X)->w + 2 * (X)->bw)
+#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
+#define TAGMASK                 ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(X)                (textnw(X, strlen(X)) + dc.font.height)

 
 /* enums */
 
 /* enums */

-enum { BarTop, BarBot, BarOff };                       /* bar position */
-enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
-enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
+enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast };        /* default atoms */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
+
+typedef union {
+       int i;
+       unsigned int ui;
+       float f;
+       void *v;
+} Arg;

 
 

-/* typedefs */
+typedef struct {
+       unsigned int click;
+       unsigned int mask;
+       unsigned int button;
+       void (*func)(const Arg *arg);
+       const Arg arg;
+} Button;
+
+typedef struct Monitor Monitor;

 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;
+       unsigned int tags;
+       Bool isfixed, isfloating, isurgent;

        Client *next;
        Client *next;

-       Client *prev;

        Client *snext;
        Client *snext;

+       Monitor *mon;

        Window win;
 };
 
        Window win;
 };
 


@@ -90,117 +109,137 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
 } DC; /* draw context */
 
 typedef struct {

-       unsigned long mod;
+       unsigned int mod;

        KeySym keysym;
        KeySym keysym;

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

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

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

 } Layout;
 
 } Layout;
 

+struct Monitor {
+       int screen_number;
+       float mfact;
+       int by, btx;          /* bar geometry */
+       int mx, my, mw, mh;   /* screen size */
+       int wx, wy, ww, wh;   /* window area  */
+       unsigned int seltags;
+       unsigned int sellt;
+       unsigned int tagset[2];
+       Bool showbar;
+       Bool topbar;
+       Client *clients;
+       Client *sel;
+       Client *stack;
+       Monitor *next;
+       Window barwin;
+};
+

 typedef struct {
 typedef struct {

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

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

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

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

+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);

 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(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 checkotherwm(void);
 static void cleanup(void);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);

-static void compileregs(void);
+static void cleanupmons(void);
+static void clearurgent(Client *c);

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

-static void 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 die(const char *errstr, ...);
+static void drawbar(Monitor *m);
+static void drawbars(void);
+static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);

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

-static void eprint(const char *errstr, ...);

 static void expose(XEvent *e);
 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 Client *getclient(Window w);
+static void focusin(XEvent *e);
+static void focusmon(const Arg *arg);
+static void focusstack(const Arg *arg);

 static unsigned long getcolor(const char *colstr);
 static unsigned long getcolor(const char *colstr);

+static Bool getrootpointer(int *x, int *y);

 static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);

-static unsigned int idxoftag(const char *tag);
+static void grabkeys(void);
+static Monitor *idxtomon(unsigned int n);

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

-static Bool isarrange(void (*func)());
-static Bool isoccupied(unsigned int t);

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

-static Bool isvisible(Client *c);

 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(Monitor *m);
+static void movemouse(const Arg *arg);

 static Client *nexttiled(Client *c);
 static Client *nexttiled(Client *c);

+static Monitor *pointertomon(int x, int y);

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

-static void quit(const char *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-static void resizemouse(Client *c);
-static void restack(void);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact);
+static void resizemouse(const Arg *arg);
+static void restack(Monitor *m);

 static void run(void);
 static void scan(void);
 static void run(void);
 static void scan(void);

+static void sendmon(Client *c, Monitor *m);

 static void setclientstate(Client *c, long state);
 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 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 showhide(Client *c);
+static void sigchld(int signal);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static void tagmon(const Arg *arg);
+static int textnw(const char *text, unsigned int len);
+static void tile(Monitor *);
+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 unfocus(Client *c);

 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 updategeom(void);
+static void updatebarpos(Monitor *m);
+static void updatebars(void);
+static void updatenumlockmask(void);

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

+static void updatestatus(void);

 static void updatetitle(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 Client *wintoclient(Window w);
+static Monitor *wintomon(Window w);

 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;
+static int sw, sh;   /* X display screen geometry x, y, width, height */
+static int bh, blw = 0;      /* bar geometry */

 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 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,


@@ -208,8 +247,8 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [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,


@@ -217,166 +256,209 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];

-static Bool otherwm, readin;
+static Bool otherwm;

 static Bool running = True;
 static Bool running = True;

-static Bool *seltags;
-static Bool selscreen = True;
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;

 static Cursor cursor[CurLast];
 static Display *dpy;
 static Cursor cursor[CurLast];
 static Display *dpy;

-static DC dc = {0};
-static Window barwin, root;
-static Regs *regs = NULL;
-
+static DC dc;
+static Layout *lt[] = { NULL, NULL };
+static Monitor *mons = NULL, *selmon = NULL;
+static Window root;

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

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

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

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

        XClassHint ch = { 0 };
 
        /* rule matching */
        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;
-                               }
+       c->isfloating = c->tags = 0;
+       if(XGetClassHint(dpy, c->win, &ch)) {
+               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;

                        }
                }
                        }
                }

-       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(ch.res_class)
+                       XFree(ch.res_class);
+               if(ch.res_name)
+                       XFree(ch.res_name);
+       }
+       c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
+}
+
+Bool
+applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
+       Bool baseismin;
+       Monitor *m = c->mon;
+
+       /* set minimum possible */
+       *w = MAX(1, *w);
+       *h = MAX(1, *h);
+
+       if(interact) {
+               if(*x > sw)
+                       *x = sw - WIDTH(c);
+               if(*y > sh)
+                       *y = sh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw < 0)
+                       *x = 0;
+               if(*y + *h + 2 * c->bw < 0)
+                       *y = 0;
+       }
+       else {
+               if(*x > m->mx + m->mw)
+                       *x = m->mx + m->mw - WIDTH(c);
+               if(*y > m->my + m->mh)
+                       *y = m->my + m->mh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw < m->mx)
+                       *x = m->mx;
+               if(*y + *h + 2 * c->bw < m->my)
+                       *y = m->my;
+       }
+       if(*h < bh)
+               *h = bh;
+       if(*w < bh)
+               *w = bh;
+       if(resizehints || c->isfloating) {
+               /* see last two sentences in ICCCM 4.1.2.3 */
+               baseismin = c->basew == c->minw && c->baseh == c->minh;
+               if(!baseismin) { /* 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(baseismin) { /* increment calculation requires this */
+                       *w -= c->basew;
+                       *h -= c->baseh;
+               }
+               /* 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;
+               *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);
+       }
+       return *x != c->x || *y != c->y || *w != c->w || *h != c->h;

 }
 
 }
 

-static void
+void

 arrange(void) {
 arrange(void) {

-       Client *c;
+       Monitor *m;

 
 

-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       unban(c);
-               else
-                       ban(c);
-       layouts[ltidx].arrange();
+       /* optimise two loops into one, check focus(NULL) */
+       for(m = mons; m; m = m->next)
+               showhide(m->stack);

        focus(NULL);
        focus(NULL);

-       restack();
+       for(m = mons; m; m = m->next) {
+               if(lt[m->sellt]->arrange)
+                       lt[m->sellt]->arrange(m);
+               restack(m);
+       }

 }
 
 }
 

-static void
+void

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

-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
+       c->next = c->mon->clients;
+       c->mon->clients = c;

 }
 
 }
 

-static void
+void

 attachstack(Client *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;
+       c->snext = c->mon->stack;
+       c->mon->stack = c;

 }
 
 }
 

-static void
+void

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

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

        Client *c;
        Client *c;

+       Monitor *m;

        XButtonPressedEvent *ev = &e->xbutton;
 
        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;
+       /* focus monitor if necessary */
+       if((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel);
+               selmon = m;
+               focus(NULL);
+       }
+       if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
+               i = 0;
+               x = selmon->btx;
+               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 > selmon->wx + selmon->ww - TEXTW(stext))
+                       click = ClkStatusText;
+               else
+                       click = ClkWinTitle;

        }
        }

-       else if((c = getclient(ev->window))) {
+       else if((c = wintoclient(ev->window))) {

                focus(c);
                focus(c);

-               if(CLEANMASK(ev->state) != MODKEY)
-                       return;
-               if(ev->button == Button1) {
-                       if(!isarrange(floating) && !c->isfloating)
-                               togglefloating(NULL);
-                       else
-                               restack();
-                       movemouse(c);
-               }
-               else if(ev->button == Button2)
-                       zoom(NULL);
-               else if(ev->button == Button3 && !c->isfixed) {
-                       if(!isarrange(floating) && !c->isfloating)
-                               togglefloating(NULL);
-                       else
-                               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 && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);

 }
 
 }
 

-static void
+void

 checkotherwm(void) {
        otherwm = False;
 checkotherwm(void) {
        otherwm = False;

-       XSetErrorHandler(xerrorstart);
-
+       xerrorxlib = XSetErrorHandler(xerrorstart);

        /* this causes an error if some other window manager is running */
        /* 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)
        XSync(dpy, False);
        if(otherwm)

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

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

-static void
+void

 cleanup(void) {
 cleanup(void) {

-       close(STDIN_FILENO);
-       while(stack) {
-               unban(stack);
-               unmanage(stack);
-       }
+       Arg a = {.ui = ~0};
+       Layout foo = { "", NULL };
+       Monitor *m;
+
+       view(&a);
+       lt[selmon->sellt] = &foo;
+       for(m = mons; m; m = m->next)
+               while(m->stack)
+                       unmanage(m->stack);

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


@@ -384,43 +466,40 @@ 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);
+       cleanupmons();

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

-       free(seltags);
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

 }
 
 }
 

-static void
-compileregs(void) {
-       unsigned int i;
-       regex_t *reg;
+void
+cleanupmons(void) {
+       Monitor *m;

 
 

-       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;
-               }
+       while(mons) {
+               m = mons->next;
+               XUnmapWindow(dpy, mons->barwin);
+               XDestroyWindow(dpy, mons->barwin);
+               free(mons);
+               mons = m;

        }
 }
 
        }
 }
 

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

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


@@ -432,54 +511,58 @@ 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) {
 configurenotify(XEvent *e) {

+       Monitor *m;

        XConfigureEvent *ev = &e->xconfigure;
 
        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);
+               updategeom();
+               if(dc.drawable != 0)
+                       XFreePixmap(dpy, dc.drawable);

                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));

-               XResizeWindow(dpy, barwin, sw, bh);
-               updatebarpos();
+               updatebars();
+               for(m = mons; m; m = m->next)
+                       XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);

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

-static void
+void

 configurerequest(XEvent *e) {
        Client *c;
 configurerequest(XEvent *e) {
        Client *c;

+       Monitor *m;

        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 

-       if((c = getclient(ev->window))) {
-               c->ismax = False;
+       if((c = wintoclient(ev->window))) {

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

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

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

-                               c->x = ev->x;
+                               c->x = m->mx + ev->x;

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

-                               c->y = ev->y;
+                               c->y = m->my + 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 - m->mx + c->w) > m->mw && c->isfloating)
+                               c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */
+                       if((c->y - m->my + c->h) > m->mh && c->isfloating)
+                               c->y = m->my + (m->mh / 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


@@ -498,81 +581,120 @@ 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;
 

-       if((c = getclient(ev->window)))
+       if((c = wintoclient(ev->window)))

                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)
-               clients = c->next;
-       c->next = c->prev = NULL;
+       Client **tc;
+
+       for(tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
+       *tc = c->next;

 }
 
 }
 

-static void
+void

 detachstack(Client *c) {
 detachstack(Client *c) {

-       Client **tc;
+       Client **tc, *t;

 
 

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

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

+
+       if(c == c->mon->sel) {
+               for(t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
+               c->mon->sel = t;
+       }

 }
 
 }
 

-static void
-drawbar(void) {
-       int i, x;
+void
+die(const char *errstr, ...) {
+       va_list ap;

 
 

-       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);
-               }
-               else {
-                       drawtext(tags[i], dc.norm);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
-               }
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
+void
+drawbar(Monitor *m) {
+       int x;
+       unsigned int i, occ = 0, urg = 0;
+       unsigned long *col;
+       Client *c;
+
+       for(c = m->clients; c; c = c->next) {
+               occ |= c->tags;
+               if(c->isurgent)
+                       urg |= c->tags;
+       }
+       dc.x = 0;
+       if(mons->next) { /* more than a single monitor */
+               dc.w = TEXTW(monsyms[m->screen_number]);
+               drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False);

                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(dc.x < x) {
-               dc.x = x;
-               dc.w = sw - x;
+       m->btx = dc.x;
+       for(i = 0; i < LENGTH(tags); i++) {
+               dc.w = TEXTW(tags[i]);
+               col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
+               drawtext(tags[i], col, urg & 1 << i);
+               drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+                          occ & 1 << i, urg & 1 << i, col);
+               dc.x += dc.w;
+       }
+       if(blw > 0) {
+               dc.w = blw;
+               drawtext(lt[m->sellt]->symbol, dc.norm, False);
+               x = dc.x + dc.w;

        }
        }

-       drawtext(stext, dc.norm);
+       else
+               x = dc.x;
+       if(m == selmon) { /* status is only drawn on selected monitor */
+               dc.w = TEXTW(stext);
+               dc.x = m->ww - dc.w;
+               if(dc.x < x) {
+                       dc.x = x;
+                       dc.w = m->ww - x;
+               }
+               drawtext(stext, dc.norm, False);
+       }
+       else
+               dc.x = m->ww;

        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
        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(m->sel) {
+                       col = m == selmon ? dc.sel : dc.norm;
+                       drawtext(m->sel->name, col, False);
+                       drawsquare(m->sel->isfixed, m->sel->isfloating, False, col);

                }
                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, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);

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

-static void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+void
+drawbars(void) {
+       Monitor *m;
+
+       for(m = mons; m; m = m->next)
+               drawbar(m);
+}
+
+void
+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 };
 
        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;


@@ -587,175 +709,149 @@ 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, unsigned long col[ColLast], Bool invert) {
+       char buf[256];
+       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 };
 

-       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;
-       memcpy(buf, text, len);
-       buf[len] = 0;
+       olen = strlen(text);

        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 = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
+       if(!len)
+               return;
+       memcpy(buf, text, len);
+       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;
 enternotify(XEvent *e) {
        Client *c;

+       Monitor *m;

        XCrossingEvent *ev = &e->xcrossing;
 
        XCrossingEvent *ev = &e->xcrossing;
 

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

                return;
                return;

-       if((c = getclient(ev->window)))
+       if((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel);
+               selmon = m;
+       }
+       if((c = wintoclient(ev->window)))

                focus(c);
                focus(c);

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

                focus(NULL);
                focus(NULL);

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

 }
 
 }
 

-static void
+void

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

+       Monitor *m;

        XExposeEvent *ev = &e->xexpose;
 
        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 && (m = wintomon(ev->window)))
+               drawbar(m);

 }
 
 }
 

-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(sel && sel != c) {
-               grabbuttons(sel, False);
-               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
-       }
+       if(!c || !ISVISIBLE(c))
+               for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+       if(selmon->sel)
+               unfocus(selmon->sel);

        if(c) {
        if(c) {

+               if(c->mon != selmon)
+                       selmon = c->mon;
+               if(c->isurgent)
+                       clearurgent(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);

+       selmon->sel = c;
+       drawbars();

 }
 
 }
 

-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)
+       if(selmon->sel && ev->window != selmon->sel->win)
+               XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);
+}
+
+void
+focusmon(const Arg *arg) {
+       Monitor *m;
+
+       if(!(m = idxtomon(arg->ui)) || m == selmon)

                return;
                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();
-       }
+       unfocus(selmon->sel);
+       selmon = m;
+       focus(NULL);

 }
 
 }
 

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

 
 

-       if(!sel)
+       if(!selmon->sel)

                return;
                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 = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
+               if(!c)
+                       for(c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
+       }
+       else {
+               for(i = selmon->clients; i != selmon->sel; i = i->next)
+                       if(ISVISIBLE(i))
+                               c = i;
+               if(!c)
+                       for(; i; i = i->next)
+                               if(ISVISIBLE(i))
+                                       c = i;

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

-               restack();
+               restack(selmon);

        }
 }
 
        }
 }
 

-static Client *
-getclient(Window w) {
-       Client *c;
-
-       for(c = clients; c && c->win != w; c = c->next);
-       return c;
-}
-
-static unsigned long
+unsigned long

 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
 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);
+               die("error, cannot allocate color '%s'\n", colstr);

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

-static long
+Bool
+getrootpointer(int *x, int *y) {
+       int di;
+       unsigned int dui;
+       Window dummy;
+
+       return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
+}
+
+long

 getstate(Window w) {
        int format, status;
        long result = -1;
 getstate(Window w) {
        int format, status;
        long result = -1;


@@ -773,7 +869,7 @@ getstate(Window w) {
        return result;
 }
 
        return result;
 }
 

-static Bool
+Bool

 gettextprop(Window w, Atom atom, char *text, unsigned int size) {
        char **list = NULL;
        int n;
 gettextprop(Window w, Atom atom, char *text, unsigned int size) {
        char **list = NULL;
        int n;


@@ -789,8 +885,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);
                }


@@ -800,61 +895,60 @@ 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);
+       updatenumlockmask();
+       {
+               unsigned int i, j;
+               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+               XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+               if(focused) {
+                       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);
+       }
+}

 
 

-       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);
+void
+grabkeys(void) {
+       updatenumlockmask();
+       {
+               unsigned int i, j;
+               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+               KeyCode code;
+
+               XUngrabKey(dpy, AnyKey, AnyModifier, root);
+               for(i = 0; i < LENGTH(keys); i++) {
+                       if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+                               for(j = 0; j < LENGTH(modifiers); j++)
+                                       XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+                                                True, GrabModeAsync, GrabModeAsync);
+               }

        }
        }

-       else
-               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);

 }
 
 }
 

-static unsigned int
-idxoftag(const char *tag) {
+Monitor *
+idxtomon(unsigned int n) {

        unsigned int i;
        unsigned int i;

+       Monitor *m;

 
 

-       for(i = 0; i < ntags; i++)
-               if(tags[i] == tag)
-                       return i;
-       return 0;
+       for(m = mons, i = 0; m && i != n; m = m->next, i++);
+       return m;

 }
 
 }
 

-static void
+void

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

-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);

        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)


@@ -869,43 +963,22 @@ 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++;
                }
        }
        else {
                        xfonts++;
                }
        }
        else {

-               if(dc.font.xfont)
-                       XFreeFont(dpy, dc.font.xfont);
-               dc.font.xfont = NULL;

                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))

-               || !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-                       eprint("error, cannot load font: '%s'\n", fontstr);
+               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+                       die("error, cannot load font: '%s'\n", fontstr);

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

-static Bool
-isarrange(void (*func)())
-{
-       return func == layouts[ltidx].arrange;
-}
-
-static Bool
-isoccupied(unsigned int t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
-}
-
-static Bool
+Bool

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


@@ -920,148 +993,113 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

-static Bool
-isvisible(Client *c) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltags[i])
-                       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;
        unsigned int i;

-       KeyCode code;

        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;
 
        XEvent ev;
 

-       if(!sel)
+       if(!selmon->sel)

                return;
                return;

-       if(isprotodel(sel)) {
+       if(isprotodel(selmon->sel)) {

                ev.type = ClientMessage;
                ev.type = ClientMessage;

-               ev.xclient.window = sel->win;
+               ev.xclient.window = selmon->sel->win;

                ev.xclient.message_type = wmatom[WMProtocols];
                ev.xclient.format = 32;
                ev.xclient.data.l[0] = wmatom[WMDelete];
                ev.xclient.data.l[1] = CurrentTime;
                ev.xclient.message_type = wmatom[WMProtocols];
                ev.xclient.format = 32;
                ev.xclient.data.l[0] = wmatom[WMDelete];
                ev.xclient.data.l[1] = CurrentTime;

-               XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+               XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);

        }
        else
        }
        else

-               XKillClient(dpy, sel->win);
+               XKillClient(dpy, selmon->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;
+       static Client cz;

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

-       Window trans;
-       Status rettrans;
+       Window trans = None;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

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

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

-       c->x = wa->x;
-       c->y = wa->y;
+       if(XGetTransientForHint(dpy, w, &trans))
+               t = wintoclient(trans);
+       if(t) {
+               c->mon = t->mon;
+               c->tags = t->tags;
+       }
+       else {
+               c->mon = selmon;
+               applyrules(c);
+       }
+       /* geometry */
+       c->x = wa->x + c->mon->wx;
+       c->y = wa->y + c->mon->wy;

        c->w = wa->width;
        c->h = wa->height;
        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;
-               c->border = wa->border_width;
+       c->oldbw = wa->border_width;
+       if(c->w == c->mon->mw && c->h == c->mon->mh) {
+               c->x = c->mon->mx;
+               c->y = c->mon->my;
+               c->bw = 0;

        }
        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;
-       }
-       wc.border_width = c->border;
+               if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+                       c->x = c->mon->mx + c->mon->mw - WIDTH(c);
+               if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+                       c->y = c->mon->my + c->mon->mh - HEIGHT(c);
+               c->x = MAX(c->x, c->mon->mx);
+               /* only fix client y-offset, if the client center might cover the bar */
+               c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
+                          && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
+               c->bw = borderpx;
+       }
+       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);
        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);

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

-               c->isfloating = (rettrans == Success) || c->isfixed;
+               c->isfloating = trans != None || 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;


@@ -1070,278 +1108,237 @@ maprequest(XEvent *e) {
                return;
        if(wa.override_redirect)
                return;
                return;
        if(wa.override_redirect)
                return;

-       if(!getclient(ev->window))
+       if(!wintoclient(ev->window))

                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 

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

        XEvent ev;
 
        XEvent ev;
 

-       ocx = nx = c->x;
-       ocy = ny = c->y;
+       if(!(c = selmon->sel))
+               return;
+       restack(selmon);
+       ocx = c->x;
+       ocy = c->y;

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

-                       None, cursor[CurMove], CurrentTime) != GrabSuccess)
+       None, cursor[CurMove], CurrentTime) != GrabSuccess)
+               return;
+       if(!getrootpointer(&x, &y))

                return;
                return;

-       c->ismax = False;
-       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
-       for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+       do {
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);

                switch (ev.type) {
                switch (ev.type) {

-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;

                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:

-                       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);
+                       nx = ocx + (ev.xmotion.x - x);
+                       ny = ocy + (ev.xmotion.y - y);
+                       if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
+                               && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+                               if(abs(selmon->wx - nx) < snap)
+                                       nx = selmon->wx;
+                               else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
+                                       nx = selmon->wx + selmon->ww - WIDTH(c);
+                               if(abs(selmon->wy - ny) < snap)
+                                       ny = selmon->wy;
+                               else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
+                                       ny = selmon->wy + selmon->wh - HEIGHT(c);
+                               if(!c->isfloating && lt[selmon->sellt]->arrange
+                                                 && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                                       togglefloating(NULL);
+                       }
+                       if(!lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, True);

                        break;
                }
        }
                        break;
                }
        }

+       while(ev.type != ButtonRelease);
+       XUngrabPointer(dpy, CurrentTime);
+       if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+               sendmon(c, m);
+               selmon = m;
+               focus(NULL);
+       }

 }
 
 }
 

-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
+Monitor *
+pointertomon(int x, int y) {
+       Monitor *m;
+
+       for(m = mons; m; m = m->next)
+               if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
+                       return m;
+       return selmon;
+}
+
+void

 propertynotify(XEvent *e) {
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
 propertynotify(XEvent *e) {
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 

-       if(ev->state == PropertyDelete)
+       if((ev->window == root) && (ev->atom == XA_WM_NAME))
+               updatestatus();
+       else if(ev->state == PropertyDelete)

                return; /* ignore */
                return; /* ignore */

-       if((c = getclient(ev->window))) {
+       else if((c = wintoclient(ev->window))) {

                switch (ev->atom) {
                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 = (wintoclient(trans) != NULL)))
+                               arrange();
+                       break;
+               case XA_WM_NORMAL_HINTS:
+                       updatesizehints(c);
+                       break;
+               case XA_WM_HINTS:
+                       updatewmhints(c);
+                       drawbars();
+                       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);

-                       if(c == sel)
-                               drawbar();
+                       if(c == selmon->sel)
+                               drawbars();

                }
        }
 }
 
                }
        }
 }
 

-static void
-quit(const char *arg) {
-       readin = running = False;
-}
-
-static 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;
-                               }
-                       }
-               }
-               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;
-               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)
-               x = sw - w - 2 * c->border;
-       if(y > sh)
-               y = sh - h - 2 * c->border;
-       if(x + w + 2 * c->border < sx)
-               x = sx;
-       if(y + h + 2 * c->border < sy)
-               y = sy;
-       if(c->x != x || c->y != y || c->w != w || c->h != h) {
+void
+quit(const Arg *arg) {
+       running = False;
+}
+
+void
+resize(Client *c, int x, int y, int w, int h, Bool interact) {
+       XWindowChanges wc;
+
+       if(applysizehints(c, &x, &y, &w, &h, interact)) {

                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
                c->h = wc.height = 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;
+       Monitor *m;

        XEvent ev;
 
        XEvent ev;
 

+       if(!(c = selmon->sel))
+               return;
+       restack(selmon);

        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);
-       for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+       do {
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);

                switch(ev.type) {
                switch(ev.type) {

-               case ButtonRelease:
-                       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
-                                       c->w + c->border - 1, c->h + c->border - 1);
-                       XUngrabPointer(dpy, CurrentTime);
-                       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-                       return;

                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        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 >= selmon->wx && nw <= selmon->wx + selmon->ww
+                               && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
+                               if(!c->isfloating && lt[selmon->sellt]->arrange
+                                  && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                                       togglefloating(NULL);
+                       }
+                       if(!lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, c->x, c->y, nw, nh, True);

                        break;
                }
        }
                        break;
                }
        }

+       while(ev.type != ButtonRelease);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+       XUngrabPointer(dpy, CurrentTime);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+       if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+               sendmon(c, m);
+               selmon = m;
+               focus(NULL);
+       }

 }
 
 }
 

-static void
-restack(void) {
+void
+restack(Monitor *m) {

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

-       drawbar();
-       if(!sel)
+       drawbars();
+       if(!m->sel)

                return;
                return;

-       if(sel->isfloating || isarrange(floating))
-               XRaiseWindow(dpy, sel->win);
-       if(!isarrange(floating)) {
+       if(m->sel->isfloating || !lt[m->sellt]->arrange)
+               XRaiseWindow(dpy, m->sel->win);
+       if(lt[m->sellt]->arrange) {

                wc.stack_mode = Below;
                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;
-               }
+               wc.sibling = m->barwin;
+               for(c = m->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) {
 run(void) {

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

        XEvent ev;
 
        XEvent ev;
 

-       /* main event loop, also reads status text from stdin */
+       /* main event loop */

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

-       xfd = ConnectionNumber(dpy);
-       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 */
-               }
+       while(running && !XNextEvent(dpy, &ev)) {
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */

        }
 }
 
        }
 }
 

-static void
+void

 scan(void) {
        unsigned int i, num;
 scan(void) {
        unsigned int i, num;

-       Window *wins, d1, d2;
+       Window d1, d2, *wins = NULL;

        XWindowAttributes wa;
 
        XWindowAttributes wa;
 

-       wins = NULL;

        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)


@@ -1357,12 +1354,27 @@ scan(void) {
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }

+               if(wins)
+                       XFree(wins);

        }
        }

-       if(wins)
-               XFree(wins);

 }
 
 }
 

-static void
+void
+sendmon(Client *c, Monitor *m) {
+       if(c->mon == m)
+               return;
+       unfocus(c);
+       detach(c);
+       detachstack(c);
+       c->mon = m;
+       c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
+       attach(c);
+       attachstack(c);
+       focus(NULL);
+       arrange();
+}
+
+void

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


@@ -1370,183 +1382,144 @@ 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;
-       }
-       if(sel)
+void
+setlayout(const Arg *arg) {
+       if(!arg || !arg->v || arg->v != lt[selmon->sellt])
+               selmon->sellt ^= 1;
+       if(arg && arg->v)
+               lt[selmon->sellt] = (Layout *)arg->v;
+       if(selmon->sel)

                arrange();
        else
                arrange();
        else

-               drawbar();
+               drawbars();

 }
 
 }
 

-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[selmon->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 + selmon->mfact : arg->f - 1.0;
+       if(f < 0.1 || f > 0.9)
+               return;
+       selmon->mfact = f;

        arrange();
 }
 
        arrange();
 }
 

-static void
+void

 setup(void) {
 setup(void) {

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

        XSetWindowAttributes wa;
 
        XSetWindowAttributes wa;
 

+       /* init screen */
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+       initfont(font);
+       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);

-       wmatom[WMName] = XInternAtom(dpy, "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);
        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);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init cursors */
        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();
-       for(ntags = 0; tags[ntags]; ntags++);
-       seltags = emallocz(sizeof(Bool) * ntags);
-       seltags[0] = True;
-

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

-       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
-       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-       dc.sel[ColBG] = getcolor(SELBGCOLOR);
-       dc.sel[ColFG] = getcolor(SELFGCOLOR);
-       initfont(FONT);
-       dc.h = bh = dc.font.height + 2;
-
-       /* 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;
-       }
-
-       /* init bar */
-       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);
-       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);
+       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, NULL);

        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);

+       /* init bars */
+       for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+               w = TEXTW(layouts[i].symbol);
+               blw = MAX(blw, w);
+       }
+       updatebars();
+       updatestatus();
+       /* EWMH support per view */
+       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char *) netatom, NetLast);
+       /* select for events */
+       wa.cursor = cursor[CurNormal];
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
+                       |PropertyChangeMask;
+       XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+       XSelectInput(dpy, root, wa.event_mask);
+       grabkeys();
+}

 
 

-       /* multihead support */
-       selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+void
+showhide(Client *c) {
+       if(!c)
+               return;
+       if(ISVISIBLE(c)) { /* show clients top down */
+               XMoveWindow(dpy, c->win, c->x, c->y);
+               if(!lt[c->mon->sellt]->arrange || c->isfloating)
+                       resize(c, c->x, c->y, c->w, c->h, False);
+               showhide(c->snext);
+       }
+       else { /* hide clients bottom up */
+               showhide(c->snext);
+               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       }

 }
 
 }
 

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

 
 

-       if(!shell && !(shell = getenv("SHELL")))
-               shell = "/bin/sh";
-       if(!arg)
-               return;
-       /* The double-fork construct avoids zombie processes and keeps the code
-        * clean from stupid signal handlers. */
+void
+sigchld(int signal) {
+       while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
+void
+spawn(const Arg *arg) {
+       signal(SIGCHLD, sigchld);

        if(fork() == 0) {
        if(fork() == 0) {

-               if(fork() == 0) {
-                       if(dpy)
-                               close(ConnectionNumber(dpy));
-                       setsid();
-                       execl(shell, shell, "-c", arg, (char *)NULL);
-                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
-                       perror(" failed");
-               }
+               if(dpy)
+                       close(ConnectionNumber(dpy));
+               setsid();
+               execvp(((char **)arg->v)[0], (char **)arg->v);
+               fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
+               perror(" failed");

                exit(0);
        }
                exit(0);
        }

-       wait(0);

 }
 
 }
 

-static void
-tag(const char *arg) {
-       unsigned int i;
+void
+tag(const Arg *arg) {
+       if(selmon->sel && arg->ui & TAGMASK) {
+               selmon->sel->tags = arg->ui & TAGMASK;
+               arrange();
+       }
+}

 
 

-       if(!sel)
+void
+tagmon(const Arg *arg) {
+       Monitor *m;
+
+       if(!selmon->sel || !(m = idxtomon(arg->ui)))

                return;
                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();
+       sendmon(selmon->sel, m);

 }
 
 }
 

-static unsigned int
+int

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


@@ -1557,243 +1530,349 @@ 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
-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
+void
+tile(Monitor *m) {
+       int x, y, h, w, mw;
+       unsigned int 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(m->clients); c; c = nexttiled(c->next), n++);
+       if(n == 0)
+               return;
+       /* master */
+       c = nexttiled(m->clients);
+       mw = m->mfact * m->ww;
+       resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);
+       if(--n == 0)
+               return;
+       /* tile stack */
+       x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
+       y = m->wy;
+       w = (m->wx + mw > c->x + c->w) ? m->wx + m->ww - x : m->ww - mw;
+       h = m->wh / n;
+       if(h < bh)
+               h = m->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)
+                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);
+               if(h != m->wh)
+                       y = c->y + HEIGHT(c);

        }
 }
 
        }
 }
 

-static void
-togglebar(const char *arg) {
-       if(bpos == BarOff)
-               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-       else
-               bpos = BarOff;
-       updatebarpos();
+void
+togglebar(const Arg *arg) {
+       selmon->showbar = !selmon->showbar;
+       updatebarpos(selmon);
+       XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);

        arrange();
 }
 
        arrange();
 }
 

-static void
-togglefloating(const char *arg) {
-       if(!sel)
+void
+togglefloating(const Arg *arg) {
+       if(!selmon->sel)

                return;
                return;

-       sel->isfloating = !sel->isfloating;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+       selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+       if(selmon->sel->isfloating)
+               resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+                      selmon->sel->w, selmon->sel->h, False);

        arrange();
 }
 
        arrange();
 }
 

-static void
-togglemax(const char *arg) {
-       XEvent ev;
+void
+toggletag(const Arg *arg) {
+       unsigned int mask;

 
 

-       if(!sel || (!isarrange(floating) && !sel->isfloating) || sel->isfixed)
+       if(!selmon->sel)

                return;
                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);
+       mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
+       if(mask) {
+               selmon->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;
-
-       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();
-}
+void
+toggleview(const Arg *arg) {
+       unsigned int mask = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);

 
 

-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();
+       if(mask) {
+               selmon->tagset[selmon->seltags] = mask;
+               arrange();
+       }

 }
 
 }
 

-static void
-unban(Client *c) {
-       if(!c->isbanned)
+void
+unfocus(Client *c) {
+       if(!c)

                return;
                return;

-       XMoveWindow(dpy, c->win, c->x, c->y);
-       c->isbanned = False;
+       grabbuttons(c, False);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

 }
 
 }
 

-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);
        XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
        detach(c);
        detachstack(c);
        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
        XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
        detach(c);
        detachstack(c);

-       if(sel == c)
-               focus(NULL);

        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);
        XUngrabServer(dpy);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

+       focus(NULL);

        arrange();
 }
 
        arrange();
 }
 

-static void
+void

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

-       if((c = getclient(ev->window)))
+       if((c = wintoclient(ev->window)))

                unmanage(c);
 }
 
                unmanage(c);
 }
 

-static void
-updatebarpos(void) {
-       XEvent ev;
+void
+updatebars(void) {
+       Monitor *m;
+       XSetWindowAttributes wa;

 
 

-       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;
+       wa.override_redirect = True;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask|ExposureMask;
+       for(m = mons; m; m = m->next) {
+               m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
+                                         CopyFromParent, DefaultVisual(dpy, screen),
+                                         CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+               XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
+               XMapRaised(dpy, m->barwin);

        }
        }

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

 }
 
 }
 

-static void
+void
+updatebarpos(Monitor *m) {
+       m->wy = m->my;
+       m->wh = m->mh;
+       if(m->showbar) {
+               m->wh -= bh;
+               m->by = m->topbar ? m->wy : m->wy + m->wh;
+               m->wy = m->topbar ? m->wy + bh : m->wy;
+       }
+       else
+               m->by = -bh;
+}
+
+void
+updategeom(void) {
+       int i, n = 1;
+       Client *c;
+       Monitor *newmons = NULL, *m, *tm;
+
+#ifdef XINERAMA
+       XineramaScreenInfo *info = NULL;
+
+       if(XineramaIsActive(dpy))
+               info = XineramaQueryScreens(dpy, &n);
+#endif /* XINERAMA */
+       /* allocate monitor(s) for the new geometry setup */
+       for(i = 0; i < n; i++) {
+               m = (Monitor *)malloc(sizeof(Monitor));
+               m->next = newmons;
+               newmons = m;
+       }
+       /* initialise monitor(s) */
+#ifdef XINERAMA
+       if(XineramaIsActive(dpy)) {
+               for(i = 0, m = newmons; m; m = m->next, i++) {
+                       m->screen_number = info[i].screen_number;
+                       m->mx = m->wx = info[i].x_org;
+                       m->my = m->wy = info[i].y_org;
+                       m->mw = m->ww = info[i].width;
+                       m->mh = m->wh = info[i].height;
+               }
+               XFree(info);
+       }
+       else
+#endif /* XINERAMA */
+       /* default monitor setup */
+       {
+               m->screen_number = 0;
+               m->mx = m->wx = 0;
+               m->my = m->wy = 0;
+               m->mw = m->ww = sw;
+               m->mh = m->wh = sh;
+       }
+       /* bar geometry setup */
+       for(m = newmons; m; m = m->next) {
+               m->sel = m->stack = m->clients = NULL;
+               m->seltags = 0;
+               m->sellt = 0;
+               m->tagset[0] = m->tagset[1] = 1;
+               m->mfact = mfact;
+               m->showbar = SHOWBAR;
+               m->topbar = TOPBAR;
+               updatebarpos(m);
+       }
+       /* reassign left over clients of disappeared monitors */
+       for(tm = mons; tm; tm = tm->next)
+               while(tm->clients) {
+                       c = tm->clients;
+                       tm->clients = c->next;
+                       detachstack(c);
+                       c->mon = newmons;
+                       attach(c);
+                       attachstack(c);
+               }
+       /* select focused monitor */
+       cleanupmons();
+       selmon = mons = newmons;
+       selmon = wintomon(root);
+}
+
+void
+updatenumlockmask(void) {
+       unsigned int i, j;
+       XModifierKeymap *modmap;
+
+       numlockmask = 0;
+       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);
+}
+
+void

 updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
 updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 

-       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+               /* size is uninitialized, ensure that size.flags aren't used */

                size.flags = PSize;
                size.flags = PSize;

-       c->flags = size.flags;
-       if(c->flags & PBaseSize) {
+       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->isfixed = (c->maxw && c->minw && c->maxh && c->minh

-                       && 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))
 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))

-               gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+               gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
+}
+
+void
+updatestatus(void) {
+       if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+               strcpy(stext, "dwm-"VERSION);
+       drawbar(selmon);
+}
+
+void
+updatewmhints(Client *c) {
+       XWMHints *wmh;
+
+       if((wmh = XGetWMHints(dpy, c->win))) {
+               if(c == selmon->sel && wmh->flags & XUrgencyHint) {
+                       wmh->flags &= ~XUrgencyHint;
+                       XSetWMHints(dpy, c->win, wmh);
+               }
+               else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+               XFree(wmh);
+       }
+}
+
+void
+view(const Arg *arg) {
+       if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+               return;
+       selmon->seltags ^= 1; /* toggle sel tagset */
+       if(arg->ui & TAGMASK)
+               selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+       arrange();
+}
+
+Client *
+wintoclient(Window w) {
+       Client *c;
+       Monitor *m;
+
+       for(m = mons; m; m = m->next)
+               for(c = m->clients; c; c = c->next)
+                       if(c->win == w)
+                               return c;
+       return NULL;
+}
+
+Monitor *
+wintomon(Window w) {
+       int x, y;
+       Client *c;
+       Monitor *m;
+
+       if(w == root && getrootpointer(&x, &y))
+               return pointertomon(x, y);
+       for(m = mons; m; m = m->next)
+               if(w == m->barwin)
+                       return m;
+       if((c = wintoclient(w)))
+               return c->mon;
+       return selmon;

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


@@ -1801,47 +1880,38 @@ 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 = selmon->sel;

 
 

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

                return;
                return;

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

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


@@ -1852,23 +1922,18 @@ zoom(const char *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

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

        else if(argc != 1)
        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);
-
+               die("usage: dwm [-v]\n");
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fputs("warning: no locale support\n", stderr);
+       if(!(dpy = XOpenDisplay(NULL)))
+               die("dwm: cannot open display\n");

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

-       drawbar();

        scan();
        run();
        cleanup();
        scan();
        run();
        cleanup();

-

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