applied Nicolas Capit's patch as interim solution until the multiscreen support is...

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index a122180..f842b41 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -6,18 +6,15 @@
  * 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
  *
  * 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.
+ * set the override_redirect flag.  Clients are organized in a linked client
+ * list on each monitor, the focus history is remembered through a stack list
+ * on each monitor. Each client contains a bit array to indicate the tags of a
+ * client.

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


@@ -26,49 +23,75 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <locale.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 <sys/types.h>
 #include <sys/wait.h>

-#include <regex.h>

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

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

 
 /* macros */
 
 /* macros */

-#define BUTTONMASK             (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)                (mask & ~(numlockmask|LockMask))
-#define LENGTH(x)              (sizeof x / sizeof x[0])
-#define MAXTAGLEN              16
-#define MOUSEMASK              (BUTTONMASK|PointerMotionMask)
+#define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
+#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                 ((1 << LENGTH(tags)) - 1)
+#define TEXTW(X)                (textnw(X, strlen(X)) + dc.font.height)

 
 /* enums */
 
 /* enums */

-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, NetWMState,
+       NetWMFullscreen, NetActiveWindow, NetLast };     /* EWMH atoms */
+enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
+
+typedef union {
+       int i;
+       unsigned int ui;
+       float f;
+       const 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;
+       int oldx, oldy, oldw, oldh;

        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, isfloating, isurgent;
-       Bool *tags;
+       int bw, oldbw;
+       unsigned int tags;
+       Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;

        Client *next;
        Client *next;

-       Client *prev;

        Client *snext;
        Client *snext;

+       Monitor *mon;

        Window win;
 };
 
        Window win;
 };
 


@@ -88,113 +111,151 @@ 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 {
+       char ltsymbol[16];
+       float mfact;
+       int num;
+       int by;               /* 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;
+       const Layout *lt[2];
+};
+

 typedef struct {
 typedef struct {

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

        Bool isfloating;
        Bool isfloating;

+       int monitor;

 } Rule;
 
 /* function declarations */
 } Rule;
 
 /* function declarations */

-void applyrules(Client *c);
-void arrange(void);
-void attach(Client *c);
-void attachstack(Client *c);
-void ban(Client *c);
-void buttonpress(XEvent *e);
-void checkotherwm(void);
-void cleanup(void);
-void configure(Client *c);
-void configurenotify(XEvent *e);
-void configurerequest(XEvent *e);
-void destroynotify(XEvent *e);
-void detach(Client *c);
-void detachstack(Client *c);
-void drawbar(void);
-void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
-void *emallocz(unsigned int size);
-void enternotify(XEvent *e);
-void eprint(const char *errstr, ...);
-void expose(XEvent *e);
-void floating(void); /* default floating layout */
-void focus(Client *c);
-void focusin(XEvent *e);
-void focusnext(const char *arg);
-void focusprev(const char *arg);
-Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
-long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-void grabbuttons(Client *c, Bool focused);
-void grabkeys(void);
-unsigned int idxoftag(const char *t);
-void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
-Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c);
-void keypress(XEvent *e);
-void killclient(const char *arg);
-void manage(Window w, XWindowAttributes *wa);
-void mappingnotify(XEvent *e);
-void maprequest(XEvent *e);
-void monocle(void);
-void movemouse(Client *c);
-Client *nexttiled(Client *c);
-void propertynotify(XEvent *e);
-void quit(const char *arg);
-void reapply(const char *arg);
-void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-void resizemouse(Client *c);
-void restack(void);
-void run(void);
-void scan(void);
-void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
-void setup(void);
-void spawn(const char *arg);
-void tag(const char *arg);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
-void tile(void);
-void togglefloating(const char *arg);
-void toggletag(const char *arg);
-void toggleview(const char *arg);
-void unban(Client *c);
-void unmanage(Client *c);
-void unmapnotify(XEvent *e);
-void updatesizehints(Client *c);
-void updatetitle(Client *c);
-void updatewmhints(Client *c);
-void view(const char *arg);
-void viewprevtag(const char *arg);     /* views previous selected tags */
-int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dpy, XErrorEvent *ee);
-int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
-void selectview(const char *arg);
+static void applyrules(Client *c);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
+static void arrange(Monitor *m);
+static void arrangemon(Monitor *m);
+static void attach(Client *c);
+static void attachstack(Client *c);
+static void buttonpress(XEvent *e);
+static void checkotherwm(void);
+static void cleanup(void);
+static void cleanupmon(Monitor *mon);
+static void clearurgent(Client *c);
+static void clientmessage(XEvent *e);
+static void configure(Client *c);
+static void configurenotify(XEvent *e);
+static void configurerequest(XEvent *e);
+static Monitor *createmon(void);
+static void destroynotify(XEvent *e);
+static void detach(Client *c);
+static void detachstack(Client *c);
+static void die(const char *errstr, ...);
+static Monitor *dirtomon(int dir);
+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 expose(XEvent *e);
+static void focus(Client *c);
+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 Bool getrootptr(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 void grabkeys(void);
+static void initfont(const char *fontstr);
+static void keypress(XEvent *e);
+static void killclient(const Arg *arg);
+static void manage(Window w, XWindowAttributes *wa);
+static void mappingnotify(XEvent *e);
+static void maprequest(XEvent *e);
+static void monocle(Monitor *m);
+static void movemouse(const Arg *arg);
+static Client *nexttiled(Client *c);
+static void pop(Client *);
+static void propertynotify(XEvent *e);
+static Monitor *ptrtomon(int x, int y);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact);
+static void resizeclient(Client *c, int x, int y, int w, int h);
+static void resizemouse(const Arg *arg);
+static void restack(Monitor *m);
+static void run(void);
+static void scan(void);
+static Bool sendevent(Client *c, Atom proto);
+static void sendmon(Client *c, Monitor *m);
+static void setclientstate(Client *c, long state);
+static void setfocus(Client *c);
+static void setlayout(const Arg *arg);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void showhide(Client *c);
+static void sigchld(int unused);
+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, Bool setfocus);
+static void unmanage(Client *c, Bool destroyed);
+static void unmapnotify(XEvent *e);
+static Bool updategeom(void);
+static void updatebarpos(Monitor *m);
+static void updatebars(void);
+static void updatenumlockmask(void);
+static void updatesizehints(Client *c);
+static void updatestatus(void);
+static void updatetitle(Client *c);
+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 xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);

 
 /* variables */
 
 /* variables */

-char stext[256], buf[256];
-double mwfact;
-int screen, sx, sy, sw, sh;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
-unsigned int numlockmask = 0;
-void (*handler[LASTEvent]) (XEvent *) = {
+static const char broken[] = "broken";
+static char stext[256];
+static int screen;
+static int sw, sh;           /* X display screen geometry width, height */
+static int bh, blw = 0;      /* bar geometry */
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned int numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {

        [ButtonPress] = buttonpress,
        [ButtonPress] = buttonpress,

+       [ClientMessage] = clientmessage,

        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,


@@ -207,183 +268,301 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };

-Atom wmatom[WMLast], netatom[NetLast];
-Bool dozoom = True;
-Bool otherwm, readin;
-Bool running = True;
-Bool *prevtags;
-Bool *seltags;
-Client *clients = NULL;
-Client *sel = NULL;
-Client *stack = NULL;
-Cursor cursor[CurLast];
-Display *dpy;
-DC dc = {0};
-Layout *lt;
-Window root, barwin;
+static Atom wmatom[WMLast], netatom[NetLast];
+static Bool running = True;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc;
+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"

-#define TAGSZ (LENGTH(tags) * sizeof(Bool))
-static Bool tmp[LENGTH(tags)];

 
 

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

 
 

+/* function implementations */

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

+       const char *class, *instance;

        unsigned int i;
        unsigned int i;

-       Bool matched = False;
-       Rule *r;
+       const Rule *r;
+       Monitor *m;

        XClassHint ch = { 0 };
 
        /* rule matching */
        XClassHint ch = { 0 };
 
        /* rule matching */

-       XGetClassHint(dpy, c->win, &ch);
-       for(i = 0; i < LENGTH(rules); i++) {
-               r = &rules[i];
-               if(strstr(c->name, r->prop)
-               || (ch.res_class && strstr(ch.res_class, r->prop))
-               || (ch.res_name && strstr(ch.res_name, r->prop)))
-               {
-                       c->isfloating = r->isfloating;
-                       if(r->tag) {
-                               c->tags[idxoftag(r->tag)] = True;
-                               matched = True;
+       c->isfloating = c->tags = 0;
+       if(XGetClassHint(dpy, c->win, &ch)) {
+               class = ch.res_class ? ch.res_class : broken;
+               instance = ch.res_name ? ch.res_name : broken;
+               for(i = 0; i < LENGTH(rules); i++) {
+                       r = &rules[i];
+                       if((!r->title || strstr(c->name, r->title))
+                       && (!r->class || strstr(class, r->class))
+                       && (!r->instance || strstr(instance, r->instance)))
+                       {
+                               c->isfloating = r->isfloating;
+                               c->tags |= r->tags;
+                               for(m = mons; m && m->num != r->monitor; m = m->next);
+                               if(m)
+                                       c->mon = m;

                        }
                }
                        }
                }

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

        }
        }

-       if(ch.res_class)
-               XFree(ch.res_class);
-       if(ch.res_name)
-               XFree(ch.res_name);
-       if(!matched)
-               memcpy(c->tags, seltags, TAGSZ);
+       c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];

 }
 
 }
 

-void
-arrange(void) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       unban(c);
-               else
-                       ban(c);
+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 + 0.5;
+                       else if(c->mina < (float)*h / *w)
+                               *h = *w * c->mina + 0.5;
+               }
+               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 = MAX(*w + c->basew, c->minw);
+               *h = MAX(*h + c->baseh, 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;
+}

 
 

+void
+arrange(Monitor *m) {
+       if(m)
+               showhide(m->stack);
+       else for(m = mons; m; m = m->next)
+               showhide(m->stack);

        focus(NULL);
        focus(NULL);

-       lt->arrange();
-       restack();
+       if(m)
+               arrangemon(m);
+       else for(m = mons; m; m = m->next)
+               arrangemon(m);

 }
 
 void
 }
 
 void

-attach(Client *c) {
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
+arrangemon(Monitor *m) {
+       strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
+       if(m->lt[m->sellt]->arrange)
+               m->lt[m->sellt]->arrange(m);
+       restack(m);

 }
 
 void
 }
 
 void

-attachstack(Client *c) {
-       c->snext = stack;
-       stack = c;
+attach(Client *c) {
+       c->next = c->mon->clients;
+       c->mon->clients = c;

 }
 
 void
 }
 
 void

-ban(Client *c) {
-       if(c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);
-       c->isbanned = True;
+attachstack(Client *c) {
+       c->snext = c->mon->stack;
+       c->mon->stack = c;

 }
 
 void
 buttonpress(XEvent *e) {
 }
 
 void
 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(ev->window == barwin) {
-               x = 0;
-               for(i = 0; i < LENGTH(tags); 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, True);
+               selmon = m;
+               focus(NULL);
+       }
+       if(ev->window == selmon->barwin) {
+               i = x = 0;
+               do {
+                       x += TEXTW(tags[i]);
+               } while(ev->x >= x && ++i < LENGTH(tags));
+               if(i < LENGTH(tags)) {
+                       click = ClkTagBar;
+                       arg.ui = 1 << i;

                }
                }

+               else if(ev->x < x + blw)
+                       click = ClkLtSymbol;
+               else if(ev->x > 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) {
-                       restack();
-                       movemouse(c);
-               }
-               else if(ev->button == Button2) {
-                       if((floating != lt->arrange) && c->isfloating)
-                               togglefloating(NULL);
-                       else
-                               zoom(NULL);
-               }
-               else if(ev->button == Button3 && !c->isfixed) {
-                       restack();
-                       resizemouse(c);
-               }
+               click = ClkClientWin;

        }
        }

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

 }
 
 void
 checkotherwm(void) {
 }
 
 void
 checkotherwm(void) {

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

        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);

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

        XSync(dpy, False);
 }
 
 void
 cleanup(void) {
        XSync(dpy, False);
 }
 
 void
 cleanup(void) {

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

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

-

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

-       XDestroyWindow(dpy, barwin);
+       while(mons)
+               cleanupmon(mons);

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

+void
+cleanupmon(Monitor *mon) {
+       Monitor *m;
+
+       if(mon == mons)
+               mons = mons->next;
+       else {
+               for(m = mons; m && m->next != mon; m = m->next);
+               m->next = mon->next;
+       }
+       XUnmapWindow(dpy, mon->barwin);
+       XDestroyWindow(dpy, mon->barwin);
+       free(mon);
+}
+
+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
+clientmessage(XEvent *e) {
+       XClientMessageEvent *cme = &e->xclient;
+       Client *c = wintoclient(cme->window);
+
+       if(!c)
+               return;
+       if(cme->message_type == netatom[NetWMState] && cme->data.l[1] == netatom[NetWMFullscreen]) {
+               if(cme->data.l[0]) {
+                       XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
+                                       PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+                       c->isfullscreen = True;
+                       c->oldstate = c->isfloating;
+                       c->oldbw = c->bw;
+                       c->bw = 0;
+                       c->isfloating = True;
+                       resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+                       XRaiseWindow(dpy, c->win);
+               }
+               else {
+                       XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
+                                       PropModeReplace, (unsigned char*)0, 0);
+                       c->isfullscreen = False;
+                       c->isfloating = c->oldstate;
+                       c->bw = c->oldbw;
+                       c->x = c->oldx;
+                       c->y = c->oldy;
+                       c->w = c->oldw;
+                       c->h = c->oldh;
+                       resizeclient(c, c->x, c->y, c->w, c->h);
+                       arrange(c->mon);
+               }
+       }
+       else if(cme->message_type == netatom[NetActiveWindow]) {
+               if(!ISVISIBLE(c)) {
+                       c->mon->seltags ^= 1;
+                       c->mon->tagset[c->mon->seltags] = c->tags;
+               }
+               pop(c);
+       }
+}
+

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


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

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

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


@@ -404,44 +583,53 @@ configure(Client *c) {
 
 void
 configurenotify(XEvent *e) {
 
 void
 configurenotify(XEvent *e) {

+       Monitor *m;

        XConfigureEvent *ev = &e->xconfigure;
        XConfigureEvent *ev = &e->xconfigure;

+       Bool dirty;

 
 

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

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

-               XFreePixmap(dpy, dc.drawable);
-               dc.drawable = XCreatePixmap(dpy, root, BW, bh, DefaultDepth(dpy, screen));
-               XMoveResizeWindow(dpy, barwin, BX, BY, BW, bh);
-               arrange();
+               if(updategeom() || dirty) {
+                       if(dc.drawable != 0)
+                               XFreePixmap(dpy, dc.drawable);
+                       dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+                       updatebars();
+                       for(m = mons; m; m = m->next)
+                               XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+                       arrange(NULL);
+               }

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

+       Monitor *m;

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

-       if((c = getclient(ev->window))) {
+       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 || (floating == lt->arrange)) {
+                       c->bw = ev->border_width;
+               else if(c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
+                       m = c->mon;

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

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

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

-                               c->y = sy + 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 - sx + c->w) > sw && c->isfloating)
-                               c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
-                       if((c->y - sy + c->h) > sh && c->isfloating)
-                               c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
-                       if((ev->value_mask & (CWX|CWY))
-                       && !(ev->value_mask & (CWWidth|CWHeight)))
+                       if((c->x + c->w) > m->mx + m->mw && c->isfloating)
+                               c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */
+                       if((c->y + c->h) > m->my + 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


@@ -460,129 +648,169 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

+Monitor *
+createmon(void) {
+       Monitor *m;
+
+       if(!(m = (Monitor *)calloc(1, sizeof(Monitor))))
+               die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
+       m->tagset[0] = m->tagset[1] = 1;
+       m->mfact = mfact;
+       m->showbar = showbar;
+       m->topbar = topbar;
+       m->lt[0] = &layouts[0];
+       m->lt[1] = &layouts[1 % LENGTH(layouts)];
+       strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+       return m;
+}
+

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

-       if((c = getclient(ev->window)))
-               unmanage(c);
+       if((c = wintoclient(ev->window)))
+               unmanage(c, True);

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

-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
-               clients = c->next;
-       c->next = c->prev = NULL;
+       Client **tc;
+
+       for(tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
+       *tc = c->next;

 }
 
 void
 detachstack(Client *c) {
 }
 
 void
 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;
+       }

 }
 
 void
 }
 
 void

-drawbar(void) {
-       int i, x;
+die(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
+Monitor *
+dirtomon(int dir) {
+       Monitor *m = NULL;
+
+       if(dir > 0) {
+               if(!(m = selmon->next))
+                       m = mons;
+       }
+       else {
+               if(selmon == mons)
+                       for(m = mons; m->next; m = m->next);
+               else
+                       for(m = mons; m->next != selmon; m = m->next);
+       }
+       return m;
+}
+
+void
+drawbar(Monitor *m) {
+       int x;
+       unsigned int i, occ = 0, urg = 0;
+       unsigned long *col;

        Client *c;
 
        Client *c;
 

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

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

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

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

-               dc.w = textw(tags[i]);
-               if(seltags[i]) {
-                       drawtext(tags[i], dc.sel, isurgent(i));
-                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
-               }
-               else {
-                       drawtext(tags[i], dc.norm, isurgent(i));
-                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
-               }
+               dc.w = TEXTW(tags[i]);
+               col = 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;
        }
                dc.x += dc.w;
        }

-       dc.w = blw;
-       drawtext(lt->symbol, dc.norm, False);
-       x = dc.x + dc.w;
-       dc.w = textw(stext);
-       dc.x = BW - dc.w;
-       if(dc.x < x) {
-               dc.x = x;
-               dc.w = BW - x;
+       dc.w = blw = TEXTW(m->ltsymbol);
+       drawtext(m->ltsymbol, dc.norm, False);
+       dc.x += dc.w;
+       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);

        }
        }

-       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(c) {
-                       drawtext(c->name, dc.sel, False);
-                       drawsquare(False, c->isfloating, False, 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
                        drawtext(NULL, dc.norm, False);
        }
                }
                else
                        drawtext(NULL, dc.norm, False);
        }

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

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

+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;
 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 };

 
 

-       gcv.foreground = col[invert ? ColBG : ColFG];
-       XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+       XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);

        x = (dc.font.ascent + dc.font.descent + 2) / 4;
        x = (dc.font.ascent + dc.font.descent + 2) / 4;

-       r.x = dc.x + 1;
-       r.y = dc.y + 1;
-       if(filled) {
-               r.width = r.height = x + 1;
-               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       }
-       else if(empty) {
-               r.width = r.height = x;
-               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       }
+       if(filled)
+               XFillRectangle(dpy, dc.drawable, dc.gc, dc.x+1, dc.y+1, x+1, x+1);
+       else if(empty)
+               XDrawRectangle(dpy, dc.drawable, dc.gc, dc.x+1, dc.y+1, x, x);

 }
 
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 }
 
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {

-       int x, y, w, h;
-       unsigned int len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+       char buf[256];
+       int i, x, y, h, len, olen;

 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);

-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       XFillRectangle(dpy, dc.drawable, dc.gc, dc.x, dc.y, dc.w, dc.h);

        if(!text)
                return;
        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 */
+       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);
        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);


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

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

 void
 enternotify(XEvent *e) {
        Client *c;
 void
 enternotify(XEvent *e) {
        Client *c;

+       Monitor *m;

        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;

-       if((c = getclient(ev->window)))
-               focus(c);
-       else
-               focus(NULL);
-}
-
-void
-eprint(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
+       c = wintoclient(ev->window);
+       if((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel, True);
+               selmon = m;
+       }
+       else if(c == selmon->sel || c == NULL)
+               return;
+       focus((wintoclient(ev->window)));

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

+       Monitor *m;

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

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

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

-       if(!c || (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(lt->arrange == monocle)
-                       resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-       }
+       if(!c || !ISVISIBLE(c))
+               for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+       /* was if(selmon->sel) */
+       if(selmon->sel && selmon->sel != c)
+               unfocus(selmon->sel, False);

        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);

-               if(lt->arrange == monocle) {
-                       if(sel != c) {
-                               c->rx = c->x;
-                               c->ry = c->y;
-                               c->rw = c->w;
-                               c->rh = c->h;
-                       }
-                       resize(c, MOX, MOY, MOW, MOH, RESIZEHINTS);
-               }
-       }
-       sel = c;
-       if(c) {

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

-               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+               setfocus(c);

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

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

 }
 
 void
 focusin(XEvent *e) { /* there are some broken focus acquiring clients */
        XFocusChangeEvent *ev = &e->xfocus;
 
 }
 
 void
 focusin(XEvent *e) { /* there are some broken focus acquiring clients */
        XFocusChangeEvent *ev = &e->xfocus;
 

-       if(sel && ev->window != sel->win)
-               XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
+       if(selmon->sel && ev->window != selmon->sel->win)
+               setfocus(selmon->sel);

 }
 
 void
 }
 
 void

-focusnext(const char *arg) {
-       Client *c;
+focusmon(const Arg *arg) {
+       Monitor *m;

 
 

-       if(!sel)
+       if(!mons->next)

                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();
-       }
+       if((m = dirtomon(arg->i)) == selmon)
+               return;
+       unfocus(selmon->sel, True);
+       selmon = m;
+       focus(NULL);

 }
 
 void
 }
 
 void

-focusprev(const char *arg) {
-       Client *c;
+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);

        }
 }
 
        }
 }
 

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

 unsigned long
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
 unsigned long
 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;
 }
 

+Bool
+getrootptr(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) {
 long
 getstate(Window w) {

-       int format, status;
+       int format;

        long result = -1;
        unsigned char *p = NULL;
        unsigned long n, extra;
        Atom real;
 
        long result = -1;
        unsigned char *p = NULL;
        unsigned long n, extra;
        Atom real;
 

-       status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-                       &real, &format, &n, &extra, (unsigned char **)&p);
-       if(status != Success)
+       if(XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
+                             &real, &format, &n, &extra, (unsigned char **)&p) != Success)

                return -1;
        if(n != 0)
                result = *p;
                return -1;
        if(n != 0)
                result = *p;


@@ -765,8 +967,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
        if(name.encoding == XA_STRING)
                strncpy(text, (char *)name.value, size - 1);
        else {
        if(name.encoding == XA_STRING)
                strncpy(text, (char *)name.value, size - 1);
        else {

-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-               && n > 0 && *list) {
+               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {

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


@@ -778,86 +979,50 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
 
 void
 grabbuttons(Client *c, Bool focused) {

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

        }
        }

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

 }
 
 void
 }
 
 void

-grabkeys(void)  {
-       unsigned int i, j;
-       KeyCode code;
-       XModifierKeymap *modmap;
-
-       /* init modifier map */
-       modmap = XGetModifierMapping(dpy);
-       for(i = 0; i < 8; i++)
-               for(j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               numlockmask = (1 << i);
+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);

                }
                }

-       XFreeModifiermap(modmap);
-
-       XUngrabKey(dpy, AnyKey, AnyModifier, root);
-       for(i = 0; i < LENGTH(keys); i++) {
-               code = XKeysymToKeycode(dpy, keys[i].keysym);
-               XGrabKey(dpy, code, keys[i].mod, root, True,
-                               GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
-                               GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
-                               GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
-                               GrabModeAsync, GrabModeAsync);

        }
 }
 
        }
 }
 

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

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

-       int i, n;
+       int n;

 
        missing = NULL;
 
        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--)


@@ -865,77 +1030,38 @@ initfont(const char *fontstr) {
                XFreeStringList(missing);
        }
        if(dc.font.set) {
                XFreeStringList(missing);
        }
        if(dc.font.set) {

-               XFontSetExtents *font_extents;

                XFontStruct **xfonts;
                char **font_names;
                XFontStruct **xfonts;
                char **font_names;

+

                dc.font.ascent = dc.font.descent = 0;
                dc.font.ascent = dc.font.descent = 0;

-               font_extents = XExtentsOfFontSet(dc.font.set);
+               XExtentsOfFontSet(dc.font.set);

                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                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;
+               while(n--) {
+                       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))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))

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

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

-Bool
-isoccupied(unsigned int t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
-}
-
-Bool
-isprotodel(Client *c) {
-       int i, n;
-       Atom *protocols;
-       Bool ret = False;
-
-       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-               for(i = 0; !ret && i < n; i++)
-                       if(protocols[i] == wmatom[WMDelete])
-                               ret = True;
-               XFree(protocols);
-       }
-       return ret;
-}
-
-Bool
-isurgent(unsigned int t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->isurgent && c->tags[t])
-                       return True;
-       return False;
-}
-
-Bool
-isvisible(Client *c) {
-       unsigned int i;
-
-       for(i = 0; i < LENGTH(tags); i++)
-               if(c->tags[i] && seltags[i])
-                       return True;
-       return False;
+#ifdef XINERAMA
+static Bool
+isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
+       while(n--)
+               if(unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
+               && unique[n].width == info->width && unique[n].height == info->height)
+                       return False;
+       return True;

 }
 }

+#endif /* XINERAMA */

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


@@ -947,88 +1073,85 @@ keypress(XEvent *e) {
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym

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

 }
 
 void
 }
 
 void

-killclient(const char *arg) {
-       XEvent ev;
-
-       if(!sel)
+killclient(const Arg *arg) {
+       if(!selmon->sel)

                return;
                return;

-       if(isprotodel(sel)) {
-               ev.type = ClientMessage;
-               ev.xclient.window = 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;
-               XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+       if(!sendevent(selmon->sel, wmatom[WMDelete])) {
+               XGrabServer(dpy);
+               XSetErrorHandler(xerrordummy);
+               XSetCloseDownMode(dpy, DestroyAll);
+               XKillClient(dpy, selmon->sel->win);
+               XSync(dpy, False);
+               XSetErrorHandler(xerror);
+               XUngrabServer(dpy);

        }
        }

-       else
-               XKillClient(dpy, sel->win);

 }
 
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
 }
 
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

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

        XWindowChanges wc;
 
        XWindowChanges wc;
 

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

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

-
-       c->x = c->rx = wa->x + sx;
-       c->y = c->ry = wa->y + sy;
-       c->w = c->rw = wa->width;
-       c->h = c->rh = 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;
+       updatetitle(c);
+       if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
+               c->mon = t->mon;
+               c->tags = t->tags;
+       }
+       else {
+               c->mon = selmon;
+               applyrules(c);
+       }
+       /* geometry */
+       c->x = c->oldx = wa->x + c->mon->wx;
+       c->y = c->oldy = wa->y + c->mon->wy;
+       c->w = c->oldw = wa->width;
+       c->h = c->oldh = wa->height;
+       c->oldbw = wa->border_width;
+       if(c->w == c->mon->mw && c->h == c->mon->mh) {
+               c->isfloating = True;
+               c->x = c->mon->mx;
+               c->y = c->mon->my;
+               c->bw = 0;

        }
        else {
        }
        else {

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

+       updatewmhints(c);

        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);

-       updatetitle(c);
-       if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-               for(t = clients; t && t->win != trans; t = t->next);
-       if(t)
-               memcpy(c->tags, t->tags, TAGSZ);
-       else
-               applyrules(c);

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

-               c->isfloating = (rettrans == Success) || c->isfixed;
+               c->isfloating = c->oldstate = 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);
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);

-       arrange();
+       arrange(c->mon);

 }
 
 void
 }
 
 void


@@ -1049,245 +1172,230 @@ 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);
 }
 
 void
                manage(ev->window, &wa);
 }
 
 void

-monocle(void) {
-       dozoom = False;
+monocle(Monitor *m) {
+       unsigned int n = 0;
+       Client *c;
+
+       for(c = m->clients; c; c = c->next)
+               if(ISVISIBLE(c))
+                       n++;
+       if(n > 0) /* override layout symbol */
+               snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
+       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
 }
 
 void

-movemouse(Client *c) {
-       int x1, y1, ocx, ocy, di, nx, ny;
-       unsigned int dui;
-       Window dummy;
+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(!getrootptr(&x, &y))

                return;
                return;

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

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

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

                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(sx - nx) < SNAP)
-                               nx = sx;
-                       else if(abs((sx + sw) - (nx + c->w + 2 * c->border)) < SNAP)
-                               nx = sx + sw - c->w - 2 * c->border;
-                       if(abs(sy - ny) < SNAP)
-                               ny = sy;
-                       else if(abs((sy + sh) - (ny + c->h + 2 * c->border)) < SNAP)
-                               ny = sy + sh - c->h - 2 * c->border;
-                       if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
-                               togglefloating(NULL);
-                       if((lt->arrange == floating) || c->isfloating)
-                               resize(c, nx, ny, c->w, c->h, False);
+                       nx = ocx + (ev.xmotion.x - x);
+                       ny = ocy + (ev.xmotion.y - y);
+                       if(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 && selmon->lt[selmon->sellt]->arrange
+                               && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                                       togglefloating(NULL);
+                       }
+                       if(!selmon->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 = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+               sendmon(c, m);
+               selmon = m;
+               focus(NULL);

        }
 }
 
 Client *
 nexttiled(Client *c) {
        }
 }
 
 Client *
 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;
 }
 

+void
+pop(Client *c) {
+       detach(c);
+       attach(c);
+       focus(c);
+       arrange(c->mon);
+}
+

 void
 propertynotify(XEvent *e) {
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
 void
 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))) {
-               switch (ev->atom) {
+       else if((c = wintoclient(ev->window))) {
+               switch(ev->atom) {

                default: break;
                case XA_WM_TRANSIENT_FOR:
                default: break;
                case XA_WM_TRANSIENT_FOR:

-                       XGetTransientForHint(dpy, c->win, &trans);
-                       if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-                               arrange();
+                       if(!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
+                          (c->isfloating = (wintoclient(trans)) != NULL))
+                               arrange(c->mon);

                        break;
                case XA_WM_NORMAL_HINTS:
                        updatesizehints(c);
                        break;
                case XA_WM_HINTS:
                        updatewmhints(c);
                        break;
                case XA_WM_NORMAL_HINTS:
                        updatesizehints(c);
                        break;
                case XA_WM_HINTS:
                        updatewmhints(c);

-                       drawbar();
+                       drawbars();

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

-                       if(c == sel)
-                               drawbar();
+                       if(c == c->mon->sel)
+                               drawbar(c->mon);

                }
        }
 }
 
                }
        }
 }
 

+Monitor *
+ptrtomon(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
 void

-quit(const char *arg) {
-       readin = running = False;
+quit(const Arg *arg) {
+       running = False;

 }
 
 void
 }
 
 void

-reapply(const char *arg) {
-       static Bool zerotags[LENGTH(tags)] = { 0 };
-       Client *c;
-
-       for(c = clients; c; c = c->next) {
-               memcpy(c->tags, zerotags, sizeof zerotags);
-               applyrules(c);
-       }
-       arrange();
+resize(Client *c, int x, int y, int w, int h, Bool interact) {
+       if(applysizehints(c, &x, &y, &w, &h, interact))
+               resizeclient(c, x, y, w, h);

 }
 
 void
 }
 
 void

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

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       if(sizehints) {
-               /* set minimum possible */
-               if (w < 1)
-                       w = 1;
-               if (h < 1)
-                       h = 1;
-
-               /* temporarily remove base dimensions */
-               w -= c->basew;
-               h -= c->baseh;
-
-               /* adjust for aspect limits */
-               if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
-                       if (w * c->maxay > h * c->maxax)
-                               w = h * c->maxax / c->maxay;
-                       else if (w * c->minay < h * c->minax)
-                               h = w * c->minay / c->minax;
-               }
-
-               /* adjust for increment value */
-               if(c->incw)
-                       w -= w % c->incw;
-               if(c->inch)
-                       h -= h % c->inch;
-
-               /* restore base dimensions */
-               w += c->basew;
-               h += c->baseh;
-
-               if(c->minw > 0 && w < c->minw)
-                       w = c->minw;
-               if(c->minh > 0 && h < c->minh)
-                       h = c->minh;
-               if(c->maxw > 0 && w > c->maxw)
-                       w = c->maxw;
-               if(c->maxh > 0 && h > c->maxh)
-                       h = c->maxh;
-       }
-       if(w <= 0 || h <= 0)
-               return;
-       if(x > sx + sw)
-               x = sw - w - 2 * c->border;
-       if(y > sy + 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) {
-               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);
-               configure(c);
-               XSync(dpy, False);
-       }
+       c->oldx = c->x; c->x = wc.x = x;
+       c->oldy = c->y; c->y = wc.y = y;
+       c->oldw = c->w; c->w = wc.width = w;
+       c->oldh = c->h; c->h = wc.height = h;
+       wc.border_width = c->bw;
+       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       configure(c);
+       XSync(dpy, False);

 }
 
 void
 }
 
 void

-resizemouse(Client *c) {
+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;

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

                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
                                resize(c, c->x, c->y, nw, nh, True);
                        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 = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+               sendmon(c, m);
+               selmon = m;
+               focus(NULL);

        }
 }
 
 void
        }
 }
 
 void

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

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

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

                return;
                return;

-       if(sel->isfloating || (lt->arrange == floating))
-               XRaiseWindow(dpy, sel->win);
-       if(lt->arrange != floating) {
+       if(m->sel->isfloating || !m->lt[m->sellt]->arrange)
+               XRaiseWindow(dpy, m->sel->win);
+       if(m->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));


@@ -1295,75 +1403,25 @@ restack(void) {
 
 void
 run(void) {
 
 void
 run(void) {

-       char *p;
-       char sbuf[sizeof stext];
-       fd_set rd;
-       int r, xfd;
-       unsigned int len, offset;

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

        }
 }
 
 void
 scan(void) {
        unsigned int i, num;
        }
 }
 
 void
 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)

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

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


@@ -1372,160 +1430,204 @@ scan(void) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
                                continue;
                        if(XGetTransientForHint(dpy, wins[i], &d1)
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
                                continue;
                        if(XGetTransientForHint(dpy, wins[i], &d1)

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

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

+               if(wins)
+                       XFree(wins);

        }
        }

-       if(wins)
-               XFree(wins);
+}
+
+void
+sendmon(Client *c, Monitor *m) {
+       if(c->mon == m)
+               return;
+       unfocus(c, True);
+       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(NULL);

 }
 
 void
 setclientstate(Client *c, long state) {
 }
 
 void
 setclientstate(Client *c, long state) {

-       long data[] = {state, None};
+       long data[] = { state, None };

 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
 

+Bool
+sendevent(Client *c, Atom proto) {
+       int n;
+       Atom *protocols;
+       Bool exists = False;
+       XEvent ev;
+
+       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+               while(!exists && n--)
+                       exists = protocols[n] == proto;
+               XFree(protocols);
+       }
+       if(exists) {
+               ev.type = ClientMessage;
+               ev.xclient.window = c->win;
+               ev.xclient.message_type = wmatom[WMProtocols];
+               ev.xclient.format = 32;
+               ev.xclient.data.l[0] = proto;
+               ev.xclient.data.l[1] = CurrentTime;
+               XSendEvent(dpy, c->win, False, NoEventMask, &ev);
+       }
+       return exists;
+}
+

 void
 void

-setlayout(const char *arg) {
-       unsigned int i;
+setfocus(Client *c) {
+       if(!c->neverfocus)
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       sendevent(c, wmatom[WMTakeFocus]);
+}
+
+void
+setlayout(const Arg *arg) {
+       if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+               selmon->sellt ^= 1;
+       if(arg && arg->v)
+               selmon->lt[selmon->sellt] = (Layout *)arg->v;
+       strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
+       if(selmon->sel)
+               arrange(selmon);
+       else
+               drawbar(selmon);
+}
+
+/* arg > 1.0 will set mfact absolutly */
+void
+setmfact(const Arg *arg) {
+       float f;

 
 

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

                return;
                return;

-       for(i = 0; i < LENGTH(layouts); i++)
-               if(!strcmp(arg, layouts[i].symbol))
-                       break;
-       if(i == LENGTH(layouts))
+       f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+       if(f < 0.1 || f > 0.9)

                return;
                return;

-       lt = &layouts[i];
-       if(sel)
-               arrange();
-       else
-               drawbar();
+       selmon->mfact = f;
+       arrange(selmon);

 }
 
 void
 setup(void) {
 }
 
 void
 setup(void) {

-       unsigned int i;

        XSetWindowAttributes wa;
 
        XSetWindowAttributes wa;
 

+       /* clean up any zombies immediately */
+       sigchld(0);
+

        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);

-       sx = 0;
-       sy = 0;
+       initfont(font);

        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

-
+       bh = dc.h = dc.font.height + 2;
+       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);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);

+       wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+       netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);

        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);

-
+       netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
+       netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);

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

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

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

-

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

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

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

-       dc.gc = XCreateGC(dpy, root, 0, 0);
+       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 tags */
-       seltags = emallocz(TAGSZ);
-       prevtags = emallocz(TAGSZ);
-       seltags[0] = prevtags[0] = True;
-
-       /* init layouts */
-       lt = &layouts[0];
-
-       /* init bar */
-       for(blw = i = 0; i < LENGTH(layouts); i++) {
-               i = textw(layouts[i].symbol);
-               if(i > blw)
-                       blw = i;
-       }
-
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask|ExposureMask;
-
-       barwin = XCreateWindow(dpy, root, BX, BY, BW, bh, 0, DefaultDepth(dpy, screen),
-                               CopyFromParent, DefaultVisual(dpy, screen),
-                               CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       XMapRaised(dpy, barwin);
-       strcpy(stext, "dwm-"VERSION);
-       drawbar();
-
+       /* init bars */
+       updatebars();
+       updatestatus();

        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);
        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);

-

        /* select for events */
        /* select for events */

-       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
-                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+       wa.cursor = cursor[CurNormal];
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
+                       |PropertyChangeMask;

        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);

-
-
-       /* grab keys */

        grabkeys();
 }
 
 void
        grabkeys();
 }
 
 void

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

                return;
                return;

-       /* The double-fork construct avoids zombie processes and keeps the code
-        * clean from stupid signal handlers. */
+       if(ISVISIBLE(c)) { /* show clients top down */
+               XMoveWindow(dpy, c->win, c->x, c->y);
+               if((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
+                       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);
+       }
+}
+
+void
+sigchld(int unused) {
+       if(signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("Can't install SIGCHLD handler");
+       while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
+void
+spawn(const Arg *arg) {

        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");
-               }
-               exit(0);
+               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(EXIT_SUCCESS);

        }
        }

-       wait(0);

 }
 
 void
 }
 
 void

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

 
 

-       if(!sel)
+void
+tagmon(const Arg *arg) {
+       if(!selmon->sel || !mons->next)

                return;
                return;

-       for(i = 0; i < LENGTH(tags); i++)
-               sel->tags[i] = (NULL == arg);
-       sel->tags[idxoftag(arg)] = True;
-       arrange();
+       sendmon(selmon->sel, dirtomon(arg->i));

 }
 
 }
 

-unsigned int
+int

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


@@ -1536,120 +1638,110 @@ textnw(const char *text, unsigned int len) {
        return XTextWidth(dc.font.xfont, text, len);
 }
 
        return XTextWidth(dc.font.xfont, text, len);
 }
 

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

 void
 void

-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
-       Client *c, *mc;
-
-       dozoom = True;
-       nx = MX;
-       ny = MY;
-       nw = 0;
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       /* window geoms */
-       mw = (n == 1) ? MOW : MW;
-       th = (n > 1) ? TH / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = TH;
+tile(Monitor *m) {
+       int x, y, h, w, mw;
+       unsigned int i, n;
+       Client *c;

 
 

-       for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {
-               if(i == 0) { /* master */
-                       nw = mw - 2 * c->border;
-                       nh = MH - 2 * c->border;
-               }
-               else {  /* tile window */
-                       if(i == 1) {
-                               ny = TY;
-                               nx = TX;
-                               nw = TW - 2 * c->border;
-                       }
-                       if(i + 1 == n) /* remainder */
-                               nh = (TY + TH) - ny - 2 * c->border;
-                       else
-                               nh = th - 2 * c->border;
-               }
-               resize(c, nx, ny, nw, nh, RESIZEHINTS);
-               if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
-                       /* client doesn't accept size constraints */
-                       resize(c, nx, ny, nw, nh, False);
-               if(n > 1 && th != TH)
-                       ny = c->y + c->h + 2 * c->border;
-               i++;
+       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);

        }
 }
 
 void
        }
 }
 
 void

-togglefloating(const char *arg) {
-       if(!sel)
+togglebar(const Arg *arg) {
+       selmon->showbar = !selmon->showbar;
+       updatebarpos(selmon);
+       XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
+       arrange(selmon);
+}
+
+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);
-       arrange();
+       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(selmon);

 }
 
 void
 }
 
 void

-toggletag(const char *arg) {
-       unsigned int i, j;
+toggletag(const Arg *arg) {
+       unsigned int newtags;

 
 

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

                return;
                return;

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

 }
 
 void
 }
 
 void

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

 
 

-       i = idxoftag(arg);
-       seltags[i] = !seltags[i];
-       for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
-       if(j == LENGTH(tags))
-               seltags[i] = True; /* at least one tag must be viewed */
-       arrange();
+       if(newtagset) {
+               selmon->tagset[selmon->seltags] = newtagset;
+               arrange(selmon);
+       }

 }
 
 void
 }
 
 void

-unban(Client *c) {
-       if(!c->isbanned)
+unfocus(Client *c, Bool setfocus) {
+       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]);
+       if(setfocus)
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

 }
 
 void
 }
 
 void

-unmanage(Client *c) {
+unmanage(Client *c, Bool destroyed) {
+       Monitor *m = c->mon;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       wc.border_width = c->oldborder;

        /* The server grab construct avoids race conditions. */
        /* The server grab construct avoids race conditions. */

-       XGrabServer(dpy);
-       XSetErrorHandler(xerrordummy);
-       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */

        detach(c);
        detachstack(c);
        detach(c);
        detachstack(c);

-       if(sel == c)
-               focus(NULL);
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       setclientstate(c, WithdrawnState);
-       free(c->tags);
+       if(!destroyed) {
+               wc.border_width = c->oldbw;
+               XGrabServer(dpy);
+               XSetErrorHandler(xerrordummy);
+               XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+               XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+               setclientstate(c, WithdrawnState);
+               XSync(dpy, False);
+               XSetErrorHandler(xerror);
+               XUngrabServer(dpy);
+       }

        free(c);
        free(c);

-       XSync(dpy, False);
-       XSetErrorHandler(xerror);
-       XUngrabServer(dpy);
-       arrange();
+       focus(NULL);
+       arrange(m);

 }
 
 void
 }
 
 void


@@ -1657,8 +1749,135 @@ unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 

-       if((c = getclient(ev->window)))
-               unmanage(c);
+       if((c = wintoclient(ev->window)))
+               unmanage(c, False);
+}
+
+void
+updatebars(void) {
+       Monitor *m;
+       XSetWindowAttributes wa = {
+               .override_redirect = True,
+               .background_pixmap = ParentRelative,
+               .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);
+       }
+}
+
+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;
+}
+
+Bool
+updategeom(void) {
+       Bool dirty = False;
+
+#ifdef XINERAMA
+       if(XineramaIsActive(dpy)) {
+               int i, j, n, nn;
+               Client *c;
+               Monitor *m;
+               XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
+               XineramaScreenInfo *unique = NULL;
+
+               for(n = 0, m = mons; m; m = m->next, n++);
+               /* only consider unique geometries as separate screens */
+               if(!(unique = (XineramaScreenInfo *)malloc(sizeof(XineramaScreenInfo) * nn)))
+                       die("fatal: could not malloc() %u bytes\n", sizeof(XineramaScreenInfo) * nn);
+               for(i = 0, j = 0; i < nn; i++)
+                       if(isuniquegeom(unique, j, &info[i]))
+                               memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
+               XFree(info);
+               nn = j;
+               if(n <= nn) {
+                       for(i = 0; i < (nn - n); i++) { /* new monitors available */
+                               for(m = mons; m && m->next; m = m->next);
+                               if(m)
+                                       m->next = createmon();
+                               else
+                                       mons = createmon();
+                       }
+                       for(i = 0, m = mons; i < nn && m; m = m->next, i++)
+                               if(i >= n
+                               || (unique[i].x_org != m->mx || unique[i].y_org != m->my
+                                   || unique[i].width != m->mw || unique[i].height != m->mh))
+                               {
+                                       dirty = True;
+                                       m->num = i;
+                                       m->mx = m->wx = unique[i].x_org;
+                                       m->my = m->wy = unique[i].y_org;
+                                       m->mw = m->ww = unique[i].width;
+                                       m->mh = m->wh = unique[i].height;
+                                       updatebarpos(m);
+                               }
+               }
+               else { /* less monitors available nn < n */
+                       for(i = nn; i < n; i++) {
+                               for(m = mons; m && m->next; m = m->next);
+                               while(m->clients) {
+                                       dirty = True;
+                                       c = m->clients;
+                                       m->clients = c->next;
+                                       detachstack(c);
+                                       c->mon = mons;
+                                       attach(c);
+                                       attachstack(c);
+                               }
+                               if(m == selmon)
+                                       selmon = mons;
+                               cleanupmon(m);
+                       }
+               }
+               free(unique);
+       }
+       else
+#endif /* XINERAMA */
+       /* default monitor setup */
+       {
+               if(!mons)
+                       mons = createmon();
+               if(mons->mw != sw || mons->mh != sh) {
+                       dirty = True;
+                       mons->mw = mons->ww = sw;
+                       mons->mh = mons->wh = sh;
+                       updatebarpos(mons);
+               }
+       }
+       if(dirty) {
+               selmon = mons;
+               selmon = wintomon(root);
+       }
+       return dirty;
+}
+
+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
 }
 
 void


@@ -1666,57 +1885,64 @@ updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
        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 / size.min_aspect.x;
+               c->maxa = (float)size.max_aspect.x / 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);

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

-               gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+               gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
+       if(c->name[0] == '\0') /* hack to mark broken clients */
+               strcpy(c->name, broken);
+}
+
+void
+updatestatus(void) {
+       if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+               strcpy(stext, "dwm-"VERSION);
+       drawbar(selmon);

 }
 
 void
 }
 
 void


@@ -1724,37 +1950,56 @@ updatewmhints(Client *c) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {

-               if(c == sel)
-                       sel->isurgent = False;
+               if(c == selmon->sel && wmh->flags & XUrgencyHint) {
+                       wmh->flags &= ~XUrgencyHint;
+                       XSetWMHints(dpy, c->win, wmh);
+               }

                else
                        c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
                else
                        c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;

+               if(wmh->flags & InputHint)
+                       c->neverfocus = !wmh->input;
+               else
+                       c->neverfocus = False;

                XFree(wmh);
        }
 }
 
                XFree(wmh);
        }
 }
 

-

 void
 void

-view(const char *arg) {
-       unsigned int i;
+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(selmon);
+}

 
 

-       for(i = 0; i < LENGTH(tags); i++)
-               tmp[i] = (NULL == arg);
-       tmp[idxoftag(arg)] = True;
+Client *
+wintoclient(Window w) {
+       Client *c;
+       Monitor *m;

 
 

-       if(memcmp(seltags, tmp, TAGSZ) != 0) {
-               memcpy(prevtags, seltags, TAGSZ);
-               memcpy(seltags, tmp, TAGSZ);
-               arrange();
-       }
+       for(m = mons; m; m = m->next)
+               for(c = m->clients; c; c = c->next)
+                       if(c->win == w)
+                               return c;
+       return NULL;

 }
 
 }
 

-void
-viewprevtag(const char *arg) {
+Monitor *
+wintomon(Window w) {
+       int x, y;
+       Client *c;
+       Monitor *m;

 
 

-       memcpy(tmp, seltags, TAGSZ);
-       memcpy(seltags, prevtags, TAGSZ);
-       memcpy(prevtags, tmp, TAGSZ);
-       arrange();
+       if(w == root && getrootptr(&x, &y))
+               return ptrtomon(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
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are


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

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

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

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

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


@@ -1785,42 +2031,38 @@ xerrordummy(Display *dpy, XErrorEvent *ee) {
  * is already running. */
 int
 xerrorstart(Display *dpy, XErrorEvent *ee) {
  * is already running. */
 int
 xerrorstart(Display *dpy, XErrorEvent *ee) {

-       otherwm = True;
+       die("dwm: another window manager is already running\n");

        return -1;
 }
 
 void
        return -1;
 }
 
 void

-zoom(const char *arg) {
-       Client *c = sel;
+zoom(const Arg *arg) {
+       Client *c = selmon->sel;

 
 

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

                return;
                return;

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

                        return;
                        return;

-       detach(c);
-       attach(c);
-       focus(c);
-       arrange();
+       pop(c);

 }
 
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 }
 
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2011 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");
-
+               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();
        scan();
        run();
        cleanup();
        checkotherwm();
        setup();
        scan();
        run();
        cleanup();

-

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

-       return 0;
+       return EXIT_SUCCESS;

 }
 }