experimental xinerama support, two new actions, Mod1-w/e and Mod1-Shift-w/e

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index dc63a0b..0e8c927 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>

+#include <signal.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -37,17 +38,16 @@
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>

-#endif
+#endif /* XINERAMA */

 
 /* macros */
 #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))
 
 /* macros */
 #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(x)            (x->tags & tagset[seltags])
+#define ISVISIBLE(x)            (x->tags & tagset[mon[x->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))

-#define MAXTAGLEN               16

 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
 #define WIDTH(x)                ((x)->w + 2 * (x)->bw)
 #define HEIGHT(x)               ((x)->h + 2 * (x)->bw)
 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
 #define WIDTH(x)                ((x)->w + 2 * (x)->bw)
 #define HEIGHT(x)               ((x)->h + 2 * (x)->bw)


@@ -85,6 +85,7 @@ struct Client {
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
        unsigned int tags;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
        unsigned int tags;

+       unsigned int mon;

        Bool isfixed, isfloating, isurgent;
        Client *next;
        Client *snext;
        Bool isfixed, isfloating, isurgent;
        Client *next;
        Client *snext;


@@ -113,9 +114,20 @@ typedef struct {
        const Arg arg;
 } Key;
 
        const Arg arg;
 } Key;
 

+typedef struct {
+       char symbol[4];
+       int by, btx;          /* bar geometry */
+       int wx, wy, ww, wh;   /* window area  */
+       unsigned int seltags;
+       unsigned int sellt;
+       Bool showbar;
+       Bool topbar;
+       Window barwin;
+} Monitor;
+

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

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

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


@@ -128,6 +140,7 @@ typedef struct {
 
 /* function declarations */
 static void applyrules(Client *c);
 
 /* function declarations */
 static void applyrules(Client *c);

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

 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);


@@ -142,7 +155,8 @@ static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void die(const char *errstr, ...);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void die(const char *errstr, ...);

-static void drawbar(void);
+static void drawbar(Monitor *m);
+static void drawbars();

 static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
 static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
 static void enternotify(XEvent *e);
 static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
 static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
 static void enternotify(XEvent *e);


@@ -163,14 +177,14 @@ static void killclient(const Arg *arg);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);

-static void monocle(void);
+static void monocle(Monitor *m);

 static void movemouse(const Arg *arg);
 static void movemouse(const Arg *arg);

-static Client *nexttiled(Client *c);
+static Client *nexttiled(Monitor *m, Client *c);

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

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

 static void resizemouse(const Arg *arg);
 static void resizemouse(const Arg *arg);

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

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


@@ -178,17 +192,17 @@ static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);

+static void sigchld(int signal);

 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static int textnw(const char *text, unsigned int len);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static int textnw(const char *text, unsigned int len);

-static void tile(void);
+static void tile(Monitor *);

 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);
 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);

-static void updatebar(void);

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


@@ -200,14 +214,16 @@ static int xerror(Display *dpy, XErrorEvent *ee);
 static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);

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

 
 /* variables */
 static char stext[256];
 static int screen;
 
 /* variables */
 static char stext[256];
 static int screen;

-static int sx, sy, sw, sh; /* X display screen geometry x, y, width, height */ 
-static int by, bh, blw;    /* bar geometry y, height and layout symbol width */
-static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */
-static unsigned int seltags = 0, sellt = 0;
+static int sx, sy, sw, sh;   /* X display screen geometry x, y, width, height */
+static int bh, blw = 0;      /* bar geometry */

 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {


@@ -234,7 +250,9 @@ static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc;
 static Layout *lt[] = { NULL, NULL };
 static Display *dpy;
 static DC dc;
 static Layout *lt[] = { NULL, NULL };

-static Window root, barwin;
+static Monitor *mon = NULL, *selmon = NULL;
+static unsigned int nmons;
+static Window root;

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


@@ -249,6 +267,7 @@ applyrules(Client *c) {
        XClassHint ch = { 0 };
 
        /* rule matching */
        XClassHint ch = { 0 };
 
        /* rule matching */

+       c->isfloating = c->tags = 0;

        if(XGetClassHint(dpy, c->win, &ch)) {
                for(i = 0; i < LENGTH(rules); i++) {
                        r = &rules[i];
        if(XGetClassHint(dpy, c->win, &ch)) {
                for(i = 0; i < LENGTH(rules); i++) {
                        r = &rules[i];


@@ -256,7 +275,7 @@ applyrules(Client *c) {
                        && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
                        && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
                                c->isfloating = r->isfloating;
                        && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
                        && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
                                c->isfloating = r->isfloating;

-                               c->tags |= r->tags & TAGMASK;
+                               c->tags |= r->tags;

                        }
                }
                if(ch.res_class)
                        }
                }
                if(ch.res_class)


@@ -264,17 +283,84 @@ applyrules(Client *c) {
                if(ch.res_name)
                        XFree(ch.res_name);
        }
                if(ch.res_name)
                        XFree(ch.res_name);
        }

-       if(!c->tags)
-               c->tags = tagset[seltags];
+       c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : tagset[mon[c->mon].seltags];
+}
+
+Bool
+applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+       Bool baseismin;
+
+       /* set minimum possible */
+       *w = MAX(1, *w);
+       *h = MAX(1, *h);
+
+       if(*x > sx + sw)
+               *x = sw - WIDTH(c);
+       if(*y > sy + sh)
+               *y = sh - HEIGHT(c);
+       if(*x + *w + 2 * c->bw < sx)
+               *x = sx;
+       if(*y + *h + 2 * c->bw < sy)
+               *y = sy;
+       if(*h < bh)
+               *h = bh;
+       if(*w < bh)
+               *w = bh;
+
+       if(resizehints || c->isfloating) {
+               /* see last two sentences in ICCCM 4.1.2.3 */
+               baseismin = c->basew == c->minw && c->baseh == c->minh;
+
+               if(!baseismin) { /* temporarily remove base dimensions */
+                       *w -= c->basew;
+                       *h -= c->baseh;
+               }
+
+               /* adjust for aspect limits */
+               if(c->mina > 0 && c->maxa > 0) {
+                       if(c->maxa < (float)*w / *h)
+                               *w = *h * c->maxa;
+                       else if(c->mina < (float)*h / *w)
+                               *h = *w * c->mina;
+               }
+
+               if(baseismin) { /* increment calculation requires this */
+                       *w -= c->basew;
+                       *h -= c->baseh;
+               }
+
+               /* adjust for increment value */
+               if(c->incw)
+                       *w -= *w % c->incw;
+               if(c->inch)
+                       *h -= *h % c->inch;
+
+               /* restore base dimensions */
+               *w += c->basew;
+               *h += c->baseh;
+
+               *w = MAX(*w, c->minw);
+               *h = MAX(*h, c->minh);
+
+               if(c->maxw)
+                       *w = MIN(*w, c->maxw);
+
+               if(c->maxh)
+                       *h = MIN(*h, c->maxh);
+       }
+       return *x != c->x || *y != c->y || *w != c->w || *h != c->h;

 }
 
 void
 arrange(void) {
 }
 
 void
 arrange(void) {

+       unsigned int i;

        showhide(stack);
        focus(NULL);
        showhide(stack);
        focus(NULL);

-       if(lt[sellt]->arrange)
-               lt[sellt]->arrange();
-       restack();
+       for(i = 0; i < nmons; i++) {
+               if(lt[mon[i].sellt]->arrange)
+                       lt[mon[i].sellt]->arrange(&mon[i]);
+               restack(&mon[i]);
+       }

 }
 
 void
 }
 
 void


@@ -297,16 +383,19 @@ buttonpress(XEvent *e) {
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;

-       if(ev->window == barwin) {
-               i = x = 0;
-               do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+       if(ev->window == selmon->barwin) {
+               i = 0;
+               x = selmon->btx;
+               do
+                       x += TEXTW(tags[i]);
+               while(ev->x >= x && ++i < LENGTH(tags));

                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;
                }
                else if(ev->x < x + blw)
                        click = ClkLtSymbol;
                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;
                }
                else if(ev->x < x + blw)
                        click = ClkLtSymbol;

-               else if(ev->x > wx + ww - TEXTW(stext))
+               else if(ev->x > selmon->wx + selmon->ww - TEXTW(stext))

                        click = ClkStatusText;
                else
                        click = ClkWinTitle;
                        click = ClkStatusText;
                else
                        click = ClkWinTitle;


@@ -338,12 +427,12 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
 
 void
 cleanup(void) {

+       unsigned int i;

        Arg a = {.ui = ~0};
        Layout foo = { "", NULL };
 
        Arg a = {.ui = ~0};
        Layout foo = { "", NULL };
 

-       close(STDIN_FILENO);

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

-       lt[sellt] = &foo;
+       lt[selmon->sellt] = &foo;

        while(stack)
                unmanage(stack);
        if(dc.font.set)
        while(stack)
                unmanage(stack);
        if(dc.font.set)


@@ -356,7 +445,9 @@ cleanup(void) {
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);

-       XDestroyWindow(dpy, barwin);
+       for(i = 0; i < nmons; i++)
+               XDestroyWindow(dpy, mon[i].barwin);
+       free(mon);

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


@@ -393,13 +484,18 @@ configure(Client *c) {
 
 void
 configurenotify(XEvent *e) {
 
 void
 configurenotify(XEvent *e) {

+       unsigned int i;

        XConfigureEvent *ev = &e->xconfigure;
 
        if(ev->window == root && (ev->width != sw || ev->height != sh)) {
                sw = ev->width;
                sh = ev->height;
                updategeom();
        XConfigureEvent *ev = &e->xconfigure;
 
        if(ev->window == root && (ev->width != sw || ev->height != sh)) {
                sw = ev->width;
                sh = ev->height;
                updategeom();

-               updatebar();
+               if(dc.drawable != 0)
+                       XFreePixmap(dpy, dc.drawable);
+               dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
+               for(i = 0; i < nmons; i++)
+                       XMoveResizeWindow(dpy, mon[i].barwin, mon[i].wx, mon[i].by, mon[i].ww, bh);

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


@@ -413,7 +509,7 @@ configurerequest(XEvent *e) {
        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;
        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;

-               else if(c->isfloating || !lt[sellt]->arrange) {
+               else if(c->isfloating || !lt[selmon->sellt]->arrange) {

                        if(ev->value_mask & CWX)
                                c->x = sx + ev->x;
                        if(ev->value_mask & CWY)
                        if(ev->value_mask & CWX)
                                c->x = sx + ev->x;
                        if(ev->value_mask & CWY)


@@ -483,53 +579,78 @@ die(const char *errstr, ...) {
 }
 
 void
 }
 
 void

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

        int x;
        unsigned int i, occ = 0, urg = 0;
        unsigned long *col;
        Client *c;
 
        for(c = clients; c; c = c->next) {
        int x;
        unsigned int i, occ = 0, urg = 0;
        unsigned long *col;
        Client *c;
 
        for(c = clients; c; c = c->next) {

-               occ |= c->tags;
-               if(c->isurgent)
-                       urg |= c->tags;
+               if(m == &mon[c->mon]) {
+                       occ |= c->tags;
+                       if(c->isurgent)
+                               urg |= c->tags;
+               }

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

+#ifdef XINERAMA
+       {
+               dc.w = TEXTW(m->symbol);
+               drawtext(m->symbol, selmon == m ? dc.sel : dc.norm, False);
+               dc.x += dc.w;
+       }
+#endif /* XINERAMA */
+       m->btx = dc.x;

        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);

-               col = tagset[seltags] & 1 << i ? dc.sel : dc.norm;
+               col = tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;

                drawtext(tags[i], col, urg & 1 << i);
                drawtext(tags[i], col, urg & 1 << i);

-               drawsquare(sel && sel->tags & 1 << i, occ & 1 << i, urg & 1 << i, col);
+               drawsquare(m == selmon && sel && sel->tags & 1 << i,
+                          occ & 1 << i, urg & 1 << i, col);

                dc.x += dc.w;
        }
        if(blw > 0) {
                dc.w = blw;
                dc.x += dc.w;
        }
        if(blw > 0) {
                dc.w = blw;

-               drawtext(lt[sellt]->symbol, dc.norm, False);
+               drawtext(lt[m->sellt]->symbol, dc.norm, False);

                x = dc.x + dc.w;
        }
        else
                x = dc.x;
                x = dc.x + dc.w;
        }
        else
                x = dc.x;

-       dc.w = TEXTW(stext);
-       dc.x = ww - dc.w;
-       if(dc.x < x) {
-               dc.x = x;
-               dc.w = ww - x;
-       }
-       drawtext(stext, dc.norm, False);
-       if((dc.w = dc.x - x) > bh) {
-               dc.x = x;
-               if(sel) {
-                       drawtext(sel->name, dc.sel, False);
-                       drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
+       if(m == selmon) {
+               dc.w = TEXTW(stext);
+               dc.x = m->ww - dc.w;
+               if(dc.x < x) {
+                       dc.x = x;
+                       dc.w = m->ww - x;

                }
                }

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

        }
        }

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

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

+void
+drawbars() {
+       unsigned int i;
+
+       for(i = 0; i < nmons; i++)
+               drawbar(&mon[i]);
+}
+

 void
 drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
        int x;
 void
 drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
        int x;


@@ -594,10 +715,14 @@ enternotify(XEvent *e) {
 
 void
 expose(XEvent *e) {
 
 void
 expose(XEvent *e) {

+       unsigned int i;

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

-       if(ev->count == 0 && (ev->window == barwin))
-               drawbar();
+       for(i = 0; i < nmons; i++)
+               if(ev->count == 0 && (ev->window == mon[i].barwin)) {
+                       drawbar(&mon[i]);
+                       break;
+               }

 }
 
 void
 }
 
 void


@@ -620,7 +745,9 @@ focus(Client *c) {
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        sel = c;
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        sel = c;

-       drawbar();
+       if(c)
+               selmon = &mon[c->mon];
+       drawbars();

 }
 
 void
 }
 
 void


@@ -631,13 +758,24 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
                XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
 }
 
                XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
 }
 

+#ifdef XINERAMA
+void
+focusmon(const Arg *arg) {
+       if(arg->ui >= nmons)
+               return;
+       selmon = &mon[arg->ui];
+       focus(NULL);
+       drawbars();
+}
+#endif /* XINERAMA */
+

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

-       if (arg->i > 0) {
+       if(arg->i > 0) {

                for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
                if(!c)
                        for(c = clients; c && !ISVISIBLE(c); c = c->next);
                for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
                if(!c)
                        for(c = clients; c && !ISVISIBLE(c); c = c->next);


@@ -653,7 +791,7 @@ focusstack(const Arg *arg) {
        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);

-               restack();
+               restack(selmon);

        }
 }
 
        }
 }
 


@@ -730,7 +868,10 @@ grabbuttons(Client *c, Bool focused) {
                        for(i = 0; i < LENGTH(buttons); i++)
                                if(buttons[i].click == ClkClientWin)
                                        for(j = 0; j < LENGTH(modifiers); j++)
                        for(i = 0; i < LENGTH(buttons); i++)
                                if(buttons[i].click == ClkClientWin)
                                        for(j = 0; j < LENGTH(modifiers); j++)

-                                               XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+                                               XGrabButton(dpy, buttons[i].button,
+                                                           buttons[i].mask | modifiers[j],
+                                                           c->win, False, BUTTONMASK,
+                                                           GrabModeAsync, GrabModeSync, None, None);

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


@@ -850,6 +991,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;

+       for(c->mon = 0; selmon != &mon[c->mon]; c->mon++);

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


@@ -869,7 +1011,8 @@ manage(Window w, XWindowAttributes *wa) {
                        c->y = sy + sh - HEIGHT(c);
                c->x = MAX(c->x, sx);
                /* only fix client y-offset, if the client center might cover the bar */
                        c->y = sy + sh - HEIGHT(c);
                c->x = MAX(c->x, sx);
                /* only fix client y-offset, if the client center might cover the bar */

-               c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
+               c->y = MAX(c->y, ((selmon->by == 0) && (c->x + (c->w / 2) >= selmon->wx)
+                          && (c->x + (c->w / 2) < selmon->wx + selmon->ww)) ? bh : sy);

                c->bw = borderpx;
        }
 
                c->bw = borderpx;
        }
 


@@ -922,11 +1065,11 @@ maprequest(XEvent *e) {
 }
 
 void
 }
 
 void

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

        Client *c;
 
        Client *c;
 

-       for(c = nexttiled(clients); c; c = nexttiled(c->next))
-               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+       for(c = nexttiled(m, clients); c; c = nexttiled(m, c->next))
+               resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);

 }
 
 void
 }
 
 void


@@ -939,15 +1082,13 @@ movemouse(const Arg *arg) {
 
        if(!(c = sel))
                return;
 
        if(!(c = sel))
                return;

-       restack();
+       restack(selmon);

        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);

-       if(usegrab)
-               XGrabServer(dpy);

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


@@ -959,33 +1100,33 @@ movemouse(const Arg *arg) {
                case MotionNotify:
                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);
                case MotionNotify:
                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);

-                       if(snap && nx >= wx && nx <= wx + ww
-                               && ny >= wy && ny <= wy + wh) {
-                               if(abs(wx - nx) < snap)
-                                       nx = wx;
-                               else if(abs((wx + ww) - (nx + WIDTH(c))) < snap)
-                                       nx = wx + ww - WIDTH(c);
-                               if(abs(wy - ny) < snap)
-                                       ny = wy;
-                               else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
-                                       ny = wy + wh - HEIGHT(c);
-                               if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                       if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
+                               && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+                               if(abs(selmon->wx - nx) < snap)
+                                       nx = selmon->wx;
+                               else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
+                                       nx = selmon->wx + selmon->ww - WIDTH(c);
+                               if(abs(selmon->wy - ny) < snap)
+                                       ny = selmon->wy;
+                               else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
+                                       ny = selmon->wy + selmon->wh - HEIGHT(c);
+                               if(!c->isfloating && lt[selmon->sellt]->arrange
+                                                 && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))

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

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

                        break;
                }
        }
        while(ev.type != ButtonRelease);
                        break;
                }
        }
        while(ev.type != ButtonRelease);

-       if(usegrab)
-               XUngrabServer(dpy);

        XUngrabPointer(dpy, CurrentTime);
 }
 
 Client *
        XUngrabPointer(dpy, CurrentTime);
 }
 
 Client *

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

        return c;
 }
 
        return c;
 }
 


@@ -995,7 +1136,7 @@ propertynotify(XEvent *e) {
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 

-       if((ev->window == root) && (ev->atom = XA_WM_NAME))
+       if((ev->window == root) && (ev->atom == XA_WM_NAME))

                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */
                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */


@@ -1012,13 +1153,13 @@ propertynotify(XEvent *e) {
                        break;
                case XA_WM_HINTS:
                        updatewmhints(c);
                        break;
                case XA_WM_HINTS:
                        updatewmhints(c);

-                       drawbar();
+                       drawbars();

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

-                               drawbar();
+                               drawbars();

                }
        }
 }
                }
        }
 }


@@ -1029,69 +1170,10 @@ quit(const Arg *arg) {
 }
 
 void
 }
 
 void

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

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       if(sizehints) {
-               /* see last two sentences in ICCCM 4.1.2.3 */
-               Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
-
-               /* set minimum possible */
-               w = MAX(1, w);
-               h = MAX(1, h);
-
-               if(!baseismin) { /* temporarily remove base dimensions */
-                       w -= c->basew;
-                       h -= c->baseh;
-               }
-
-               /* adjust for aspect limits */
-               if(c->mina > 0 && c->maxa > 0) {
-                       if(c->maxa < (float)w / h)
-                               w = h * c->maxa;
-                       else if(c->mina < (float)h / w)
-                               h = w * c->mina;
-               }
-
-               if(baseismin) { /* increment calculation requires this */
-                       w -= c->basew;
-                       h -= c->baseh;
-               }
-
-               /* adjust for increment value */
-               if(c->incw)
-                       w -= w % c->incw;
-               if(c->inch)
-                       h -= h % c->inch;
-
-               /* restore base dimensions */
-               w += c->basew;
-               h += c->baseh;
-
-               w = MAX(w, c->minw);
-               h = MAX(h, c->minh);
-
-               if(c->maxw)
-                       w = MIN(w, c->maxw);
-
-               if(c->maxh)
-                       h = MIN(h, c->maxh);
-       }
-       if(w <= 0 || h <= 0)
-               return;
-       if(x > sx + sw)
-               x = sw - WIDTH(c);
-       if(y > sy + sh)
-               y = sh - HEIGHT(c);
-       if(x + w + 2 * c->bw < sx)
-               x = sx;
-       if(y + h + 2 * c->bw < sy)
-               y = sy;
-       if(h < bh)
-               h = bh;
-       if(w < bh)
-               w = bh;
-       if(c->x != x || c->y != y || c->w != w || c->h != h) {
+       if(applysizehints(c, &x, &y, &w, &h)) {

                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;


@@ -1113,15 +1195,13 @@ resizemouse(const Arg *arg) {
 
        if(!(c = sel))
                return;
 
        if(!(c = sel))
                return;

-       restack();
+       restack(selmon);

        ocx = c->x;
        ocy = c->y;
        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->bw - 1, c->h + c->bw - 1);
        ocx = c->x;
        ocy = c->y;
        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->bw - 1, c->h + c->bw - 1);

-       if(usegrab)
-               XGrabServer(dpy);

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


@@ -1131,44 +1211,42 @@ resizemouse(const Arg *arg) {
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:

-                       nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
-                       nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1);
+                       nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+                       nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);

 
 

-                       if(snap && nw >= wx && nw <= wx + ww
-                               && nh >= wy && nh <= wy + wh) {
-                               if(!c->isfloating && lt[sellt]->arrange
+                       if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
+                               && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
+                               if(!c->isfloating && lt[selmon->sellt]->arrange

                                   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }
                                   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }

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

                        break;
                }
        }
        while(ev.type != ButtonRelease);
                        break;
                }
        }
        while(ev.type != ButtonRelease);

-       if(usegrab)
-               XUngrabServer(dpy);

        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        XUngrabPointer(dpy, CurrentTime);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        XUngrabPointer(dpy, CurrentTime);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void

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

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

-       drawbar();
+       drawbars();

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

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

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

-       if(lt[sellt]->arrange) {
+       if(lt[m->sellt]->arrange) {

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

-               wc.sibling = barwin;
+               wc.sibling = m->barwin;

                for(c = stack; c; c = c->snext)
                for(c = stack; c; c = c->snext)

-                       if(!c->isfloating && ISVISIBLE(c)) {
+                       if(!c->isfloating && m == &mon[c->mon] && ISVISIBLE(c)) {

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


@@ -1225,14 +1303,14 @@ setclientstate(Client *c, long state) {
 
 void
 setlayout(const Arg *arg) {
 
 void
 setlayout(const Arg *arg) {

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

        if(arg && arg->v)
        if(arg && arg->v)

-               lt[sellt] = (Layout *)arg->v;
+               lt[selmon->sellt] = (Layout *)arg->v;

        if(sel)
                arrange();
        else
        if(sel)
                arrange();
        else

-               drawbar();
+               drawbars();

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


@@ -1240,7 +1318,7 @@ void
 setmfact(const Arg *arg) {
        float f;
 
 setmfact(const Arg *arg) {
        float f;
 

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

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


@@ -1288,26 +1366,28 @@ setup(void) {
        dc.sel[ColBG] = getcolor(selbgcolor);
        dc.sel[ColFG] = getcolor(selfgcolor);
        dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
        dc.sel[ColBG] = getcolor(selbgcolor);
        dc.sel[ColFG] = getcolor(selfgcolor);
        dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));

-       dc.gc = XCreateGC(dpy, root, 0, 0);
+       dc.gc = XCreateGC(dpy, root, 0, NULL);

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

-       /* init bar */
+       /* init bars */
+       wa.override_redirect = True;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask|ExposureMask;

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

-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask|ExposureMask;
+       for(i = 0; i < nmons; i++) {
+               mon[i].barwin = XCreateWindow(dpy, root, mon[i].wx, mon[i].by, mon[i].ww, bh, 0, DefaultDepth(dpy, screen),

 
 

-       barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
-                       CopyFromParent, DefaultVisual(dpy, screen),
-                       CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       XMapRaised(dpy, barwin);
+                                             CopyFromParent, DefaultVisual(dpy, screen),
+                                             CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+               XDefineCursor(dpy, mon[i].barwin, cursor[CurNormal]);
+               XMapRaised(dpy, mon[i].barwin);
+       }

        updatestatus();
 
        /* EWMH support per view */
        updatestatus();
 
        /* EWMH support per view */


@@ -1330,8 +1410,8 @@ showhide(Client *c) {
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
                XMoveWindow(dpy, c->win, c->x, c->y);
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
                XMoveWindow(dpy, c->win, c->x, c->y);

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

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


@@ -1340,22 +1420,24 @@ showhide(Client *c) {
        }
 }
 
        }
 }
 

+
+void
+sigchld(int signal) {
+       while(0 < waitpid(-1, NULL, WNOHANG));
+}
+

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

-       /* The double-fork construct avoids zombie processes and keeps the code
-        * clean from stupid signal handlers. */
+       signal(SIGCHLD, sigchld);

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

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

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

-       wait(0);

 }
 
 void
 }
 
 void


@@ -1366,6 +1448,16 @@ tag(const Arg *arg) {
        }
 }
 
        }
 }
 

+#ifdef XINERAMA
+void
+tagmon(const Arg *arg) {
+       if(!sel || arg->ui >= nmons)
+               return;
+       sel->mon = arg->ui;
+       arrange();
+}
+#endif /* XINERAMA */
+

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


@@ -1378,44 +1470,44 @@ textnw(const char *text, unsigned int len) {
 }
 
 void
 }
 
 void

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

        int x, y, h, w, mw;
        unsigned int i, n;
        Client *c;
 
        int x, y, h, w, mw;
        unsigned int i, n;
        Client *c;
 

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

        if(n == 0)
                return;
 
        /* master */
        if(n == 0)
                return;
 
        /* master */

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

 
        if(--n == 0)
                return;
 
        /* tile stack */
 
        if(--n == 0)
                return;
 
        /* tile stack */

-       x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
-       y = wy;
-       w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
-       h = wh / n;
+       x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
+       y = m->wy;
+       w = (m->wx + mw > c->x + c->w) ? m->wx + m->ww - x : m->ww - mw;
+       h = m->wh / n;

        if(h < bh)
        if(h < bh)

-               h = wh;
+               h = m->wh;

 
 

-       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+       for(i = 0, c = nexttiled(m, c->next); c; c = nexttiled(m, c->next), i++) {

                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)

-                      ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
-               if(h != wh)
+                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+               if(h != m->wh)

                        y = c->y + HEIGHT(c);
        }
 }
 
 void
 togglebar(const Arg *arg) {
                        y = c->y + HEIGHT(c);
        }
 }
 
 void
 togglebar(const Arg *arg) {

-       showbar = !showbar;
+       selmon->showbar = !selmon->showbar;

        updategeom();
        updategeom();

-       updatebar();
+       XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);

        arrange();
 }
 
        arrange();
 }
 


@@ -1425,7 +1517,7 @@ togglefloating(const Arg *arg) {
                return;
        sel->isfloating = !sel->isfloating || sel->isfixed;
        if(sel->isfloating)
                return;
        sel->isfloating = !sel->isfloating || sel->isfixed;
        if(sel->isfloating)

-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+               resize(sel, sel->x, sel->y, sel->w, sel->h);

        arrange();
 }
 
        arrange();
 }
 


@@ -1433,11 +1525,11 @@ void
 toggletag(const Arg *arg) {
        unsigned int mask;
 
 toggletag(const Arg *arg) {
        unsigned int mask;
 

-       if (!sel)
+       if(!sel)

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

-       if(sel && mask) {
+       if(mask) {

                sel->tags = mask;
                arrange();
        }
                sel->tags = mask;
                arrange();
        }


@@ -1445,10 +1537,10 @@ toggletag(const Arg *arg) {
 
 void
 toggleview(const Arg *arg) {
 
 void
 toggleview(const Arg *arg) {

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

 
        if(mask) {
 
        if(mask) {

-               tagset[seltags] = mask;
+               tagset[selmon->seltags] = mask;

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


@@ -1484,48 +1576,72 @@ unmapnotify(XEvent *e) {
                unmanage(c);
 }
 
                unmanage(c);
 }
 

-void
-updatebar(void) {
-       if(dc.drawable != 0)
-               XFreePixmap(dpy, dc.drawable);
-       dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
-       XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
-}
-

 void
 updategeom(void) {
 #ifdef XINERAMA
 void
 updategeom(void) {
 #ifdef XINERAMA

-       int n, i = 0;
+       int di, x, y, n;
+       unsigned int dui, i = 0;
+       Bool pquery;
+       Client *c;
+       Window dummy;

        XineramaScreenInfo *info = NULL;
 
        /* window area geometry */
        XineramaScreenInfo *info = NULL;
 
        /* window area geometry */

-       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 
-               if(n > 1) {
-                       int di, x, y;
-                       unsigned int dui;
-                       Window dummy;
-                       if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
-                               for(i = 0; i < n; i++)
-                                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
-                                               break;
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+               nmons = (unsigned int)n;
+               for(c = clients; c; c = c->next)
+                       if(c->mon >= nmons)
+                               c->mon = nmons - 1;
+               if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor) * nmons)))
+                       die("fatal: could not realloc() %u bytes\n", sizeof(Monitor) * nmons);
+               pquery = XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
+               for(i = 0; i < nmons; i++) {
+                       /* TODO: consider re-using XineramaScreenInfo */
+                       mon[i].symbol[0] = '[';
+                       mon[i].symbol[1] = '0' + info[i].screen_number;
+                       mon[i].symbol[2] = ']';
+                       mon[i].symbol[3] = 0;
+                       mon[i].showbar = showbar;
+                       mon[i].topbar = topbar;
+                       mon[i].wx = info[i].x_org;
+                       mon[i].wy = mon[i].showbar && mon[i].topbar ? info[i].y_org + bh : info[i].y_org;
+                       mon[i].ww = info[i].width;
+                       mon[i].wh = mon[i].showbar ? info[i].height - bh : info[i].height;
+                       mon[i].seltags = 0;
+                       mon[i].sellt = 0;
+                       if(mon[i].showbar)
+                               mon[i].by = mon[i].topbar ? info[i].y_org : mon[i].wy + mon[i].wh;
+                       else
+                               mon[i].by = -bh;
+                       if(pquery && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+                               selmon = &mon[i];

                }
                }

-               wx = info[i].x_org;
-               wy = showbar && topbar ?  info[i].y_org + bh : info[i].y_org;
-               ww = info[i].width;
-               wh = showbar ? info[i].height - bh : info[i].height;

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

-#endif
+#endif /* XINERAMA */

        {
        {

-               wx = sx;
-               wy = showbar && topbar ? sy + bh : sy;
-               ww = sw;
-               wh = showbar ? sh - bh : sh;
+               nmons = 1;
+               if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor))))
+                       die("fatal: could not realloc() %u bytes\n", sizeof(Monitor));
+               selmon = &mon[0];
+               mon[0].symbol[0] = '[';
+               mon[0].symbol[1] = '0';
+               mon[0].symbol[2] = ']';
+               mon[0].symbol[3] = 0;
+               mon[0].showbar = showbar;
+               mon[0].topbar = topbar;
+               mon[0].wx = sx;
+               mon[0].wy = mon[0].showbar && mon[0].topbar ? sy + bh : sy;
+               mon[0].ww = sw;
+               mon[0].wh = mon[0].showbar ? sh - bh : sh;
+               mon[0].seltags = 0;
+               mon[0].sellt = 0;
+               if(mon[0].showbar)
+                       mon[0].by = mon[0].topbar ? sy : mon[0].wy + mon[0].wh;
+               else
+                       mon[0].by = -bh;

        }
        }

-
-       /* bar position */
-       by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;

 }
 
 void
 }
 
 void


@@ -1537,7 +1653,8 @@ updatenumlockmask(void) {
        modmap = XGetModifierMapping(dpy);
        for(i = 0; i < 8; i++)
                for(j = 0; j < modmap->max_keypermod; j++)
        modmap = XGetModifierMapping(dpy);
        for(i = 0; i < 8; i++)
                for(j = 0; j < modmap->max_keypermod; j++)

-                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
+                          == XKeysymToKeycode(dpy, XK_Num_Lock))

                                numlockmask = (1 << i);
        XFreeModifiermap(modmap);
 }
                                numlockmask = (1 << i);
        XFreeModifiermap(modmap);
 }


@@ -1549,7 +1666,7 @@ updatesizehints(Client *c) {
 
        if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
                /* size is uninitialized, ensure that size.flags aren't used */
 
        if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
                /* size is uninitialized, ensure that size.flags aren't used */

-               size.flags = PSize; 
+               size.flags = PSize;

        if(size.flags & PBaseSize) {
                c->basew = size.base_width;
                c->baseh = size.base_height;
        if(size.flags & PBaseSize) {
                c->basew = size.base_width;
                c->baseh = size.base_height;


@@ -1602,7 +1719,7 @@ void
 updatestatus() {
        if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
                strcpy(stext, "dwm-"VERSION);
 updatestatus() {
        if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
                strcpy(stext, "dwm-"VERSION);

-       drawbar();
+       drawbar(selmon);

 }
 
 void
 }
 
 void


@@ -1623,11 +1740,11 @@ updatewmhints(Client *c) {
 
 void
 view(const Arg *arg) {
 
 void
 view(const Arg *arg) {

-       if((arg->ui & TAGMASK) == tagset[seltags])
+       if((arg->ui & TAGMASK) == tagset[selmon->seltags])

                return;
                return;

-       seltags ^= 1; /* toggle sel tagset */
+       selmon->seltags ^= 1; /* toggle sel tagset */

        if(arg->ui & TAGMASK)
        if(arg->ui & TAGMASK)

-               tagset[seltags] = arg->ui & TAGMASK;
+               tagset[selmon->seltags] = arg->ui & TAGMASK;

        arrange();
 }
 
        arrange();
 }
 


@@ -1668,10 +1785,10 @@ void
 zoom(const Arg *arg) {
        Client *c = sel;
 
 zoom(const Arg *arg) {
        Client *c = sel;
 

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

                return;
                return;

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

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


@@ -1682,14 +1799,14 @@ zoom(const Arg *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]))

-               die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
                die("usage: dwm [-v]\n");
 
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
        else if(argc != 1)
                die("usage: dwm [-v]\n");
 
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())

-               fprintf(stderr, "warning: no locale support\n");
+               fputs("warning: no locale support\n", stderr);

 
 

-       if(!(dpy = XOpenDisplay(0)))
+       if(!(dpy = XOpenDisplay(NULL)))

                die("dwm: cannot open display\n");
 
        checkotherwm();
                die("dwm: cannot open display\n");
 
        checkotherwm();