selmon optimisation is needed

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index e0a6286..ac534a8 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -11,9 +11,9 @@
  * in O(1) time.
  *
  * Each child of the root window is called a client, except windows which have
  * in O(1) time.
  *
  * Each child of the root window is called a client, except windows which have

- * set the override_redirect flag.  Clients are organized in a global
- * linked client list, the focus history is remembered through a global
- * stack list. Each client contains a bit array to indicate the tags of a
+ * 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.
  * client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.


@@ -41,17 +41,18 @@
 #endif /* XINERAMA */
 
 /* macros */
 #endif /* XINERAMA */
 
 /* macros */

+#define D                       if(1)

 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))

-#define ISVISIBLE(M, C)         ((M) == (C->m) && (C->tags & M->tagset[M->seltags]))
+#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 LENGTH(X)               (sizeof X / sizeof X[0])
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))
 #define MIN(A, B)               ((A) < (B) ? (A) : (B))
 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)

-#define TAGMASK                 ((int)((1LL << LENGTH(tags)) - 1))
+#define TAGMASK                 ((1 << LENGTH(tags)) - 1)

 #define TEXTW(X)                (textnw(X, strlen(X)) + dc.font.height)
 
 /* enums */
 #define TEXTW(X)                (textnw(X, strlen(X)) + dc.font.height)
 
 /* enums */


@@ -66,7 +67,7 @@ typedef union {
        int i;
        unsigned int ui;
        float f;
        int i;
        unsigned int ui;
        float f;

-       void *v;
+       const void *v;

 } Arg;
 
 typedef struct {
 } Arg;
 
 typedef struct {


@@ -89,7 +90,7 @@ struct Client {
        Bool isfixed, isfloating, isurgent;
        Client *next;
        Client *snext;
        Bool isfixed, isfloating, isurgent;
        Client *next;
        Client *snext;

-       Monitor *m;
+       Monitor *mon;

        Window win;
 };
 
        Window win;
 };
 


@@ -121,18 +122,23 @@ typedef struct {
 } Layout;
 
 struct Monitor {
 } Layout;
 
 struct Monitor {

-       int screen_number;
+       char ltsymbol[16];

        float mfact;
        float mfact;

-       int by, btx;          /* bar geometry */
-       int my, mh;           /* vertical screen size*/
+       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;
        int wx, wy, ww, wh;   /* window area  */
        unsigned int seltags;
        unsigned int sellt;
        unsigned int tagset[2];
        Bool showbar;
        Bool topbar;

-       Window barwin;
+       Client *clients;
+       Client *sel;
+       Client *stack;

        Monitor *next;
        Monitor *next;

+       Window barwin;
+       const Layout *lt[2];

 };
 
 typedef struct {
 };
 
 typedef struct {


@@ -141,37 +147,42 @@ typedef struct {
        const char *title;
        unsigned int tags;
        Bool isfloating;
        const char *title;
        unsigned int tags;
        Bool isfloating;

+       int monitor;

 } Rule;
 
 /* function declarations */
 static void applyrules(Client *c);
 } Rule;
 
 /* function declarations */
 static void applyrules(Client *c);

-static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
-static void arrange(void);
+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 attach(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);

-static void cleanupmons(void);
+static void cleanupmon(Monitor *mon);

 static void clearurgent(Client *c);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
 static void clearurgent(Client *c);
 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 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 drawbar(Monitor *m);

-static void drawbars();
+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 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 void focusstack(const Arg *arg);

-static Client *getclient(Window w);

 static unsigned long getcolor(const char *colstr);
 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 long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);


@@ -185,31 +196,35 @@ static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void movemouse(const Arg *arg);
 static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void movemouse(const Arg *arg);

-static Client *nexttiled(Monitor *m, Client *c);
+static Client *nexttiled(Client *c);
+static Monitor *ptrtomon(int x, int y);

 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);

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

 static void resizemouse(const Arg *arg);
 static void restack(Monitor *m);
 static void run(void);
 static void scan(void);
 static void resizemouse(const Arg *arg);
 static void restack(Monitor *m);
 static void run(void);
 static void scan(void);

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

 static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);
 static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);

-static void sigchld(int signal);
+static void sigchld(int unused);

 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 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 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 unmanage(Client *c);
+static void unfocus(Client *c);
+static void unmanage(Client *c, Bool destroyed);

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

-static void updategeom(void);
+static Bool updategeom(void);

 static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static void updatenumlockmask(void);
 static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static void updatenumlockmask(void);


@@ -218,19 +233,18 @@ static void updatestatus(void);
 static void updatetitle(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
 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);
 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);

-#ifdef XINERAMA
-static void focusmon(const Arg *arg);
-static void tagmon(const Arg *arg);
-#endif /* XINERAMA */

 
 /* variables */
 
 /* variables */

+static const char broken[] = "broken";

 static char stext[256];
 static int screen;
 static char stext[256];
 static int screen;

-static int sx, sy, sw, sh;   /* X display screen geometry x, y, width, height */
+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 int bh, blw = 0;      /* bar geometry */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;


@@ -251,38 +265,43 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 static Atom wmatom[WMLast], netatom[NetLast];
 static Bool otherwm;
 static Bool running = True;
 static Atom wmatom[WMLast], netatom[NetLast];
 static Bool otherwm;
 static Bool running = True;

-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;

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

-static Layout *lt[] = { NULL, NULL };

 static Monitor *mons = NULL, *selmon = NULL;
 static Window root;
 static Monitor *mons = NULL, *selmon = NULL;
 static Window root;

+

 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* compile-time check if all tags fit into an unsigned int bit array. */
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* compile-time check if all tags fit into an unsigned int bit array. */

-struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
+struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };

 
 /* function implementations */
 void
 applyrules(Client *c) {
 
 /* function implementations */
 void
 applyrules(Client *c) {

+       const char *class, *instance;

        unsigned int i;
        unsigned int i;

-       Rule *r;
+       const Rule *r;
+       Monitor *m;

        XClassHint ch = { 0 };
 
        /* rule matching */
        c->isfloating = c->tags = 0;
        if(XGetClassHint(dpy, c->win, &ch)) {
        XClassHint ch = { 0 };
 
        /* rule matching */
        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))
                for(i = 0; i < LENGTH(rules); i++) {
                        r = &rules[i];
                        if((!r->title || strstr(c->name, r->title))

-                       && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
-                       && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+                       && (!r->class || strstr(class, r->class))
+                       && (!r->instance || strstr(instance, r->instance)))
+                       {

                                c->isfloating = r->isfloating;
                                c->tags |= r->tags;
                                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)
                        }
                }
                if(ch.res_class)


@@ -290,68 +309,71 @@ applyrules(Client *c) {
                if(ch.res_name)
                        XFree(ch.res_name);
        }
                if(ch.res_name)
                        XFree(ch.res_name);
        }

-       c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->m->tagset[c->m->seltags];
+       c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];

 }
 
 Bool
 }
 
 Bool

-applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {

        Bool baseismin;
        Bool baseismin;

+       Monitor *m = c->mon;

 
        /* set minimum possible */
        *w = MAX(1, *w);
        *h = MAX(1, *h);
 
        /* set minimum possible */
        *w = MAX(1, *w);
        *h = MAX(1, *h);

-
-       if(*x > sx + sw)
-               *x = sw - WIDTH(c);
-       if(*y > sy + sh)
-               *y = sh - HEIGHT(c);
-       if(*x + *w + 2 * c->bw < sx)
-               *x = sx;
-       if(*y + *h + 2 * c->bw < sy)
-               *y = sy;
+       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(*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(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;
                }
                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)
                /* adjust for aspect limits */
                if(c->mina > 0 && c->maxa > 0) {
                        if(c->maxa < (float)*w / *h)

-                               *w = *h * c->maxa;
+                               *w = *h * c->maxa + 0.5;

                        else if(c->mina < (float)*h / *w)
                        else if(c->mina < (float)*h / *w)

-                               *h = *w * c->mina;
+                               *h = *w * c->mina + 0.5;

                }
                }

-

                if(baseismin) { /* increment calculation requires this */
                        *w -= c->basew;
                        *h -= c->baseh;
                }
                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;
                /* 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;
                /* restore base dimensions */
                *w += c->basew;
                *h += c->baseh;

-

                *w = MAX(*w, c->minw);
                *h = MAX(*h, c->minh);
                *w = MAX(*w, c->minw);
                *h = MAX(*h, c->minh);

-

                if(c->maxw)
                        *w = MIN(*w, c->maxw);
                if(c->maxw)
                        *w = MIN(*w, c->maxw);

-

                if(c->maxh)
                        *h = MIN(*h, c->maxh);
        }
                if(c->maxh)
                        *h = MIN(*h, c->maxh);
        }


@@ -359,28 +381,36 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h) {
 }
 
 void
 }
 
 void

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

        focus(NULL);
        focus(NULL);

-       for(m = mons; m; m = m->next) {
-               if(lt[m->sellt]->arrange)
-                       lt[m->sellt]->arrange(m);
-               restack(m);
-       }
+       if(m)
+               arrangemon(m);
+       else for(m = mons; m; m = m->next)
+               arrangemon(m);
+}
+
+void
+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
 attach(Client *c) {
 }
 
 void
 attach(Client *c) {

-       c->next = clients;
-       clients = c;
+       c->next = c->mon->clients;
+       c->mon->clients = c;

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

-       c->snext = stack;
-       stack = c;
+       c->snext = c->mon->stack;
+       c->mon->stack = c;

 }
 
 void
 }
 
 void


@@ -388,15 +418,21 @@ buttonpress(XEvent *e) {
        unsigned int i, x, click;
        Arg arg = {0};
        Client *c;
        unsigned int i, x, click;
        Arg arg = {0};
        Client *c;

+       Monitor *m;

        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;

-       if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
-               i = 0;
-               x = selmon->btx;
-               do
+       /* focus monitor if necessary */
+       if((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel);
+               selmon = m;
+               focus(NULL);
+       }
+       if(ev->window == selmon->barwin) {
+               i = x = 0;
+               do {

                        x += TEXTW(tags[i]);
                        x += TEXTW(tags[i]);

-               while(ev->x >= x && ++i < LENGTH(tags));
+               } while(ev->x >= x && ++i < LENGTH(tags));

                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;
                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;


@@ -408,14 +444,13 @@ buttonpress(XEvent *e) {
                else
                        click = ClkWinTitle;
        }
                else
                        click = ClkWinTitle;
        }

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

                focus(c);
                click = ClkClientWin;
        }
                focus(c);
                click = ClkClientWin;
        }

-

        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
        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))
+               && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))

                        buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 }
 
                        buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 }
 


@@ -423,7 +458,6 @@ void
 checkotherwm(void) {
        otherwm = False;
        xerrorxlib = XSetErrorHandler(xerrorstart);
 checkotherwm(void) {
        otherwm = False;
        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);


@@ -437,11 +471,13 @@ void
 cleanup(void) {
        Arg a = {.ui = ~0};
        Layout foo = { "", NULL };
 cleanup(void) {
        Arg a = {.ui = ~0};
        Layout foo = { "", NULL };

+       Monitor *m;

 
        view(&a);
 
        view(&a);

-       lt[selmon->sellt] = &foo;
-       while(stack)
-               unmanage(stack);
+       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
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        else


@@ -452,22 +488,25 @@ cleanup(void) {
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);

-       cleanupmons();
+       while(mons)
+               cleanupmon(mons);

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

-cleanupmons(void) {
+cleanupmon(Monitor *mon) {

        Monitor *m;
 
        Monitor *m;
 

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


@@ -505,45 +544,48 @@ configurenotify(XEvent *e) {
        Monitor *m;
        XConfigureEvent *ev = &e->xconfigure;
 
        Monitor *m;
        XConfigureEvent *ev = &e->xconfigure;
 

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

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

-               updategeom();
-               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();
+               if(updategeom()) {
+                       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)
                        c->bw = ev->border_width;
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;

-               else if(c->isfloating || !lt[selmon->sellt]->arrange) {
+               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((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);
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);

-                       if(ISVISIBLE((c->m), 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


@@ -562,29 +604,50 @@ 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) {
        Client **tc;
 
 }
 
 void
 detach(Client *c) {
        Client **tc;
 

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

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


@@ -597,49 +660,49 @@ die(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
        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) {
 void
 drawbar(Monitor *m) {

-       char buf[2];

        int x;
        unsigned int i, occ = 0, urg = 0;
        unsigned long *col;
        Client *c;
 
        int x;
        unsigned int i, occ = 0, urg = 0;
        unsigned long *col;
        Client *c;
 

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

        }
        }

-

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

-#ifdef XINERAMA
-       {
-               buf[0] = m->screen_number + '0';
-               buf[1] = '\0';
-               dc.w = TEXTW(buf);
-               drawtext(buf, selmon == m ? dc.sel : dc.norm, True);
-               dc.x += dc.w;
-       }
-#endif /* XINERAMA */
-       m->btx = dc.x;

        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
                col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
                drawtext(tags[i], col, urg & 1 << i);
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
                col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
                drawtext(tags[i], col, urg & 1 << i);

-               drawsquare(m == selmon && sel && sel->tags & 1 << i,
+               drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,

                           occ & 1 << i, urg & 1 << i, col);
                dc.x += dc.w;
        }
                           occ & 1 << i, urg & 1 << i, col);
                dc.x += dc.w;
        }

-       if(blw > 0) {
-               dc.w = blw;
-               drawtext(lt[m->sellt]->symbol, dc.norm, False);
-               x = dc.x + dc.w;
-       }
-       else
-               x = dc.x;
-       if(m == selmon) {
+       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.w = TEXTW(stext);
                dc.x = m->ww - dc.w;
                if(dc.x < x) {


@@ -647,27 +710,25 @@ drawbar(Monitor *m) {
                        dc.w = m->ww - x;
                }
                drawtext(stext, dc.norm, False);
                        dc.w = m->ww - x;
                }
                drawtext(stext, dc.norm, False);

-               if((dc.w = dc.x - x) > bh) {
-                       dc.x = x;
-                       if(sel) {
-                               drawtext(sel->name, dc.sel, False);
-                               drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
-                       }
-                       else
-                               drawtext(NULL, dc.norm, False);
-               }

        }
        }

-       else {
+       else
+               dc.x = m->ww;
+       if((dc.w = dc.x - x) > bh) {

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

-               dc.w = m->ww - x;
-               drawtext(NULL, dc.norm, False);
+               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);

        }
        XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void
        }
        XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void

-drawbars() {
+drawbars(void) {

        Monitor *m;
 
        for(m = mons; m; m = m->next)
        Monitor *m;
 
        for(m = mons; m; m = m->next)


@@ -726,11 +787,16 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 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)))
+       if((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel);
+               selmon = m;
+       }
+       if((c = wintoclient(ev->window)))

                focus(c);
        else
                focus(NULL);
                focus(c);
        else
                focus(NULL);


@@ -741,23 +807,19 @@ expose(XEvent *e) {
        Monitor *m;
        XExposeEvent *ev = &e->xexpose;
 
        Monitor *m;
        XExposeEvent *ev = &e->xexpose;
 

-       if(ev->count == 0)
-               for(m = mons; m; m = m->next)
-                       if(ev->window == m->barwin) {
-                               drawbar(m);
-                               break;
-                       }
+       if(ev->count == 0 && (m = wintomon(ev->window)))
+               drawbar(m);

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

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

        if(c) {
        if(c) {

+               if(c->mon != selmon)
+                       selmon = c->mon;

                if(c->isurgent)
                        clearurgent(c);
                detachstack(c);
                if(c->isurgent)
                        clearurgent(c);
                detachstack(c);


@@ -768,7 +830,7 @@ focus(Client *c) {
        }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

-       sel = c;
+       selmon->sel = c;

        drawbars();
 }
 
        drawbars();
 }
 


@@ -776,44 +838,41 @@ void
 focusin(XEvent *e) { /* there are some broken focus acquiring clients */
        XFocusChangeEvent *ev = &e->xfocus;
 
 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)
+               XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);

 }
 
 }
 

-#ifdef XINERAMA

 void
 focusmon(const Arg *arg) {
 void
 focusmon(const Arg *arg) {

-       unsigned int i;
-       Monitor *m; 
+       Monitor *m = NULL;

 
 

-       for(i = 0, m = mons; m; m = m->next, i++)
-               if(i == arg->ui) {
-                       selmon = m;
-                       focus(NULL);
-                       drawbars();
-                       break;
-               }
+       if(!mons->next)
+               return;
+       if((m = dirtomon(arg->i)) == selmon)
+               return;
+       unfocus(selmon->sel);
+       selmon = m;
+       focus(NULL);

 }
 }

-#endif /* XINERAMA */

 
 void
 focusstack(const Arg *arg) {
        Client *c = NULL, *i;
 
 
 void
 focusstack(const Arg *arg) {
        Client *c = NULL, *i;
 

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

                return;
        if(arg->i > 0) {
                return;
        if(arg->i > 0) {

-               for(c = sel->next; c && !ISVISIBLE(selmon, c); c = c->next);
+               for(c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);

                if(!c)
                if(!c)

-                       for(c = clients; c && !ISVISIBLE(selmon, c); c = c->next);
+                       for(c = selmon->clients; c && !ISVISIBLE(c); c = c->next);

        }
        else {
        }
        else {

-               for(i = clients; i != sel; i = i->next)
-                       if(ISVISIBLE(selmon, i))
+               for(i = selmon->clients; i != selmon->sel; i = i->next)
+                       if(ISVISIBLE(i))

                                c = i;
                if(!c)
                        for(; i; i = i->next)
                                c = i;
                if(!c)
                        for(; i; i = i->next)

-                               if(ISVISIBLE(selmon, i))
+                               if(ISVISIBLE(i))

                                        c = i;
        }
        if(c) {
                                        c = i;
        }
        if(c) {


@@ -822,14 +881,6 @@ focusstack(const Arg *arg) {
        }
 }
 
        }
 }
 

-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);
 unsigned long
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);


@@ -840,6 +891,15 @@ getcolor(const char *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) {
        int format, status;
 long
 getstate(Window w) {
        int format, status;


@@ -849,7 +909,7 @@ getstate(Window w) {
        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],

-                       &real, &format, &n, &extra, (unsigned char **)&p);
+                                   &real, &format, &n, &extra, (unsigned char **)&p);

        if(status != Success)
                return -1;
        if(n != 0)
        if(status != Success)
                return -1;
        if(n != 0)


@@ -873,8 +933,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);
                }


@@ -899,7 +958,8 @@ grabbuttons(Client *c, Bool focused) {
                                                            buttons[i].mask | modifiers[j],
                                                            c->win, False, BUTTONMASK,
                                                            GrabModeAsync, GrabModeSync, None, None);
                                                            buttons[i].mask | modifiers[j],
                                                            c->win, False, BUTTONMASK,
                                                            GrabModeAsync, GrabModeSync, None, None);

-               } else
+               }
+               else

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


@@ -908,7 +968,7 @@ grabbuttons(Client *c, Bool focused) {
 void
 grabkeys(void) {
        updatenumlockmask();
 void
 grabkeys(void) {
        updatenumlockmask();

-       { /* grab keys */
+       {

                unsigned int i, j;
                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
                KeyCode code;
                unsigned int i, j;
                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
                KeyCode code;


@@ -939,6 +999,7 @@ initfont(const char *fontstr) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;

+

                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);


@@ -973,6 +1034,19 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

+#ifdef XINERAMA
+static Bool
+isuniquegeom(XineramaScreenInfo *unique, size_t len, XineramaScreenInfo *info) {
+       unsigned int i;
+
+       for(i = 0; i < len; i++)
+               if(unique[i].x_org == info->x_org && unique[i].y_org == info->y_org
+               && unique[i].width == info->width && unique[i].height == info->height)
+                       return False;
+       return True;
+}
+#endif /* XINERAMA */
+

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


@@ -983,8 +1057,8 @@ 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)
-                  && keys[i].func)
+               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+               && keys[i].func)

                        keys[i].func(&(keys[i].arg));
 }
 
                        keys[i].func(&(keys[i].arg));
 }
 


@@ -992,19 +1066,26 @@ void
 killclient(const Arg *arg) {
        XEvent ev;
 
 killclient(const Arg *arg) {
        XEvent ev;
 

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

                return;
                return;

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

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

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

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

-               XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+               XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
+       }
+       else {
+               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
 }
 
 void


@@ -1018,31 +1099,39 @@ manage(Window w, XWindowAttributes *wa) {
                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
        *c = cz;
        c->win = w;
                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
        *c = cz;
        c->win = w;

-       c->m = selmon;
-
+       updatetitle(c);
+       if(XGetTransientForHint(dpy, w, &trans))
+               t = wintoclient(trans);
+       if(t) {
+               c->mon = t->mon;
+               c->tags = t->tags;
+       }
+       else {
+               c->mon = selmon;
+               applyrules(c);
+       }

        /* geometry */
        /* geometry */

-       c->x = wa->x;
-       c->y = wa->y;
+       c->x = wa->x + c->mon->wx;
+       c->y = wa->y + c->mon->wy;

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

-       if(c->w == sw && c->h == sh) {
-               c->x = sx;
-               c->y = sy;
+       if(c->w == c->mon->mw && c->h == c->mon->mh) {
+               c->x = c->mon->mx;
+               c->y = c->mon->my;

                c->bw = 0;
        }
        else {
                c->bw = 0;
        }
        else {

-               if(c->x + WIDTH(c) > sx + sw)
-                       c->x = sx + sw - WIDTH(c);
-               if(c->y + HEIGHT(c) > sy + sh)
-                       c->y = sy + sh - HEIGHT(c);
-               c->x = MAX(c->x, sx);
+               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 */
                /* only fix client y-offset, if the client center might cover the bar */

-               c->y = MAX(c->y, ((selmon->by == 0) && (c->x + (c->w / 2) >= selmon->wx)
-                          && (c->x + (c->w / 2) < selmon->wx + selmon->ww)) ? bh : sy);
+               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;
        }
                c->bw = borderpx;
        }

-

        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);


@@ -1050,13 +1139,6 @@ manage(Window w, XWindowAttributes *wa) {
        updatesizehints(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatesizehints(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);

-       updatetitle(c);
-       if(XGetTransientForHint(dpy, w, &trans))
-               t = getclient(trans);
-       if(t)
-               c->tags = t->tags;
-       else
-               applyrules(c);

        if(!c->isfloating)
                c->isfloating = trans != None || c->isfixed;
        if(c->isfloating)
        if(!c->isfloating)
                c->isfloating = trans != None || c->isfixed;
        if(c->isfloating)


@@ -1066,7 +1148,7 @@ manage(Window w, XWindowAttributes *wa) {
        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);
        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);

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

 }
 
 void
 }
 
 void


@@ -1087,27 +1169,32 @@ 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
 monocle(Monitor *m) {
                manage(ev->window, &wa);
 }
 
 void
 monocle(Monitor *m) {

+       unsigned int n = 0;

        Client *c;
 
        Client *c;
 

-       for(c = nexttiled(m, clients); c; c = nexttiled(m, c->next))
-               resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
+       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
 movemouse(const Arg *arg) {
 }
 
 void
 movemouse(const Arg *arg) {

-       int x, y, ocx, ocy, di, nx, ny;
-       unsigned int dui;
+       int x, y, ocx, ocy, nx, ny;

        Client *c;
        Client *c;

-       Window dummy;
+       Monitor *m;

        XEvent ev;
 
        XEvent ev;
 

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

                return;
        restack(selmon);
        ocx = c->x;
                return;
        restack(selmon);
        ocx = c->x;


@@ -1115,7 +1202,8 @@ movemouse(const Arg *arg) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;

-       XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
+       if(!getrootptr(&x, &y))
+               return;

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


@@ -1128,7 +1216,7 @@ movemouse(const Arg *arg) {
                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);
                        if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);
                        if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww

-                               && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+                       && 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)
                                if(abs(selmon->wx - nx) < snap)
                                        nx = selmon->wx;
                                else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)


@@ -1137,26 +1225,39 @@ movemouse(const Arg *arg) {
                                        ny = selmon->wy;
                                else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
                                        ny = selmon->wy + selmon->wh - HEIGHT(c);
                                        ny = selmon->wy;
                                else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
                                        ny = selmon->wy + selmon->wh - HEIGHT(c);

-                               if(!c->isfloating && lt[selmon->sellt]->arrange
-                                                 && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                               if(!c->isfloating && selmon->lt[selmon->sellt]->arrange
+                               && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))

                                        togglefloating(NULL);
                        }
                                        togglefloating(NULL);
                        }

-                       if(!lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, nx, ny, c->w, c->h);
+                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, True);

                        break;
                }
                        break;
                }

-       }
-       while(ev.type != ButtonRelease);
+       } while(ev.type != ButtonRelease);

        XUngrabPointer(dpy, CurrentTime);
        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 *
 }
 
 Client *

-nexttiled(Monitor *m, Client *c) {
-       // TODO: m handling
-       for(; c && (c->isfloating || !ISVISIBLE(m, c)); c = c->next);
+nexttiled(Client *c) {
+       for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 

+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
 propertynotify(XEvent *e) {
        Client *c;
 void
 propertynotify(XEvent *e) {
        Client *c;


@@ -1167,13 +1268,13 @@ propertynotify(XEvent *e) {
                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */
                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */

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

                switch (ev->atom) {
                default: break;
                case XA_WM_TRANSIENT_FOR:
                        XGetTransientForHint(dpy, c->win, &trans);
                switch (ev->atom) {
                default: break;
                case XA_WM_TRANSIENT_FOR:
                        XGetTransientForHint(dpy, c->win, &trans);

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

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


@@ -1185,8 +1286,8 @@ propertynotify(XEvent *e) {
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);

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

                }
        }
 }
                }
        }
 }


@@ -1197,17 +1298,16 @@ quit(const Arg *arg) {
 }
 
 void
 }
 
 void

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

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       if(applysizehints(c, &x, &y, &w, &h)) {
+       if(applysizehints(c, &x, &y, &w, &h, interact)) {

                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
                c->h = wc.height = h;
                wc.border_width = c->bw;
                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
                c->h = wc.height = h;
                wc.border_width = c->bw;

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

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


@@ -1218,15 +1318,16 @@ resizemouse(const Arg *arg) {
        int ocx, ocy;
        int nw, nh;
        Client *c;
        int ocx, ocy;
        int nw, nh;
        Client *c;

+       Monitor *m;

        XEvent ev;
 
        XEvent ev;
 

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

                return;
        restack(selmon);
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                return;
        restack(selmon);
        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;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        do {
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        do {


@@ -1240,22 +1341,26 @@ resizemouse(const Arg *arg) {
                case MotionNotify:
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
                case MotionNotify:
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);

-

                        if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
                        if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww

-                               && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
-                               if(!c->isfloating && lt[selmon->sellt]->arrange
-                                  && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                       && nh >= selmon->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);
                        }
                                        togglefloating(NULL);
                        }

-                       if(!lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, c->x, c->y, nw, nh);
+                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, c->x, c->y, nw, nh, True);

                        break;
                }
                        break;
                }

-       }
-       while(ev.type != ButtonRelease);
+       } 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));
        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


@@ -1264,16 +1369,16 @@ restack(Monitor *m) {
        XEvent ev;
        XWindowChanges wc;
 
        XEvent ev;
        XWindowChanges wc;
 

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

                return;
                return;

-       if(m == selmon && (sel->isfloating || !lt[m->sellt]->arrange))
-               XRaiseWindow(dpy, sel->win);
-       if(lt[m->sellt]->arrange) {
+       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.sibling = m->barwin;
                wc.stack_mode = Below;
                wc.sibling = m->barwin;

-               for(c = stack; c; c = c->snext)
-                       if(!c->isfloating && ISVISIBLE(m, c)) {
+               for(c = m->stack; c; c = c->snext)
+                       if(!c->isfloating && ISVISIBLE(c)) {

                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }
                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }


@@ -1285,12 +1390,26 @@ restack(Monitor *m) {
 void
 run(void) {
        XEvent ev;
 void
 run(void) {
        XEvent ev;

-
+       static const char *evname[LASTEvent] = {
+               [ButtonPress] = "buttonpress",
+               [ConfigureRequest] = "configurerequest",
+               [ConfigureNotify] = "configurenotify",
+               [DestroyNotify] = "destroynotify",
+               [EnterNotify] = "enternotify",
+               [Expose] = "expose",
+               [FocusIn] = "focusin",
+               [KeyPress] = "keypress",
+               [MappingNotify] = "mappingnotify",
+               [MapRequest] = "maprequest",
+               [PropertyNotify] = "propertynotify",
+               [UnmapNotify] = "unmapnotify"
+       };

        /* main event loop */
        XSync(dpy, False);
        while(running && !XNextEvent(dpy, &ev)) {
        /* main event loop */
        XSync(dpy, False);
        while(running && !XNextEvent(dpy, &ev)) {

+               D fprintf(stderr, "run event %s %ld\n", evname[ev.type], ev.xany.window);

                if(handler[ev.type])
                if(handler[ev.type])

-                       (handler[ev.type])(&ev); /* call handler */
+                       handler[ev.type](&ev); /* call handler */

        }
 }
 
        }
 }
 


@@ -1320,9 +1439,24 @@ scan(void) {
        }
 }
 
        }
 }
 

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


@@ -1330,14 +1464,15 @@ setclientstate(Client *c, long state) {
 
 void
 setlayout(const Arg *arg) {
 
 void
 setlayout(const Arg *arg) {

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

                selmon->sellt ^= 1;
        if(arg && arg->v)
                selmon->sellt ^= 1;
        if(arg && arg->v)

-               lt[selmon->sellt] = (Layout *)arg->v;
-       if(sel)
-               arrange();
+               selmon->lt[selmon->sellt] = (Layout *)arg->v;
+       strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
+       if(selmon->sel)
+               arrange(selmon);

        else
        else

-               drawbars();
+               drawbar(selmon);

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


@@ -1345,46 +1480,40 @@ void
 setmfact(const Arg *arg) {
        float f;
 
 setmfact(const Arg *arg) {
        float f;
 

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

                return;
        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
        if(f < 0.1 || f > 0.9)
                return;
        selmon->mfact = f;
                return;
        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
        if(f < 0.1 || f > 0.9)
                return;
        selmon->mfact = f;

-       arrange();
+       arrange(selmon);

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

-       unsigned int i;
-       int w;

        XSetWindowAttributes wa;
 
        XSetWindowAttributes wa;
 

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

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

-       sx = 0;
-       sy = 0;

        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.h = dc.font.height + 2;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.h = dc.font.height + 2;

-       lt[0] = &layouts[0];
-       lt[1] = &layouts[1 % LENGTH(layouts)];

        updategeom();
        updategeom();

-

        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);

-

        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);

-

        /* init appearance */
        dc.norm[ColBorder] = getcolor(normbordercolor);
        dc.norm[ColBG] = getcolor(normbgcolor);
        /* init appearance */
        dc.norm[ColBorder] = getcolor(normbordercolor);
        dc.norm[ColBG] = getcolor(normbgcolor);


@@ -1397,27 +1526,19 @@ setup(void) {
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);

-

        /* init bars */
        /* init bars */

-       for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
-               w = TEXTW(layouts[i].symbol);
-               blw = MAX(blw, w);
-       }

        updatebars();
        updatestatus();
        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 */
        wa.cursor = cursor[CurNormal];
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
        /* select for events */
        wa.cursor = cursor[CurNormal];
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask

-                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
-                       |PropertyChangeMask;
+                       |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);

-

        grabkeys();
 }
 
        grabkeys();
 }
 


@@ -1425,10 +1546,10 @@ void
 showhide(Client *c) {
        if(!c)
                return;
 showhide(Client *c) {
        if(!c)
                return;

-       if(ISVISIBLE((c->m), c)) { /* show clients top down */
+       if(ISVISIBLE(c)) { /* show clients top down */

                XMoveWindow(dpy, c->win, c->x, c->y);
                XMoveWindow(dpy, c->win, c->x, c->y);

-               if(!lt[c->m->sellt]->arrange || c->isfloating)
-                       resize(c, c->x, c->y, c->w, c->h);
+               if(!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
+                       resize(c, c->x, c->y, c->w, c->h, False);

                showhide(c->snext);
        }
        else { /* hide clients bottom up */
                showhide(c->snext);
        }
        else { /* hide clients bottom up */


@@ -1439,13 +1560,14 @@ showhide(Client *c) {
 
 
 void
 
 
 void

-sigchld(int signal) {
+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) {
        while(0 < waitpid(-1, NULL, WNOHANG));
 }
 
 void
 spawn(const Arg *arg) {

-       signal(SIGCHLD, sigchld);

        if(fork() == 0) {
                if(dpy)
                        close(ConnectionNumber(dpy));
        if(fork() == 0) {
                if(dpy)
                        close(ConnectionNumber(dpy));


@@ -1459,26 +1581,18 @@ spawn(const Arg *arg) {
 
 void
 tag(const Arg *arg) {
 
 void
 tag(const Arg *arg) {

-       if(sel && arg->ui & TAGMASK) {
-               sel->tags = arg->ui & TAGMASK;
-               arrange();
+       if(selmon->sel && arg->ui & TAGMASK) {
+               selmon->sel->tags = arg->ui & TAGMASK;
+               arrange(selmon);

        }
 }
 
        }
 }
 

-#ifdef XINERAMA

 void
 tagmon(const Arg *arg) {
 void
 tagmon(const Arg *arg) {

-       unsigned int i;
-       Monitor *m;
-
-       for(i = 0, m = mons; m; m = m->next, i++)
-               if(i == arg->ui) {
-                       sel->m = m;
-                       arrange();
-                       break;
-               }
+       if(!selmon->sel || !mons->next)
+               return;
+       sendmon(selmon->sel, dirtomon(arg->i));

 }
 }

-#endif /* XINERAMA */

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


@@ -1497,18 +1611,15 @@ tile(Monitor *m) {
        unsigned int i, n;
        Client *c;
 
        unsigned int i, n;
        Client *c;
 

-       for(n = 0, c = nexttiled(m, clients); c; c = nexttiled(m, c->next), n++);
+       for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);

        if(n == 0)
                return;
        if(n == 0)
                return;

-

        /* master */
        /* master */

-       c = nexttiled(m, clients);
+       c = nexttiled(m->clients);

        mw = m->mfact * m->ww;
        mw = m->mfact * m->ww;

-       resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
-
+       resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);

        if(--n == 0)
                return;
        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;
        /* tile stack */
        x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
        y = m->wy;


@@ -1516,10 +1627,9 @@ tile(Monitor *m) {
        h = m->wh / n;
        if(h < bh)
                h = m->wh;
        h = m->wh / n;
        if(h < bh)
                h = m->wh;

-
-       for(i = 0, c = nexttiled(m, c->next); c; c = nexttiled(m, c->next), i++) {
+       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)
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)

-                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);

                if(h != m->wh)
                        y = c->y + HEIGHT(c);
        }
                if(h != m->wh)
                        y = c->y + HEIGHT(c);
        }


@@ -1530,63 +1640,74 @@ togglebar(const Arg *arg) {
        selmon->showbar = !selmon->showbar;
        updatebarpos(selmon);
        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
        selmon->showbar = !selmon->showbar;
        updatebarpos(selmon);
        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);

-       arrange();
+       arrange(selmon);

 }
 
 void
 togglefloating(const Arg *arg) {
 }
 
 void
 togglefloating(const Arg *arg) {

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

                return;
                return;

-       sel->isfloating = !sel->isfloating || sel->isfixed;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h);
-       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
 toggletag(const Arg *arg) {
 }
 
 void
 toggletag(const Arg *arg) {

-       unsigned int mask;
+       unsigned int newtags;

 
 

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

                return;
                return;

-       
-       mask = sel->tags ^ (arg->ui & TAGMASK);
-       if(mask) {
-               sel->tags = mask;
-               arrange();
+       newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
+       if(newtags) {
+               selmon->sel->tags = newtags;
+               arrange(selmon);

        }
 }
 
 void
 toggleview(const Arg *arg) {
        }
 }
 
 void
 toggleview(const Arg *arg) {

-       unsigned int mask = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+       unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);

 
 

-       if(mask) {
-               selmon->tagset[selmon->seltags] = mask;
-               arrange();
+       if(newtagset) {
+               selmon->tagset[selmon->seltags] = newtagset;
+               arrange(selmon);

        }
 }
 
 void
        }
 }
 
 void

-unmanage(Client *c) {
+unfocus(Client *c) {
+       if(!c)
+               return;
+       grabbuttons(c, False);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+void
+unmanage(Client *c, Bool destroyed) {
+       Monitor *m = c->mon;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       wc.border_width = c->oldbw;

        /* 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);
+       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


@@ -1594,8 +1715,8 @@ 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
 }
 
 void


@@ -1606,10 +1727,8 @@ updatebars(void) {
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;

-

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


@@ -1630,86 +1749,87 @@ updatebarpos(Monitor *m) {
                m->by = -bh;
 }
 
                m->by = -bh;
 }
 

-void
+Bool

 updategeom(void) {
 updategeom(void) {

-       int i, n = 1;
-       Client *c;
-       Monitor *newmons = NULL, *m;
+       Bool dirty = False;

 
 

-#ifdef XINERAMA
-       XineramaScreenInfo *info = NULL;
-
-       if(XineramaIsActive(dpy))
-               info = XineramaQueryScreens(dpy, &n);
-#endif
-       /* allocate monitor(s) for the new geometry setup */
-       for(i = 0; i < n; i++) {
-               m = (Monitor *)malloc(sizeof(Monitor));
-               m->next = newmons;
-               newmons = m;
-       }
-
-       /* initialise monitor(s) */

 #ifdef XINERAMA
        if(XineramaIsActive(dpy)) {
 #ifdef XINERAMA
        if(XineramaIsActive(dpy)) {

-               for(i = 0, m = newmons; m; m = m->next, i++) {
-                       m->screen_number = info[i].screen_number;
-                       m->wx = info[i].x_org;
-                       m->my = m->wy = info[i].y_org;
-                       m->ww = info[i].width;
-                       m->mh = m->wh = info[i].height;
-               }
+               int i, j, n, nn;
+               Client *c;
+               Monitor *m;
+               XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
+               XineramaScreenInfo *unique = NULL;
+
+               info = XineramaQueryScreens(dpy, &nn);
+               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);
                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
        }
        else

-#endif
+#endif /* XINERAMA */

        /* default monitor setup */
        {
        /* default monitor setup */
        {

-               m->screen_number = 0;
-               m->wx = sx;
-               m->my = m->wy = sy;
-               m->ww = sw;
-               m->mh = m->wh = sh;
-       }
-
-       /* bar geometry setup */
-       for(m = newmons; m; m = m->next) {
-               /* TODO: consider removing the following values from config.h */
-               m->seltags = 0;
-               m->sellt = 0;
-               m->tagset[0] = m->tagset[1] = 1;
-               m->mfact = mfact;
-               m->showbar = showbar;
-               m->topbar = topbar;
-               updatebarpos(m);
-               /* reassign all clients with same screen number */
-               for(c = clients; c; c = c->next)
-                       if(c->m->screen_number == m->screen_number)
-                               c->m = m;
-       }
-
-       /* reassign left over clients with disappeared screen number */
-       for(c = clients; c; c = c->next)
-               if(c->m->screen_number >= n)
-                       c->m = newmons;
-
-       /* select focused monitor */
-       if(!selmon) {
-               selmon = newmons;
-               int di, x, y;
-               unsigned int dui;
-               Window dummy;
-               if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) 
-                       for(m = newmons; m; m = m->next)
-                               if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
-                                       selmon = m;
-                                       break;
-                               }
+               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);
+               }

        }
        }

-
-       /* final assignment of new monitors */
-       cleanupmons();
-       mons = newmons;
+       if(dirty) {
+               selmon = mons;
+               selmon = wintomon(root);
+       }
+       return dirty;

 }
 
 void
 }
 
 void


@@ -1768,8 +1888,8 @@ updatesizehints(Client *c) {
        else
                c->minw = c->minh = 0;
        if(size.flags & PAspect) {
        else
                c->minw = c->minh = 0;
        if(size.flags & PAspect) {

-               c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
-               c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
+               c->mina = (float)size.min_aspect.y / size.min_aspect.x;
+               c->maxa = (float)size.max_aspect.x / size.max_aspect.y;

        }
        else
                c->maxa = c->mina = 0.0;
        }
        else
                c->maxa = c->mina = 0.0;


@@ -1781,10 +1901,12 @@ void
 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
                gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], 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
 }
 
 void

-updatestatus() {
+updatestatus(void) {

        if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
                strcpy(stext, "dwm-"VERSION);
        drawbar(selmon);
        if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
                strcpy(stext, "dwm-"VERSION);
        drawbar(selmon);


@@ -1795,13 +1917,12 @@ updatewmhints(Client *c) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {

-               if(c == sel && wmh->flags & XUrgencyHint) {
+               if(c == selmon->sel && wmh->flags & XUrgencyHint) {

                        wmh->flags &= ~XUrgencyHint;
                        XSetWMHints(dpy, c->win, wmh);
                }
                else
                        c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
                        wmh->flags &= ~XUrgencyHint;
                        XSetWMHints(dpy, c->win, wmh);
                }
                else
                        c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;

-

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


@@ -1813,7 +1934,35 @@ view(const Arg *arg) {
        selmon->seltags ^= 1; /* toggle sel tagset */
        if(arg->ui & TAGMASK)
                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
        selmon->seltags ^= 1; /* toggle sel tagset */
        if(arg->ui & TAGMASK)
                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;

-       arrange();
+       arrange(selmon);
+}
+
+Client *
+wintoclient(Window w) {
+       Client *c;
+       Monitor *m;
+
+       for(m = mons; m; m = m->next)
+               for(c = m->clients; c; c = c->next)
+                       if(c->win == w)
+                               return c;
+       return NULL;
+}
+
+Monitor *
+wintomon(Window w) {
+       int x, y;
+       Client *c;
+       Monitor *m;
+
+       if(w == root && 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


@@ -1851,17 +2000,19 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 
 void
 zoom(const Arg *arg) {
 
 void
 zoom(const Arg *arg) {

-       Client *c = sel;
+       Client *c = selmon->sel;

 
 

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

                return;
                return;

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

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

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

 }
 
 int
 }
 
 int


@@ -1870,19 +2021,15 @@ main(int argc, char *argv[]) {
                die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
        else if(argc != 1)
                die("usage: dwm [-v]\n");
                die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
        else if(argc != 1)
                die("usage: dwm [-v]\n");

-

        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);

-

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

-

        checkotherwm();
        setup();
        scan();
        run();
        cleanup();
        checkotherwm();
        setup();
        scan();
        run();
        cleanup();

-

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