simplified left over re-assignment

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index afe8f18..fbda0bb 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -44,7 +44,7 @@
 #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 LENGTH(X)               (sizeof X / sizeof X[0])
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))
 #define MIN(A, B)               ((A) < (B) ? (A) : (B))


@@ -89,7 +89,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;
 };
 


@@ -124,14 +124,18 @@ struct Monitor {
        int screen_number;
        float mfact;
        int by, btx;          /* bar geometry */
        int screen_number;
        float mfact;
        int by, btx;          /* bar geometry */

+       int my, mh;           /* vertical 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;

 };
 
 typedef struct {
 };
 
 typedef struct {


@@ -184,7 +188,7 @@ 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 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 propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void resize(Client *c, int x, int y, int w, int h);


@@ -209,6 +213,7 @@ static void toggleview(const Arg *arg);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);
 static void updategeom(void);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);
 static void updategeom(void);

+static void updatebarpos(Monitor *m);

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


@@ -249,9 +254,6 @@ 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;


@@ -288,7 +290,7 @@ 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


@@ -360,7 +362,9 @@ void
 arrange(void) {
        Monitor *m;
 
 arrange(void) {
        Monitor *m;
 

-       showhide(stack);
+       /* optimise two loops into one, check focus(NULL) */
+       for(m = mons; m; m = m->next)
+               showhide(m->stack);

        focus(NULL);
        for(m = mons; m; m = m->next) {
                if(lt[m->sellt]->arrange)
        focus(NULL);
        for(m = mons; m; m = m->next) {
                if(lt[m->sellt]->arrange)


@@ -371,14 +375,14 @@ arrange(void) {
 
 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


@@ -389,7 +393,7 @@ buttonpress(XEvent *e) {
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;

-       if(ev->window == selmon->barwin) {
+       if(ev->window == selmon->barwin && ev->x >= selmon->btx) {

                i = 0;
                x = selmon->btx;
                do
                i = 0;
                x = selmon->btx;
                do


@@ -435,11 +439,15 @@ void
 cleanup(void) {
        Arg a = {.ui = ~0};
        Layout foo = { "", NULL };
 cleanup(void) {
        Arg a = {.ui = ~0};
        Layout foo = { "", NULL };

+       Monitor *m;

 
        view(&a);
        lt[selmon->sellt] = &foo;
 
        view(&a);
        lt[selmon->sellt] = &foo;

-       while(stack)
-               unmanage(stack);
+
+       /* TODO: consider simplifying cleanup code of the stack, perhaps do that in cleanmons() ? */
+       for(m = mons; m; m = m->next)
+               while(m->stack)
+                       unmanage(m->stack);

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


@@ -541,7 +549,7 @@ configurerequest(XEvent *e) {
                                c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                                c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);

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


@@ -573,7 +581,7 @@ void
 detach(Client *c) {
        Client **tc;
 
 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;
 }
 
        *tc = c->next;
 }
 


@@ -581,7 +589,7 @@ void
 detachstack(Client *c) {
        Client **tc;
 
 detachstack(Client *c) {
        Client **tc;
 

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


@@ -602,22 +610,21 @@ drawbar(Monitor *m) {
        unsigned long *col;
        Client *c;
 
        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;
 #ifdef XINERAMA
        {
        }
 
        dc.x = 0;
 #ifdef XINERAMA
        {

-               /*
-               dc.w = TEXTW(m->symbol);
-               drawtext(NULL, selmon == m ? dc.sel : dc.norm, False);
+               char buf[2];
+               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;
                dc.x += dc.w;

-               */

        }
 #endif /* XINERAMA */
        m->btx = dc.x;
        }
 #endif /* XINERAMA */
        m->btx = dc.x;


@@ -625,7 +632,7 @@ drawbar(Monitor *m) {
                dc.w = TEXTW(tags[i]);
                col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
                drawtext(tags[i], col, urg & 1 << 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;
        }


@@ -646,9 +653,9 @@ drawbar(Monitor *m) {
                drawtext(stext, dc.norm, False);
                if((dc.w = dc.x - x) > bh) {
                        dc.x = 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);
+                       if(selmon->sel) {
+                               drawtext(selmon->sel->name, dc.sel, False);
+                               drawsquare(selmon->sel->isfixed, selmon->sel->isfloating, False, dc.sel);

                        }
                        else
                                drawtext(NULL, dc.norm, False);
                        }
                        else
                                drawtext(NULL, dc.norm, False);


@@ -748,11 +755,11 @@ expose(XEvent *e) {
 
 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 && selmon->sel != c) {
+               grabbuttons(selmon->sel, False);
+               XSetWindowBorder(dpy, selmon->sel->win, dc.norm[ColBorder]);

        }
        if(c) {
                if(c->isurgent)
        }
        if(c) {
                if(c->isurgent)


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

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

        drawbars();
 }
 
        drawbars();
 }
 


@@ -773,8 +780,8 @@ 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
 }
 
 #ifdef XINERAMA


@@ -797,20 +804,20 @@ void
 focusstack(const Arg *arg) {
        Client *c = NULL, *i;
 
 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) {


@@ -821,9 +828,11 @@ focusstack(const Arg *arg) {
 
 Client *
 getclient(Window w) {
 
 Client *
 getclient(Window w) {

-       Client *c;
+       Client *c = NULL;
+       Monitor *m;

 
 

-       for(c = clients; c && c->win != w; c = c->next);
+       for(m = mons; m; m = m->next)
+               for(c = m->clients; c && c->win != w; c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -989,19 +998,19 @@ 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
        }
        else

-               XKillClient(dpy, sel->win);
+               XKillClient(dpy, selmon->sel->win);

 }
 
 void
 }
 
 void


@@ -1015,7 +1024,7 @@ 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;
+       c->mon = selmon;

 
        /* geometry */
        c->x = wa->x;
 
        /* geometry */
        c->x = wa->x;


@@ -1092,7 +1101,7 @@ void
 monocle(Monitor *m) {
        Client *c;
 
 monocle(Monitor *m) {
        Client *c;
 

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


@@ -1104,7 +1113,7 @@ movemouse(const Arg *arg) {
        Window dummy;
        XEvent ev;
 
        Window dummy;
        XEvent ev;
 

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

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


@@ -1148,9 +1157,9 @@ movemouse(const Arg *arg) {
 }
 
 Client *
 }
 
 Client *

-nexttiled(Monitor *m, Client *c) {
+nexttiled(Client *c) {

        // TODO: m handling
        // TODO: m handling

-       for(; c && (c->isfloating || !ISVISIBLE(m, c)); c = c->next);
+       for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -1182,7 +1191,7 @@ 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)
+                       if(c == selmon->sel)

                                drawbars();
                }
        }
                                drawbars();
                }
        }


@@ -1217,7 +1226,7 @@ resizemouse(const Arg *arg) {
        Client *c;
        XEvent ev;
 
        Client *c;
        XEvent ev;
 

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

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


@@ -1262,15 +1271,15 @@ restack(Monitor *m) {
        XWindowChanges wc;
 
        drawbars();
        XWindowChanges wc;
 
        drawbars();

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

                return;
                return;

-       if(m == selmon && (sel->isfloating || !lt[m->sellt]->arrange))
-               XRaiseWindow(dpy, sel->win);
+       if(m == selmon && (selmon->sel->isfloating || !lt[m->sellt]->arrange))
+               XRaiseWindow(dpy, selmon->sel->win);

        if(lt[m->sellt]->arrange) {
                wc.stack_mode = Below;
                wc.sibling = m->barwin;
        if(lt[m->sellt]->arrange) {
                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;
                        }


@@ -1331,7 +1340,7 @@ setlayout(const Arg *arg) {
                selmon->sellt ^= 1;
        if(arg && arg->v)
                lt[selmon->sellt] = (Layout *)arg->v;
                selmon->sellt ^= 1;
        if(arg && arg->v)
                lt[selmon->sellt] = (Layout *)arg->v;

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

                arrange();
        else
                drawbars();
                arrange();
        else
                drawbars();


@@ -1408,6 +1417,7 @@ setup(void) {
                        PropModeReplace, (unsigned char *) netatom, NetLast);
 
        /* select for events */
                        PropModeReplace, (unsigned char *) netatom, NetLast);
 
        /* select for events */

+       wa.cursor = cursor[CurNormal];

        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
                        |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
                        |PropertyChangeMask;
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
                        |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
                        |PropertyChangeMask;


@@ -1421,9 +1431,9 @@ 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)
+               if(!lt[c->mon->sellt]->arrange || c->isfloating)

                        resize(c, c->x, c->y, c->w, c->h);
                showhide(c->snext);
        }
                        resize(c, c->x, c->y, c->w, c->h);
                showhide(c->snext);
        }


@@ -1455,8 +1465,8 @@ spawn(const Arg *arg) {
 
 void
 tag(const Arg *arg) {
 
 void
 tag(const Arg *arg) {

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

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


@@ -1465,11 +1475,20 @@ tag(const Arg *arg) {
 void
 tagmon(const Arg *arg) {
        unsigned int i;
 void
 tagmon(const Arg *arg) {
        unsigned int i;

+       Client *c;

        Monitor *m;
 
        Monitor *m;
 

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

        for(i = 0, m = mons; m; m = m->next, i++)
                if(i == arg->ui) {
        for(i = 0, m = mons; m; m = m->next, i++)
                if(i == arg->ui) {

-                       sel->m = m;
+                       detach(c);
+                       detachstack(c);
+                       c->mon = m;
+                       attach(c);
+                       attachstack(c);
+                       selmon->sel = selmon->stack;
+                       m->sel = c;

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


@@ -1493,12 +1512,12 @@ 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;
 
        /* master */
        if(n == 0)
                return;
 
        /* master */

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

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


@@ -1513,7 +1532,7 @@ tile(Monitor *m) {
        if(h < bh)
                h = m->wh;
 
        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)
                       ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
                if(h != m->wh)
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
                       ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
                if(h != m->wh)


@@ -1524,18 +1543,18 @@ tile(Monitor *m) {
 void
 togglebar(const Arg *arg) {
        selmon->showbar = !selmon->showbar;
 void
 togglebar(const Arg *arg) {
        selmon->showbar = !selmon->showbar;

-       updategeom();
+       updatebarpos(selmon);

        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
        arrange();
 }
 
 void
 togglefloating(const Arg *arg) {
        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
        arrange();
 }
 
 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);
+       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);

        arrange();
 }
 
        arrange();
 }
 


@@ -1543,12 +1562,12 @@ void
 toggletag(const Arg *arg) {
        unsigned int mask;
 
 toggletag(const Arg *arg) {
        unsigned int mask;
 

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

                return;
        
                return;
        

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

        if(mask) {
        if(mask) {

-               sel->tags = mask;
+               selmon->sel->tags = mask;

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


@@ -1574,7 +1593,7 @@ unmanage(Client *c) {
        XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
        detach(c);
        detachstack(c);
        XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
        detach(c);
        detachstack(c);

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

                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);


@@ -1599,7 +1618,6 @@ updatebars(void) {
        Monitor *m;
        XSetWindowAttributes wa;
 
        Monitor *m;
        XSetWindowAttributes wa;
 

-       wa.cursor = cursor[CurNormal];

        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;


@@ -1614,11 +1632,24 @@ updatebars(void) {
        }
 }
 
        }
 }
 

+void
+updatebarpos(Monitor *m) {
+       m->wy = m->my;
+       m->wh = m->mh;
+       if(m->showbar) {
+               m->wh -= bh;
+               m->by = m->topbar ? m->wy : m->wy + m->wh;
+               m->wy = m->topbar ? m->wy + bh : m->wy;
+       }
+       else
+               m->by = -bh;
+}
+

 void
 updategeom(void) {
 void
 updategeom(void) {

-       int i, n;
+       int i, n = 1;

        Client *c;
        Client *c;

-       Monitor *newmons = NULL, *m;
+       Monitor *newmons = NULL, *m, *tm;

 
 #ifdef XINERAMA
        XineramaScreenInfo *info = NULL;
 
 #ifdef XINERAMA
        XineramaScreenInfo *info = NULL;


@@ -1639,9 +1670,9 @@ updategeom(void) {
                for(i = 0, m = newmons; m; m = m->next, i++) {
                        m->screen_number = info[i].screen_number;
                        m->wx = info[i].x_org;
                for(i = 0, m = newmons; m; m = m->next, i++) {
                        m->screen_number = info[i].screen_number;
                        m->wx = info[i].x_org;

-                       m->wy = info[i].y_org;
+                       m->my = m->wy = info[i].y_org;

                        m->ww = info[i].width;
                        m->ww = info[i].width;

-                       m->wh = info[i].height;
+                       m->mh = m->wh = info[i].height;

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


@@ -1651,37 +1682,46 @@ updategeom(void) {
        {
                m->screen_number = 0;
                m->wx = sx;
        {
                m->screen_number = 0;
                m->wx = sx;

-               m->wy = sy;
+               m->my = m->wy = sy;

                m->ww = sw;
                m->ww = sw;

-               m->wh = sh;
+               m->mh = m->wh = sh;

        }
 
        /* bar geometry setup */
        for(m = newmons; m; m = m->next) {
                /* TODO: consider removing the following values from config.h */
        }
 
        /* bar geometry setup */
        for(m = newmons; m; m = m->next) {
                /* TODO: consider removing the following values from config.h */

+               m->clients = NULL;
+               m->sel = NULL;
+               m->stack = NULL;

                m->seltags = 0;
                m->sellt = 0;
                m->tagset[0] = m->tagset[1] = 1;
                m->mfact = mfact;
                m->showbar = showbar;
                m->topbar = topbar;
                m->seltags = 0;
                m->sellt = 0;
                m->tagset[0] = m->tagset[1] = 1;
                m->mfact = mfact;
                m->showbar = showbar;
                m->topbar = topbar;

-               if(m->showbar) {
-                       m->wh -= bh;
-                       m->by = m->topbar ? m->wy : m->wy + m->wh;
-                       m->wy = m->topbar ? m->wy + bh : m->wy;
-               }
-               else
-                       m->by = -bh;
+               updatebarpos(m);

                /* reassign all clients with same screen number */
                /* 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;
+               for(tm = mons; tm; tm = tm->next)
+                       if(tm->screen_number == m->screen_number) {
+                               m->clients = tm->clients;
+                               m->sel = m->stack = tm->stack;
+                               tm->clients = NULL;
+                               tm->stack = NULL;
+                               for(c = m->clients; c; c = c->next)
+                                       c->mon = 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;
+       /* reassign left over clients of disappeared monitors */
+       for(tm = mons; tm; tm = tm->next) {
+               while((c = tm->clients)) {
+                       detach(c);
+                       detachstack(c);
+                       c->mon = newmons;
+                       attach(c);
+                       attachstack(c);
+               }
+       }

 
        /* select focused monitor */
        if(!selmon) {
 
        /* select focused monitor */
        if(!selmon) {


@@ -1785,7 +1825,7 @@ 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);
                }
                        wmh->flags &= ~XUrgencyHint;
                        XSetWMHints(dpy, c->win, wmh);
                }


@@ -1841,12 +1881,12 @@ 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(!lt[selmon->sellt]->arrange || 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);
                        return;
        detach(c);
        attach(c);