made arrange() Monitor-dependent as well, fixed the movemouse/resizemouse issues

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 48e0dd1..4d5a9b9 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -60,6 +60,7 @@ enum { NetSupported, NetWMName, NetLast };            /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */

+typedef struct Monitor Monitor;

 typedef struct Client Client;
 struct Client {
        char name[256];
 typedef struct Client Client;
 struct Client {
        char name[256];


@@ -74,7 +75,7 @@ struct Client {
        Client *prev;
        Client *snext;
        Window win;
        Client *prev;
        Client *snext;
        Window win;

-       int monitor;
+       Monitor *monitor;

 };
 
 typedef struct {
 };
 
 typedef struct {


@@ -101,7 +102,7 @@ typedef struct {
 
 typedef struct {
        const char *symbol;
 
 typedef struct {
        const char *symbol;

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

 } Layout;
 
 typedef struct {
 } Layout;
 
 typedef struct {


@@ -116,21 +117,20 @@ typedef struct {
        regex_t *tagregex;
 } Regs;
 
        regex_t *tagregex;
 } Regs;
 

-typedef struct {
-       int screen;
-       Window root;
-       Window barwin;
+struct Monitor {
+       unsigned int id;

        int sx, sy, sw, sh, wax, way, wah, waw;
        int sx, sy, sw, sh, wax, way, wah, waw;

-       DC dc;
+       double mwfact;

        Bool *seltags;
        Bool *prevtags;
        Layout *layout;
        Bool *seltags;
        Bool *prevtags;
        Layout *layout;

-       double mwfact;
-} Monitor;
+       Window barwin;
+};
+

 
 /* function declarations */
 void applyrules(Client *c);
 
 /* function declarations */
 void applyrules(Client *c);

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

 void attach(Client *c);
 void attachstack(Client *c);
 void ban(Client *c);
 void attach(Client *c);
 void attachstack(Client *c);
 void ban(Client *c);


@@ -144,43 +144,45 @@ void configurerequest(XEvent *e);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);

-void drawbar(void);
-void drawsquare(Monitor *, Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(Monitor *, const char *text, unsigned long col[ColLast], Bool invert);
+void drawbar(Monitor *m);
+void drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert);

 void *emallocz(unsigned int size);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
 void *emallocz(unsigned int size);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);

-void floating(void); /* default floating layout */
+void floating(Monitor *m); /* default floating layout */

 void focus(Client *c);
 void focusin(XEvent *e);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);
 void focus(Client *c);
 void focusin(XEvent *e);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);

-unsigned long getcolor(const char *colstr, int screen);
+unsigned long getcolor(const char *colstr);
+Monitor *getmonitor(Window barwin);

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

-void initfont(Monitor*, const char *fontstr);
-Bool isoccupied(Monitor *m, unsigned int t);
+void initfont(const char *fontstr);
+Bool isoccupied(Monitor *monitor, unsigned int t);

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

-Bool isurgent(int monitor, unsigned int t);
-Bool isvisible(Client *c, int monitor);
+Bool isurgent(Monitor *monitor, unsigned int t);
+Bool isvisible(Client *c, Monitor *m);

 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);

+Monitor *monitorat(void);

 void movemouse(Client *c);
 void movemouse(Client *c);

-Client *nexttiled(Client *c, int monitor);
+Client *nexttiled(Client *c, Monitor *monitor);

 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void reapply(const char *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void reapply(const char *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);

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

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


@@ -189,9 +191,9 @@ void setmwfact(const char *arg);
 void setup(void);
 void spawn(const char *arg);
 void tag(const char *arg);
 void setup(void);
 void spawn(const char *arg);
 void tag(const char *arg);

-unsigned int textnw(Monitor*, const char *text, unsigned int len);
-unsigned int textw(Monitor*, const char *text);
-void tile(void);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
+void tile(Monitor *m);

 void togglebar(const char *arg);
 void togglefloating(const char *arg);
 void toggletag(const char *arg);
 void togglebar(const char *arg);
 void togglefloating(const char *arg);
 void toggletag(const char *arg);


@@ -209,13 +211,14 @@ int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dsply, XErrorEvent *ee);
 int xerrorstart(Display *dsply, XErrorEvent *ee);
 void zoom(const char *arg);
 int xerrordummy(Display *dsply, XErrorEvent *ee);
 int xerrorstart(Display *dsply, XErrorEvent *ee);
 void zoom(const char *arg);

-int monitorat(void);

 void movetomonitor(const char *arg);
 void selectmonitor(const char *arg);
 
 /* variables */
 char stext[256];
 int mcount = 1;
 void movetomonitor(const char *arg);
 void selectmonitor(const char *arg);
 
 /* variables */
 char stext[256];
 int mcount = 1;

+Monitor *selmonitor;
+int screen;

 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;


@@ -248,7 +251,7 @@ Display *dpy;
 DC dc = {0};
 Regs *regs = NULL;
 Monitor *monitors;
 DC dc = {0};
 Regs *regs = NULL;
 Monitor *monitors;

-int selmonitor = 0;
+Window root;

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


@@ -274,7 +277,7 @@ applyrules(Client *c) {
                if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
                        if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
                                matched_monitor = True;
                if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
                        if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
                                matched_monitor = True;

-                               c->monitor = rules[i].monitor;
+                               c->monitor = &monitors[rules[i].monitor];

                        }
 
                        c->isfloating = rules[i].isfloating;
                        }
 
                        c->isfloating = rules[i].isfloating;


@@ -290,13 +293,14 @@ applyrules(Client *c) {
        if(ch.res_name)
                XFree(ch.res_name);
        if(!matched_tag)
        if(ch.res_name)
                XFree(ch.res_name);
        if(!matched_tag)

-               memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
+               memcpy(c->tags, monitorat()->seltags, sizeof initags);

        if (!matched_monitor)
                c->monitor = monitorat();
 }
 
 void
        if (!matched_monitor)
                c->monitor = monitorat();
 }
 
 void

-arrange(void) {
+arrange(Monitor *m) {
+       unsigned int i;

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


@@ -305,9 +309,13 @@ arrange(void) {
                else
                        ban(c);
 
                else
                        ban(c);
 

-       monitors[selmonitor].layout->arrange();
+       if(m)
+               m->layout->arrange(m);
+       else
+               for(i = 0; i < mcount; i++)
+                       m->layout->arrange(&monitors[i]);

        focus(NULL);
        focus(NULL);

-       restack();
+       restack(m);

 }
 
 void
 }
 
 void


@@ -328,7 +336,7 @@ void
 ban(Client *c) {
        if(c->isbanned)
                return;
 ban(Client *c) {
        if(c->isbanned)
                return;

-       XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
+       XMoveWindow(dpy, c->win, c->x + 3 * c->monitor->sw, c->y);

        c->isbanned = True;
 }
 
        c->isbanned = True;
 }
 


@@ -338,12 +346,12 @@ buttonpress(XEvent *e) {
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 

-       Monitor *m = &monitors[monitorat()];
+       Monitor *m = monitorat();

 
        if(ev->window == m->barwin) {
                x = 0;
                for(i = 0; i < LENGTH(tags); i++) {
 
        if(ev->window == m->barwin) {
                x = 0;
                for(i = 0; i < LENGTH(tags); i++) {

-                       x += textw(m, tags[i]);
+                       x += textw(tags[i]);

                        if(ev->x < x) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
                        if(ev->x < x) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)


@@ -368,7 +376,7 @@ buttonpress(XEvent *e) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1) {

-                       restack();
+                       restack(c->monitor);

                        movemouse(c);
                }
                else if(ev->button == Button2) {
                        movemouse(c);
                }
                else if(ev->button == Button2) {


@@ -378,7 +386,7 @@ buttonpress(XEvent *e) {
                                zoom(NULL);
                }
                else if(ev->button == Button3 && !c->isfixed) {
                                zoom(NULL);
                }
                else if(ev->button == Button3 && !c->isfixed) {

-                       restack();
+                       restack(c->monitor);

                        resizemouse(c);
                }
        }
                        resizemouse(c);
                }
        }


@@ -408,22 +416,21 @@ cleanup(void) {
                unban(stack);
                unmanage(stack);
        }
                unban(stack);
                unmanage(stack);
        }

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               if(m->dc.font.set)
-                       XFreeFontSet(dpy, m->dc.font.set);
-               else
-                       XFreeFont(dpy, m->dc.font.xfont);
-               XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
-               XFreePixmap(dpy, m->dc.drawable);
-               XFreeGC(dpy, m->dc.gc);
-               XDestroyWindow(dpy, m->barwin);
-               XFreeCursor(dpy, cursor[CurNormal]);
-               XFreeCursor(dpy, cursor[CurResize]);
-               XFreeCursor(dpy, cursor[CurMove]);
-               XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-               XSync(dpy, False);
-       }
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       else
+               XFreeFont(dpy, dc.font.xfont);
+
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       XFreePixmap(dpy, dc.drawable);
+       XFreeGC(dpy, dc.gc);
+       XFreeCursor(dpy, cursor[CurNormal]);
+       XFreeCursor(dpy, cursor[CurResize]);
+       XFreeCursor(dpy, cursor[CurMove]);
+       for(i = 0; i < mcount; i++)
+               XDestroyWindow(dpy, monitors[i].barwin);
+       XSync(dpy, False);
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

 }
 
 void
 }
 
 void


@@ -473,16 +480,17 @@ configure(Client *c) {
 void
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 void
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;

-       Monitor *m = &monitors[selmonitor];
+       Monitor *m = selmonitor;

 
 

-       if(ev->window == m->root && (ev->width != m->sw || ev->height != m->sh)) {
+       if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
+               /* TODO -- update Xinerama dimensions here */

                m->sw = ev->width;
                m->sh = ev->height;
                XFreePixmap(dpy, dc.drawable);
                m->sw = ev->width;
                m->sh = ev->height;
                XFreePixmap(dpy, dc.drawable);

-               dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
+               dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));

                XResizeWindow(dpy, m->barwin, m->sw, bh);
                updatebarpos(m);
                XResizeWindow(dpy, m->barwin, m->sw, bh);
                updatebarpos(m);

-               arrange();
+               arrange(m);

        }
 }
 
        }
 }
 


@@ -493,7 +501,7 @@ configurerequest(XEvent *e) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {

-               Monitor *m = &monitors[c->monitor];
+               Monitor *m = c->monitor;

                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {


@@ -560,66 +568,71 @@ detachstack(Client *c) {
 }
 
 void
 }
 
 void

-drawbar(void) {
-       int i, j, x;
+drawbar(Monitor *m) {
+       int j, x;
+       Client *c;

 
 

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               m->dc.x = 0;
-               for(j = 0; j < LENGTH(tags); j++) {
-                       m->dc.w = textw(m, tags[j]);
-                       if(m->seltags[j]) {
-                               drawtext(m, tags[j], m->dc.sel, isurgent(i, j));
-                               drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
-                       }
-                       else {
-                               drawtext(m, tags[j], m->dc.norm, isurgent(i, j));
-                               drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm);
-                       }
-                       m->dc.x += m->dc.w;
+       dc.x = 0;
+       for(c = stack; c && !isvisible(c, m); c = c->snext);
+       for(j = 0; j < LENGTH(tags); j++) {
+               dc.w = textw(tags[j]);
+               if(m->seltags[j]) {
+                       drawtext(m, tags[j], dc.sel, isurgent(m, j));
+                       drawsquare(m, c && c->tags[j] && c->monitor == m,
+                                       isoccupied(m, j), isurgent(m, j), dc.sel);

                }
                }

-               m->dc.w = blw;
-               drawtext(m, m->layout->symbol, m->dc.norm, False);
-               x = m->dc.x + m->dc.w;
-               m->dc.w = textw(m, stext);
-               m->dc.x = m->sw - m->dc.w;
-               if(m->dc.x < x) {
-                       m->dc.x = x;
-                       m->dc.w = m->sw - x;
+               else {
+                       drawtext(m, tags[j], dc.norm, isurgent(m, j));
+                       drawsquare(m, c && c->tags[j] && c->monitor == m,
+                                       isoccupied(m, j), isurgent(m, j), dc.norm);

                }
                }

-               drawtext(m, stext, m->dc.norm, False);
-               if((m->dc.w = m->dc.x - x) > bh) {
-                       m->dc.x = x;
-                       if(sel && sel->monitor == selmonitor) {
-                               drawtext(m, sel->name, m->dc.sel, False);
-                               drawsquare(m, False, sel->isfloating, m->dc.sel);
-                       }
-                       else
-                               drawtext(m, NULL, m->dc.norm, False);
+               dc.x += dc.w;
+       }
+       dc.w = blw;
+       drawtext(m, m->layout->symbol, dc.norm, False);
+       x = dc.x + dc.w;
+       if(m == selmonitor) {
+               dc.w = textw(stext);
+               dc.x = m->sw - dc.w;
+               if(dc.x < x) {
+                       dc.x = x;
+                       dc.w = m->sw - x;

                }
                }

-               XCopyArea(dpy, m->dc.drawable, m->barwin, m->dc.gc, 0, 0, m->sw, bh, 0, 0);
-               XSync(dpy, False);
+               drawtext(m, stext, dc.norm, False);
+       }
+       else
+               dc.x = m->sw;
+       if((dc.w = dc.x - x) > bh) {
+               dc.x = x;
+               if(c) {
+                       drawtext(m, c->name, dc.sel, False);
+                       drawsquare(m, False, c->isfloating, False, dc.sel);
+               }
+               else
+                       drawtext(m, NULL, dc.norm, False);

        }
        }

+       XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
+       XSync(dpy, False);

 }
 
 void
 }
 
 void

-drawsquare(Monitor *m, Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {

        int x;
        XGCValues gcv;
        int x;
        XGCValues gcv;

-       XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };

 
 

-       gcv.foreground = col[ColFG];
-       XChangeGC(dpy, m->dc.gc, GCForeground, &gcv);
-       x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4;
-       r.x = m->dc.x + 1;
-       r.y = m->dc.y + 1;
+       gcv.foreground = col[invert ? ColBG : ColFG];
+       XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+       x = (dc.font.ascent + dc.font.descent + 2) / 4;
+       r.x = dc.x + 1;
+       r.y = dc.y + 1;

        if(filled) {
                r.width = r.height = x + 1;
        if(filled) {
                r.width = r.height = x + 1;

-               XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
        else if(empty) {
                r.width = r.height = x;
        }
        else if(empty) {
                r.width = r.height = x;

-               XDrawRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
 }
 
        }
 }
 


@@ -628,10 +641,10 @@ drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert)
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;

-       XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };

 
 

-       XSetForeground(dpy, m->dc.gc, col[invert ? ColFG : ColBG]);
-       XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+       XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        if(!text)
                return;
        w = 0;
        if(!text)
                return;
        w = 0;


@@ -640,11 +653,11 @@ drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert)
                len = sizeof buf - 1;
        memcpy(buf, text, len);
        buf[len] = 0;
                len = sizeof buf - 1;
        memcpy(buf, text, len);
        buf[len] = 0;

-       h = m->dc.font.ascent + m->dc.font.descent;
-       y = m->dc.y + (m->dc.h / 2) - (h / 2) + m->dc.font.ascent;
-       x = m->dc.x + (h / 2);
+       h = dc.font.ascent + dc.font.descent;
+       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+       x = dc.x + (h / 2);

        /* shorten text if necessary */
        /* shorten text if necessary */

-       while(len && (w = textnw(m, buf, len)) > m->dc.w - h)
+       while(len && (w = textnw(buf, len)) > dc.w - h)

                buf[--len] = 0;
        if(len < olen) {
                if(len > 1)
                buf[--len] = 0;
        if(len < olen) {
                if(len > 1)


@@ -654,13 +667,13 @@ drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert)
                if(len > 3)
                        buf[len - 3] = '.';
        }
                if(len > 3)
                        buf[len - 3] = '.';
        }

-       if(w > m->dc.w)
+       if(w > dc.w)

                return; /* too long */
                return; /* too long */

-       XSetForeground(dpy, m->dc.gc, col[invert ? ColBG : ColFG]);
-       if(m->dc.font.set)
-               XmbDrawString(dpy, m->dc.drawable, m->dc.font.set, m->dc.gc, x, y, buf, len);
+       XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
+       if(dc.font.set)
+               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);

        else
        else

-               XDrawString(dpy, m->dc.drawable, m->dc.gc, x, y, buf, len);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);

 }
 
 void *
 }
 
 void *


@@ -677,13 +690,15 @@ enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 

-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior);
-               //return;
+       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
+               if(!isxinerama || ev->window != root)
+                       return;
+       }

        if((c = getclient(ev->window)))
                focus(c);
        else {
                selmonitor = monitorat();
        if((c = getclient(ev->window)))
                focus(c);
        else {
                selmonitor = monitorat();

-               fprintf(stderr, "updating selmonitor %d\n", selmonitor);
+               fprintf(stderr, "updating selmonitor %d\n", selmonitor - monitors);

                focus(NULL);
        }
 }
                focus(NULL);
        }
 }


@@ -700,36 +715,32 @@ eprint(const char *errstr, ...) {
 
 void
 expose(XEvent *e) {
 
 void
 expose(XEvent *e) {

+       Monitor *m;

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

-       if(ev->count == 0) {
-               if(ev->window == monitors[selmonitor].barwin)
-                       drawbar();
-       }
+       if(ev->count == 0 && (m = getmonitor(ev->window)))
+               drawbar(m);

 }
 
 void
 }
 
 void

-floating(void) { /* default floating layout */
+floating(Monitor *m) { /* default floating layout */

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

-               if(isvisible(c, selmonitor))
+               if(isvisible(c, m))

                        resize(c, c->x, c->y, c->w, c->h, True);
 }
 
 void
 focus(Client *c) {
                        resize(c, c->x, c->y, c->w, c->h, True);
 }
 
 void
 focus(Client *c) {

-       Monitor *m;
-

        if(c)
                selmonitor = c->monitor;
        if(c)
                selmonitor = c->monitor;

-       m = &monitors[selmonitor];

        if(!c || (c && !isvisible(c, selmonitor)))
                for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
        if(sel && sel != c) {
                grabbuttons(sel, False);
        if(!c || (c && !isvisible(c, selmonitor)))
                for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
        if(sel && sel != c) {
                grabbuttons(sel, False);

-               XSetWindowBorder(dpy, sel->win, monitors[sel->monitor].dc.norm[ColBorder]);
+               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);

        }
        if(c) {
                detachstack(c);
        }
        if(c) {
                detachstack(c);


@@ -737,15 +748,14 @@ focus(Client *c) {
                grabbuttons(c, True);
        }
        sel = c;
                grabbuttons(c, True);
        }
        sel = c;

-       drawbar();

        if(c) {
        if(c) {

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

                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                selmonitor = c->monitor;
        }
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                selmonitor = c->monitor;
        }

-       else {
-               XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime);
-       }
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       drawbar(selmonitor);

 }
 
 void
 }
 
 void


@@ -767,7 +777,7 @@ focusnext(const char *arg) {
                for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
        if(c) {
                focus(c);
                for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
        if(c) {
                focus(c);

-               restack();
+               restack(c->monitor);

        }
 }
 
        }
 }
 


@@ -784,7 +794,7 @@ focusprev(const char *arg) {
        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);

-               restack();
+               restack(c->monitor);

        }
 }
 
        }
 }
 


@@ -797,7 +807,7 @@ getclient(Window w) {
 }
 
 unsigned long
 }
 
 unsigned long

-getcolor(const char *colstr, int screen) {
+getcolor(const char *colstr) {

        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 


@@ -806,6 +816,16 @@ getcolor(const char *colstr, int screen) {
        return color.pixel;
 }
 
        return color.pixel;
 }
 

+Monitor *
+getmonitor(Window barwin) {
+       unsigned int i;
+
+       for(i = 0; i < mcount; i++)
+               if(monitors[i].barwin == barwin)
+                       return &monitors[i];
+       return NULL;
+}
+

 long
 getstate(Window w) {
        int format, status;
 long
 getstate(Window w) {
        int format, status;


@@ -902,20 +922,17 @@ grabkeys(void)  {
                }
        XFreeModifiermap(modmap);
 
                }
        XFreeModifiermap(modmap);
 

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
-               for(j = 0; j < LENGTH(keys); j++) {
-                       code = XKeysymToKeycode(dpy, keys[j].keysym);
-                       XGrabKey(dpy, code, keys[j].mod, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[j].mod | LockMask, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[j].mod | numlockmask, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[j].mod | numlockmask | LockMask, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-               }
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       for(i = 0; i < LENGTH(keys); i++) {
+               code = XKeysymToKeycode(dpy, keys[i].keysym);
+               XGrabKey(dpy, code, keys[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);

        }
 }
 
        }
 }
 


@@ -928,53 +945,53 @@ idxoftag(const char *tag) {
 }
 
 void
 }
 
 void

-initfont(Monitor *m, const char *fontstr) {
+initfont(const char *fontstr) {

        char *def, **missing;
        int i, n;
 
        missing = NULL;
        char *def, **missing;
        int i, n;
 
        missing = NULL;

-       if(m->dc.font.set)
-               XFreeFontSet(dpy, m->dc.font.set);
-       m->dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);

        if(missing) {
                while(n--)
                        fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
        }
        if(missing) {
                while(n--)
                        fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
        }

-       if(m->dc.font.set) {
+       if(dc.font.set) {

                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;

-               m->dc.font.ascent = m->dc.font.descent = 0;
-               font_extents = XExtentsOfFontSet(m->dc.font.set);
-               n = XFontsOfFontSet(m->dc.font.set, &xfonts, &font_names);
-               for(i = 0, m->dc.font.ascent = 0, m->dc.font.descent = 0; i < n; i++) {
-                       if(m->dc.font.ascent < (*xfonts)->ascent)
-                               m->dc.font.ascent = (*xfonts)->ascent;
-                       if(m->dc.font.descent < (*xfonts)->descent)
-                               m->dc.font.descent = (*xfonts)->descent;
+               dc.font.ascent = dc.font.descent = 0;
+               font_extents = XExtentsOfFontSet(dc.font.set);
+               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+                       if(dc.font.ascent < (*xfonts)->ascent)
+                               dc.font.ascent = (*xfonts)->ascent;
+                       if(dc.font.descent < (*xfonts)->descent)
+                               dc.font.descent = (*xfonts)->descent;

                        xfonts++;
                }
        }
        else {
                        xfonts++;
                }
        }
        else {

-               if(m->dc.font.xfont)
-                       XFreeFont(dpy, m->dc.font.xfont);
-               m->dc.font.xfont = NULL;
-               if(!(m->dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-               && !(m->dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+               if(dc.font.xfont)
+                       XFreeFont(dpy, dc.font.xfont);
+               dc.font.xfont = NULL;
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))

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

-               m->dc.font.ascent = m->dc.font.xfont->ascent;
-               m->dc.font.descent = m->dc.font.xfont->descent;
+               dc.font.ascent = dc.font.xfont->ascent;
+               dc.font.descent = dc.font.xfont->descent;

        }
        }

-       m->dc.font.height = m->dc.font.ascent + m->dc.font.descent;
+       dc.font.height = dc.font.ascent + dc.font.descent;

 }
 
 Bool
 }
 
 Bool

-isoccupied(Monitor *m, unsigned int t) {
+isoccupied(Monitor *monitor, unsigned int t) {

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

-               if(c->tags[t] && c->monitor == selmonitor)
+               if(c->tags[t] && c->monitor == monitor)

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


@@ -995,7 +1012,7 @@ isprotodel(Client *c) {
 }
 
 Bool
 }
 
 Bool

-isurgent(int monitor, unsigned int t) {
+isurgent(Monitor *monitor, unsigned int t) {

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


@@ -1005,11 +1022,13 @@ isurgent(int monitor, unsigned int t) {
 }
 
 Bool
 }
 
 Bool

-isvisible(Client *c, int monitor) {
+isvisible(Client *c, Monitor *m) {

        unsigned int i;
 
        unsigned int i;
 

+       if(c->monitor != m)
+               return False;

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

-               if(c->tags[i] && monitors[c->monitor].seltags[i] && c->monitor == monitor)
+               if(c->tags[i] && c->monitor->seltags[i])

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


@@ -1064,7 +1083,7 @@ manage(Window w, XWindowAttributes *wa) {
 
        applyrules(c);
 
 
        applyrules(c);
 

-       m = &monitors[c->monitor];
+       m = c->monitor;

 
        c->x = wa->x + m->sx;
        c->y = wa->y + m->sy;
 
        c->x = wa->x + m->sx;
        c->y = wa->y + m->sy;


@@ -1090,7 +1109,7 @@ manage(Window w, XWindowAttributes *wa) {
        }
        wc.border_width = c->border;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        }
        wc.border_width = c->border;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);

-       XSetWindowBorder(dpy, w, m->dc.norm[ColBorder]);
+       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);

        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);
        XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);
        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);
        XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);


@@ -1108,7 +1127,7 @@ manage(Window w, XWindowAttributes *wa) {
        ban(c);
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        ban(c);
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);

-       arrange();
+       arrange(m);

 }
 
 void
 }
 
 void


@@ -1133,38 +1152,37 @@ maprequest(XEvent *e) {
                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 

-int
+Monitor *

 monitorat() {
        int i, x, y;
        Window win;
        unsigned int mask;
 
 monitorat() {
        int i, x, y;
        Window win;
        unsigned int mask;
 

-       XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask);
+       XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);

        for(i = 0; i < mcount; i++) {
        for(i = 0; i < mcount; i++) {

-               fprintf(stderr, "checking monitor[%d]: %d %d %d %d\n", i, monitors[i].sx, monitors[i].sy, monitors[i].sw, monitors[i].sh);

                if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
                && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
                if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
                && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {

-                       fprintf(stderr, "%d,%d -> %d\n", x, y, i);
-                       return i;
+                       return &monitors[i];

                }
        }
                }
        }

-       fprintf(stderr, "?,? -> 0\n");
-       return 0;
+       return NULL;

 }
 
 void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;
        unsigned int dui;
 }
 
 void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;
        unsigned int dui;

+       Monitor *m;

        Window dummy;
        XEvent ev;
 
        ocx = nx = c->x;
        ocy = ny = c->y;
        Window dummy;
        XEvent ev;
 
        ocx = nx = c->x;
        ocy = ny = c->y;

-       if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+       m = c->monitor;
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;

-       XQueryPointer(dpy, monitors[selmonitor].root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);

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


@@ -1180,7 +1198,6 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);

-                       Monitor *m = &monitors[monitorat()];

                        if(abs(m->wax - nx) < SNAP)
                                nx = m->wax;
                        else if(abs((m->wax + m->waw) - (nx + c->w + 2 * c->border)) < SNAP)
                        if(abs(m->wax - nx) < SNAP)
                                nx = m->wax;
                        else if(abs((m->wax + m->waw) - (nx + c->w + 2 * c->border)) < SNAP)


@@ -1189,18 +1206,17 @@ movemouse(Client *c) {
                                ny = m->way;
                        else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
                                ny = m->way + m->wah - c->h - 2 * c->border;
                                ny = m->way;
                        else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
                                ny = m->way + m->wah - c->h - 2 * c->border;

-                       if((monitors[selmonitor].layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+                       if(!c->isfloating && (m->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))

                                togglefloating(NULL);
                                togglefloating(NULL);

-                       if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+                       if((m->layout->arrange == floating) || c->isfloating)

                                resize(c, nx, ny, c->w, c->h, False);
                                resize(c, nx, ny, c->w, c->h, False);

-                       memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);

                        break;
                }
        }
 }
 
 Client *
                        break;
                }
        }
 }
 
 Client *

-nexttiled(Client *c, int monitor) {
+nexttiled(Client *c, Monitor *monitor) {

        for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
        return c;
 }
        for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
        return c;
 }


@@ -1215,24 +1231,24 @@ propertynotify(XEvent *e) {
                return; /* ignore */
        if((c = getclient(ev->window))) {
                switch (ev->atom) {
                return; /* ignore */
        if((c = getclient(ev->window))) {
                switch (ev->atom) {

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

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

-                               drawbar();
+                               drawbar(c->monitor);

                }
        }
 }
                }
        }
 }


@@ -1251,14 +1267,15 @@ reapply(const char *arg) {
                memcpy(c->tags, zerotags, sizeof zerotags);
                applyrules(c);
        }
                memcpy(c->tags, zerotags, sizeof zerotags);
                applyrules(c);
        }

-       arrange();
+       arrange(NULL);

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

+       Monitor *m;

        XWindowChanges wc;
        XWindowChanges wc;

-       //Monitor scr = monitors[monitorat()];
-//     c->monitor = monitorat();
+
+       m = c->monitor;

 
        if(sizehints) {
                /* set minimum possible */
 
        if(sizehints) {
                /* set minimum possible */


@@ -1300,17 +1317,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
        if(w <= 0 || h <= 0)
                return;
        }
        if(w <= 0 || h <= 0)
                return;

-       /* TODO: offscreen appearance fixes */
-       /*
-       if(x > scr.sw)
-               x = scr.sw - w - 2 * c->border;
-       if(y > scr.sh)
-               y = scr.sh - h - 2 * c->border;
-       if(x + w + 2 * c->border < scr.sx)
-               x = scr.sx;
-       if(y + h + 2 * c->border < scr.sy)
-               y = scr.sy;
-       */
+       if(x > m->sw)
+               x = m->sw - w - 2 * c->border;
+       if(y > m->sh)
+               y = m->sh - h - 2 * c->border;
+       if(x + w + 2 * c->border < m->sx)
+               x = m->sx;
+       if(y + h + 2 * c->border < m->sy)
+               y = m->sy;

        if(c->x != x || c->y != y || c->w != w || c->h != h) {
                c->x = wc.x = x;
                c->y = wc.y = y;
        if(c->x != x || c->y != y || c->w != w || c->h != h) {
                c->x = wc.x = x;
                c->y = wc.y = y;


@@ -1327,11 +1341,13 @@ void
 resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;
 resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;

+       Monitor *m;

        XEvent ev;
 
        ocx = c->x;
        ocy = c->y;
        XEvent ev;
 
        ocx = c->x;
        ocy = c->y;

-       if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+       m = c->monitor;
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);


@@ -1355,9 +1371,9 @@ resizemouse(Client *c) {
                                nw = 1;
                        if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
                                nh = 1;
                                nw = 1;
                        if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
                                nh = 1;

-                       if((monitors[selmonitor].layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+                       if(!c->isfloating && (m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))

                                togglefloating(NULL);
                                togglefloating(NULL);

-                       if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+                       if((m->layout->arrange == floating) || c->isfloating)

                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }


@@ -1365,31 +1381,28 @@ resizemouse(Client *c) {
 }
 
 void
 }
 
 void

-restack(void) {
-       unsigned int i;
+restack(Monitor *m) {

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

-       drawbar();
+       drawbar(m);

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

-       if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating))
+       if(sel->isfloating || (m->layout->arrange == floating))

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

-       if(monitors[selmonitor].layout->arrange != floating) {
+       if(m->layout->arrange != floating) {

                wc.stack_mode = Below;
                wc.stack_mode = Below;

-               wc.sibling = monitors[selmonitor].barwin;
+               wc.sibling = m->barwin;

                if(!sel->isfloating) {
                        XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
                        wc.sibling = sel->win;
                }
                if(!sel->isfloating) {
                        XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
                        wc.sibling = sel->win;
                }

-               for(i = 0; i < mcount; i++) {
-                       for(c = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
-                               if(c == sel)
-                                       continue;
-                               XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-                               wc.sibling = c->win;
-                       }
+               for(c = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
+                       if(c == sel)
+                               continue;
+                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = c->win;

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


@@ -1446,7 +1459,7 @@ run(void) {
                                        }
                                break;
                        }
                                        }
                                break;
                        }

-                       drawbar();
+                       drawbar(selmonitor);

                }
                while(XPending(dpy)) {
                        XNextEvent(dpy, &ev);
                }
                while(XPending(dpy)) {
                        XNextEvent(dpy, &ev);


@@ -1458,32 +1471,29 @@ run(void) {
 
 void
 scan(void) {
 
 void
 scan(void) {

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

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

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               wins = NULL;
-               if(XQueryTree(dpy, m->root, &d1, &d2, &wins, &num)) {
-                       for(j = 0; j < num; j++) {
-                               if(!XGetWindowAttributes(dpy, wins[j], &wa)
-                               || wa.override_redirect || XGetTransientForHint(dpy, wins[j], &d1))
-                                       continue;
-                               if(wa.map_state == IsViewable || getstate(wins[j]) == IconicState)
-                                       manage(wins[j], &wa);
-                       }
-                       for(j = 0; j < num; j++) { /* now the transients */
-                               if(!XGetWindowAttributes(dpy, wins[j], &wa))
-                                       continue;
-                               if(XGetTransientForHint(dpy, wins[j], &d1)
-                               && (wa.map_state == IsViewable || getstate(wins[j]) == IconicState))
-                                       manage(wins[j], &wa);
-                       }
+       wins = NULL;
+       if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
+               for(i = 0; i < num; i++) {
+                       if(!XGetWindowAttributes(dpy, wins[i], &wa)
+                                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+                               continue;
+                       if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+                               manage(wins[i], &wa);
+               }
+               for(i = 0; i < num; i++) { /* now the transients */
+                       if(!XGetWindowAttributes(dpy, wins[i], &wa))
+                               continue;
+                       if(XGetTransientForHint(dpy, wins[i], &d1)
+                                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+                               manage(wins[i], &wa);

                }
                }

-               if(wins)
-                       XFree(wins);

        }
        }

+       if(wins)
+               XFree(wins);

 }
 
 void
 }
 
 void


@@ -1497,7 +1507,7 @@ setclientstate(Client *c, long state) {
 void
 setlayout(const char *arg) {
        unsigned int i;
 void
 setlayout(const char *arg) {
        unsigned int i;

-       Monitor *m = &monitors[monitorat()];
+       Monitor *m = monitorat();

 
        if(!arg) {
                m->layout++;
 
        if(!arg) {
                m->layout++;


@@ -1513,16 +1523,16 @@ setlayout(const char *arg) {
                m->layout = &layouts[i];
        }
        if(sel)
                m->layout = &layouts[i];
        }
        if(sel)

-               arrange();
+               arrange(m);

        else
        else

-               drawbar();
+               drawbar(m);

 }
 
 void
 setmwfact(const char *arg) {
        double delta;
 
 }
 
 void
 setmwfact(const char *arg) {
        double delta;
 

-       Monitor *m = &monitors[monitorat()];
+       Monitor *m = monitorat();

 
        if(!domwfact)
                return;
 
        if(!domwfact)
                return;


@@ -1539,12 +1549,12 @@ setmwfact(const char *arg) {
                else if(m->mwfact > 0.9)
                        m->mwfact = 0.9;
        }
                else if(m->mwfact > 0.9)
                        m->mwfact = 0.9;
        }

-       arrange();
+       arrange(m);

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

-       unsigned int i, j, k;
+       unsigned int i;

        Monitor *m;
        XSetWindowAttributes wa;
        XineramaScreenInfo *info = NULL;
        Monitor *m;
        XSetWindowAttributes wa;
        XineramaScreenInfo *info = NULL;


@@ -1563,17 +1573,37 @@ setup(void) {
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        // init screens/monitors first
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        // init screens/monitors first

-       mcount = 1;

        if((isxinerama = XineramaIsActive(dpy)))
                info = XineramaQueryScreens(dpy, &mcount);
        if((isxinerama = XineramaIsActive(dpy)))
                info = XineramaQueryScreens(dpy, &mcount);

-       monitors = emallocz(mcount * sizeof(Monitor));
-
+       selmonitor = monitors = emallocz(mcount * sizeof(Monitor));
+
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+
+       /* init appearance */
+       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
+       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
+       dc.sel[ColBG] = getcolor(SELBGCOLOR);
+       dc.sel[ColFG] = getcolor(SELFGCOLOR);
+       initfont(FONT);
+       dc.h = bh = dc.font.height + 2;
+       dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
+       dc.gc = XCreateGC(dpy, root, 0, 0);
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       if(!dc.font.set)
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+
+       for(blw = i = 0; i < LENGTH(layouts); i++) {
+               i = textw(layouts[i].symbol);
+               if(i > blw)
+                       blw = i;
+       }

        for(i = 0; i < mcount; i++) {
                /* init geometry */
                m = &monitors[i];
        for(i = 0; i < mcount; i++) {
                /* init geometry */
                m = &monitors[i];

-
-               m->screen = isxinerama ? 0 : i;
-               m->root = RootWindow(dpy, m->screen);
+               m->id = i;

 
                if (mcount != 1 && isxinerama) {
                        m->sx = info[i].x_org;
 
                if (mcount != 1 && isxinerama) {
                        m->sx = info[i].x_org;


@@ -1585,8 +1615,8 @@ setup(void) {
                else {
                        m->sx = 0;
                        m->sy = 0;
                else {
                        m->sx = 0;
                        m->sy = 0;

-                       m->sw = DisplayWidth(dpy, m->screen);
-                       m->sh = DisplayHeight(dpy, m->screen);
+                       m->sw = DisplayWidth(dpy, screen);
+                       m->sh = DisplayHeight(dpy, screen);

                }
 
                m->seltags = emallocz(sizeof initags);
                }
 
                m->seltags = emallocz(sizeof initags);


@@ -1595,24 +1625,9 @@ setup(void) {
                memcpy(m->seltags, initags, sizeof initags);
                memcpy(m->prevtags, initags, sizeof initags);
 
                memcpy(m->seltags, initags, sizeof initags);
                memcpy(m->prevtags, initags, sizeof initags);
 

-               /* init appearance */
-               m->dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR, m->screen);
-               m->dc.norm[ColBG] = getcolor(NORMBGCOLOR, m->screen);
-               m->dc.norm[ColFG] = getcolor(NORMFGCOLOR, m->screen);
-               m->dc.sel[ColBorder] = getcolor(SELBORDERCOLOR, m->screen);
-               m->dc.sel[ColBG] = getcolor(SELBGCOLOR, m->screen);
-               m->dc.sel[ColFG] = getcolor(SELFGCOLOR, m->screen);
-               initfont(m, FONT);
-               m->dc.h = bh = m->dc.font.height + 2;
-

                /* init layouts */
                m->mwfact = MWFACT;
                m->layout = &layouts[0];
                /* init layouts */
                m->mwfact = MWFACT;
                m->layout = &layouts[0];

-               for(blw = k = 0; k < LENGTH(layouts); k++) {
-                       j = textw(m, layouts[k].symbol);
-                       if(j > blw)
-                               blw = j;
-               }

 
                // TODO: bpos per screen?
                bpos = BARPOS;
 
                // TODO: bpos per screen?
                bpos = BARPOS;


@@ -1621,28 +1636,25 @@ setup(void) {
                wa.event_mask = ButtonPressMask | ExposureMask;
 
                /* init bars */
                wa.event_mask = ButtonPressMask | ExposureMask;
 
                /* init bars */

-               m->barwin = XCreateWindow(dpy, m->root, m->sx, m->sy, m->sw, bh, 0,
-                               DefaultDepth(dpy, m->screen), CopyFromParent, DefaultVisual(dpy, m->screen),
+               m->barwin = XCreateWindow(dpy, root, m->sx, m->sy, m->sw, bh, 0,
+                               DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),

                                CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
                XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
                updatebarpos(m);
                XMapRaised(dpy, m->barwin);
                strcpy(stext, "dwm-"VERSION);
                                CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
                XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
                updatebarpos(m);
                XMapRaised(dpy, m->barwin);
                strcpy(stext, "dwm-"VERSION);

-               m->dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
-               m->dc.gc = XCreateGC(dpy, m->root, 0, 0);
-               XSetLineAttributes(dpy, m->dc.gc, 1, LineSolid, CapButt, JoinMiter);
-               if(!m->dc.font.set)
-                       XSetFont(dpy, m->dc.gc, m->dc.font.xfont->fid);

 
                /* EWMH support per monitor */
 
                /* EWMH support per monitor */

-               XChangeProperty(dpy, m->root, netatom[NetSupported], XA_ATOM, 32,
+               XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,

                                PropModeReplace, (unsigned char *) netatom, NetLast);
 
                /* select for events */
                wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
                                | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
                                PropModeReplace, (unsigned char *) netatom, NetLast);
 
                /* select for events */
                wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
                                | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;

-               XChangeWindowAttributes(dpy, m->root, CWEventMask | CWCursor, &wa);
-               XSelectInput(dpy, m->root, wa.event_mask);
+               XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+               XSelectInput(dpy, root, wa.event_mask);
+
+               drawbar(m);

        }
        if(info)
                XFree(info);
        }
        if(info)
                XFree(info);


@@ -1654,7 +1666,7 @@ setup(void) {
        compileregs();
 
        selmonitor = monitorat();
        compileregs();
 
        selmonitor = monitorat();

-       fprintf(stderr, "selmonitor == %d\n", selmonitor);
+       fprintf(stderr, "selmonitor == %d\n", selmonitor - monitors);

 }
 
 void
 }
 
 void


@@ -1690,75 +1702,70 @@ tag(const char *arg) {
        for(i = 0; i < LENGTH(tags); i++)
                sel->tags[i] = (NULL == arg);
        sel->tags[idxoftag(arg)] = True;
        for(i = 0; i < LENGTH(tags); i++)
                sel->tags[i] = (NULL == arg);
        sel->tags[idxoftag(arg)] = True;

-       arrange();
+       arrange(sel->monitor);

 }
 
 unsigned int
 }
 
 unsigned int

-textnw(Monitor *m, const char *text, unsigned int len) {
+textnw(const char *text, unsigned int len) {

        XRectangle r;
 
        XRectangle r;
 

-       if(m->dc.font.set) {
-               XmbTextExtents(m->dc.font.set, text, len, NULL, &r);
+       if(dc.font.set) {
+               XmbTextExtents(dc.font.set, text, len, NULL, &r);

                return r.width;
        }
                return r.width;
        }

-       return XTextWidth(m->dc.font.xfont, text, len);
+       return XTextWidth(dc.font.xfont, text, len);

 }
 
 unsigned int
 }
 
 unsigned int

-textw(Monitor *m, const char *text) {
-       return textnw(m, text, strlen(text)) + m->dc.font.height;
+textw(const char *text) {
+       return textnw(text, strlen(text)) + dc.font.height;

 }
 
 void
 }
 
 void

-tile(void) {
-       unsigned int i, j, n, nx, ny, nw, nh, mw, th;
+tile(Monitor *m) {
+       unsigned int i, n, nx, ny, nw, nh, mw, th;

        Client *c, *mc;
 
        domwfact = dozoom = True;
 
        nx = ny = nw = 0; /* gcc stupidity requires this */
 
        Client *c, *mc;
 
        domwfact = dozoom = True;
 
        nx = ny = nw = 0; /* gcc stupidity requires this */
 

-       for (i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-
-               for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
-                       n++;
-
-               for(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
-                       /* window geoms */
-                       mw = (n == 1) ? m->waw : m->mwfact * m->waw;
-                       th = (n > 1) ? m->wah / (n - 1) : 0;
-                       if(n > 1 && th < bh)
-                               th = m->wah;
-                       if(j == 0) { /* master */
-                               nx = m->wax;
+       for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
+               n++;
+
+       /* window geoms */
+       mw = (n == 1) ? m->waw : m->mwfact * m->waw;
+       th = (n > 1) ? m->wah / (n - 1) : 0;
+       if(n > 1 && th < bh)
+               th = m->wah;
+
+       for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
+               if(i == 0) { /* master */
+                       nx = m->wax;
+                       ny = m->way;
+                       nw = mw - 2 * c->border;
+                       nh = m->wah - 2 * c->border;
+               }
+               else {  /* tile window */
+                       if(i == 1) {

                                ny = m->way;
                                ny = m->way;

-                               nw = mw - 2 * c->border;
-                               nh = m->wah - 2 * c->border;
+                               nx += mc->w + 2 * mc->border;
+                               nw = m->waw - mw - 2 * c->border;

                        }
                        }

-                       else {  /* tile window */
-                               if(j == 1) {
-                                       ny = m->way;
-                                       nx += mc->w + 2 * mc->border;
-                                       nw = m->waw - mw - 2 * c->border;
-                               }
-                               if(j + 1 == n) /* remainder */
-                                       nh = (m->way + m->wah) - ny - 2 * c->border;
-                               else
-                                       nh = th - 2 * c->border;
-                       }
-                       fprintf(stderr, "tile(%d, %d, %d, %d)\n", nx, ny, nw, nh);
-                       resize(c, nx, ny, nw, nh, RESIZEHINTS);
-                       if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
-                               /* client doesn't accept size constraints */
-                               resize(c, nx, ny, nw, nh, False);
-                       if(n > 1 && th != m->wah)
-                               ny = c->y + c->h + 2 * c->border;
-
-                       j++;
+                       if(i + 1 == n) /* remainder */
+                               nh = (m->way + m->wah) - ny - 2 * c->border;
+                       else
+                               nh = th - 2 * c->border;

                }
                }

+               resize(c, nx, ny, nw, nh, RESIZEHINTS);
+               if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
+                       /* client doesn't accept size constraints */
+                       resize(c, nx, ny, nw, nh, False);
+               if(n > 1 && th != m->wah)
+                       ny = c->y + c->h + 2 * c->border;
+
+               i++;

        }
        }

-       fprintf(stderr, "done\n");

 }
 void
 togglebar(const char *arg) {
 }
 void
 togglebar(const char *arg) {


@@ -1766,8 +1773,8 @@ togglebar(const char *arg) {
                bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
        else
                bpos = BarOff;
                bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
        else
                bpos = BarOff;

-       updatebarpos(&monitors[monitorat()]);
-       arrange();
+       updatebarpos(monitorat());
+       arrange(monitorat());

 }
 
 void
 }
 
 void


@@ -1777,7 +1784,7 @@ togglefloating(const char *arg) {
        sel->isfloating = !sel->isfloating;
        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        sel->isfloating = !sel->isfloating;
        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);

-       arrange();
+       arrange(sel->monitor);

 }
 
 void
 }
 
 void


@@ -1791,21 +1798,20 @@ toggletag(const char *arg) {
        for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
        if(j == LENGTH(tags))
                sel->tags[i] = True; /* at least one tag must be enabled */
        for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
        if(j == LENGTH(tags))
                sel->tags[i] = True; /* at least one tag must be enabled */

-       arrange();
+       arrange(sel->monitor);

 }
 
 void
 toggleview(const char *arg) {
        unsigned int i, j;
 }
 
 void
 toggleview(const char *arg) {
        unsigned int i, j;

-
-       Monitor *m = &monitors[monitorat()];
+       Monitor *m = monitorat();

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

-       arrange();
+       arrange(m);

 }
 
 void
 }
 
 void


@@ -1836,7 +1842,7 @@ unmanage(Client *c) {
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       arrange();
+       arrange(NULL);

 }
 
 void
 }
 
 void


@@ -1978,7 +1984,7 @@ void
 view(const char *arg) {
        unsigned int i;
        Bool tmp[LENGTH(tags)];
 view(const char *arg) {
        unsigned int i;
        Bool tmp[LENGTH(tags)];

-       Monitor *m = &monitors[monitorat()];
+       Monitor *m = monitorat();

 
        for(i = 0; i < LENGTH(tags); i++)
                tmp[i] = (NULL == arg);
 
        for(i = 0; i < LENGTH(tags); i++)
                tmp[i] = (NULL == arg);


@@ -1986,7 +1992,7 @@ view(const char *arg) {
        if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
                memcpy(m->prevtags, m->seltags, sizeof initags);
                memcpy(m->seltags, tmp, sizeof initags);
        if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
                memcpy(m->prevtags, m->seltags, sizeof initags);
                memcpy(m->seltags, tmp, sizeof initags);

-               arrange();
+               arrange(m);

        }
 }
 
        }
 }
 


@@ -1994,45 +2000,61 @@ void
 viewprevtag(const char *arg) {
        static Bool tmp[LENGTH(tags)];
 
 viewprevtag(const char *arg) {
        static Bool tmp[LENGTH(tags)];
 

-       Monitor *m = &monitors[monitorat()];
+       Monitor *m = monitorat();

 
        memcpy(tmp, m->seltags, sizeof initags);
        memcpy(m->seltags, m->prevtags, sizeof initags);
        memcpy(m->prevtags, tmp, sizeof initags);
 
        memcpy(tmp, m->seltags, sizeof initags);
        memcpy(m->seltags, m->prevtags, sizeof initags);
        memcpy(m->prevtags, tmp, sizeof initags);

-       arrange();
+       arrange(m);

 }
 
 void
 zoom(const char *arg) {
 }
 
 void
 zoom(const char *arg) {

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

 
        if(!sel || !dozoom || sel->isfloating)
                return;
 
        if(!sel || !dozoom || sel->isfloating)
                return;

-       if((c = sel) == nexttiled(clients, c->monitor))
+       if(c == nexttiled(clients, c->monitor))

                if(!(c = nexttiled(c->next, c->monitor)))
                        return;
        detach(c);
        attach(c);
        focus(c);
                if(!(c = nexttiled(c->next, c->monitor)))
                        return;
        detach(c);
        attach(c);
        focus(c);

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

 }
 
 void
 movetomonitor(const char *arg) {
 }
 
 void
 movetomonitor(const char *arg) {

-       if (sel) {
-               sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
+       int i;

 
 

-               memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags);
-               resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True);
-               arrange();
+       if (sel)
+               return;
+       if(arg)
+               i = atoi(arg);
+       else {
+               for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
+               i++;

        }
        }

+       sel->monitor = &monitors[i % mcount];
+
+       memcpy(sel->tags, sel->monitor->seltags, sizeof initags);
+       resize(sel, sel->monitor->wax, sel->monitor->way, sel->w, sel->h, True);
+       arrange(sel->monitor);

 }
 
 void
 selectmonitor(const char *arg) {
 }
 
 void
 selectmonitor(const char *arg) {

-       Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
+       int i;
+       Monitor *m;

 
 

-       XWarpPointer(dpy, None, m->root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
+       if(arg)
+               i = atoi(arg);
+       else {
+               for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
+               i++;
+       }
+       m = &monitors[i % mcount];
+       XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);

        focus(NULL);
 }
 
        focus(NULL);
 }
 


@@ -2040,7 +2062,7 @@ selectmonitor(const char *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, "
+               eprint("dwm-"VERSION", © 2006-2008 Anselm R. Garbe, Sander van Dijk, "

                       "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
                       "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");


@@ -2051,7 +2073,6 @@ main(int argc, char *argv[]) {
 
        checkotherwm();
        setup();
 
        checkotherwm();
        setup();

-       drawbar();

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