fixed tagmon, re-using detach/detachstack and attach/attachstack

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 188e445..4ff4f9d 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -6,16 +6,13 @@
  * events about window (dis-)appearance.  Only one X connection at a time is
  * allowed to select for this event mask.
  *
  * events about window (dis-)appearance.  Only one X connection at a time is
  * allowed to select for this event mask.
  *

- * Calls to fetch an X event from the event queue are blocking.  Due reading
- * status text from standard input, a select()-driven main loop has been
- * implemented which selects for reads on the X connection and STDIN_FILENO to
- * handle all data smoothly. The event handlers of dwm are organized in an
- * array which is accessed whenever a new event has been fetched. This allows
- * event dispatching in O(1) time.
+ * The event handlers of dwm are organized in an array which is accessed
+ * whenever a new event has been fetched. This allows event dispatching
+ * in O(1) time.

  *
  * Each child of the root window is called a client, except windows which have
  * set the override_redirect flag.  Clients are organized in a global
  *
  * Each child of the root window is called a client, except windows which have
  * set the override_redirect flag.  Clients are organized in a global

- * doubly-linked client list, the focus history is remembered through a global
+ * linked client list, the focus history is remembered through a global

  * stack list. Each client contains a bit array to indicate the tags of a
  * client.
  *
  * stack list. Each client contains a bit array to indicate the tags of a
  * client.
  *


@@ -26,11 +23,11 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>

+#include <signal.h>

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

-#include <sys/select.h>

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <X11/cursorfont.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <X11/cursorfont.h>


@@ -41,47 +38,46 @@
 #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 */
 
 /* macros */

-#define MAX(a, b)       ((a) > (b) ? (a) : (b))
-#define MIN(a, b)       ((a) < (b) ? (a) : (b))
-#define BUTTONMASK      (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
-#define LENGTH(x)       (sizeof x / sizeof x[0])
-#define MAXTAGLEN       16
-#define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
-#define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
-#define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
-#define ISVISIBLE(x)    (x->tags & tagset[seltags])
+#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(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
+#define LENGTH(X)               (sizeof X / sizeof X[0])
+#define MAX(A, B)               ((A) > (B) ? (A) : (B))
+#define MIN(A, B)               ((A) < (B) ? (A) : (B))
+#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
+#define WIDTH(X)                ((X)->w + 2 * (X)->bw)
+#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
+#define TAGMASK                 ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(X)                (textnw(X, strlen(X)) + dc.font.height)

 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */

-enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast };        /* default atoms */

 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 

-/* typedefs */
-typedef unsigned int uint;
-typedef unsigned long ulong;
-

 typedef union {
        int i;
 typedef union {
        int i;

-       uint ui;
+       unsigned int ui;

        float f;
        void *v;
 } Arg;
 
 typedef struct {
        float f;
        void *v;
 } Arg;
 
 typedef struct {

-       uint click;
-       uint mask;
-       uint button;
+       unsigned int click;
+       unsigned int mask;
+       unsigned int button;

        void (*func)(const Arg *arg);
        const Arg arg;
 } Button;
 
        void (*func)(const Arg *arg);
        const Arg arg;
 } Button;
 

+typedef struct Monitor Monitor;

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


@@ -89,17 +85,18 @@ struct Client {
        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;

-       uint tags;
+       unsigned int tags;

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

+       Monitor *mon;

        Window win;
 };
 
 typedef struct {
        int x, y, w, h;
        Window win;
 };
 
 typedef struct {
        int x, y, w, h;

-       ulong norm[ColLast];
-       ulong sel[ColLast];
+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];

        Drawable drawable;
        GC gc;
        struct {
        Drawable drawable;
        GC gc;
        struct {


@@ -112,7 +109,7 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
 } DC; /* draw context */
 
 typedef struct {

-       uint mod;
+       unsigned int mod;

        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;
        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;


@@ -120,82 +117,107 @@ typedef struct {
 
 typedef struct {
        const char *symbol;
 
 typedef struct {
        const char *symbol;

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

 } Layout;
 
 } Layout;
 

+struct Monitor {
+       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;
+       Client *clients;
+       Client *sel;
+       Client *stack;
+       Monitor *next;
+       Window barwin;
+};
+

 typedef struct {
        const char *class;
        const char *instance;
        const char *title;
 typedef struct {
        const char *class;
        const char *instance;
        const char *title;

-       uint tags;
+       unsigned int tags;

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

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

 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);

+static void cleanupmons(void);
+static void clearurgent(Client *c);

 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
 static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
 static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);

-static void drawbar(void);
-static void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
-static void drawtext(const char *text, ulong col[ColLast], Bool invert);
+static void die(const char *errstr, ...);
+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 enternotify(XEvent *e);

-static void eprint(const char *errstr, ...);

 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
 static void focusstack(const Arg *arg);
 static Client *getclient(Window w);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
 static void focusstack(const Arg *arg);
 static Client *getclient(Window w);

-static ulong getcolor(const char *colstr);
+static unsigned long getcolor(const char *colstr);

 static long getstate(Window w);
 static long getstate(Window w);

-static Bool gettextprop(Window w, Atom atom, char *text, uint size);
+static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);

 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
 static void initfont(const char *fontstr);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
 static void initfont(const char *fontstr);

-static Bool isoccupied(uint t);

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

-static Bool isurgent(uint t);

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

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

 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void movemouse(const Arg *arg);
 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, 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 setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void run(void);
 static void scan(void);
 static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);

+static void showhide(Client *c);
+static void sigchld(int signal);

 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);

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

 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unmanage(Client *c);
 static void 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 updategeom(void);

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

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

+static void updatestatus(void);

 static void updatetitle(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
 static void updatetitle(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);


@@ -203,14 +225,18 @@ 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];
 
 /* variables */
 static char stext[256];

-static int screen, sx, sy, sw, sh;
-static int by, bh, blw, wx, wy, ww, wh;
-static uint seltags = 0, sellt = 0;
+static int screen;
+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 int (*xerrorxlib)(Display *, XErrorEvent *);

-static uint numlockmask = 0;
+static unsigned int numlockmask = 0;

 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,


@@ -226,99 +252,160 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];

-static Bool otherwm, readin;
+static Bool otherwm;

 static Bool running = True;
 static Bool running = True;

-static uint tagset[] = {1, 1}; /* after start, first tag is selected */
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;

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

-static DC dc = {0};
+static DC dc;

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

-static Window root, barwin;
+static Monitor *mons = NULL, *selmon = NULL;
+static Window root;

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

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

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

-       uint i;
+       unsigned int i;

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

-       XGetClassHint(dpy, c->win, &ch);
-       for(i = 0; i < LENGTH(rules); i++) {
-               r = &rules[i];
-               if((!r->title || strstr(c->name, r->title))
-               && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
-               && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
-                       c->isfloating = r->isfloating;
-                       c->tags |= r->tags & TAGMASK;
+       c->isfloating = c->tags = 0;
+       if(XGetClassHint(dpy, c->win, &ch)) {
+               for(i = 0; i < LENGTH(rules); i++) {
+                       r = &rules[i];
+                       if((!r->title || strstr(c->name, r->title))
+                       && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+                       && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+                               c->isfloating = r->isfloating;
+                               c->tags |= r->tags;
+                       }

                }
                }

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

        }
        }

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

 }
 
 }
 

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

 
 

-       for(c = clients; c; c = c->next)
-               if(ISVISIBLE(c)) {
-                       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);
+               /* 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;

                }
                }

-               else {
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+
+               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) {
+       Monitor *m;
+
+       /* optimise two loops into one, check focus(NULL) */
+       for(m = mons; m; m = m->next)
+               showhide(m->stack);

        focus(NULL);
        focus(NULL);

-       if(lt[sellt]->arrange)
-               lt[sellt]->arrange();
-       restack();
+       for(m = mons; m; m = m->next) {
+               if(lt[m->sellt]->arrange)
+                       lt[m->sellt]->arrange(m);
+               restack(m);
+       }

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

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

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

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

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

-       uint i, x, click;
+       unsigned int i, x, click;

        Arg arg = {0};
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;
        Arg arg = {0};
        Client *c;
        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 && ev->x >= selmon->btx) {
+               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;


@@ -331,34 +418,36 @@ buttonpress(XEvent *e) {
        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
                   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
                   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))

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

 }
 
 void
 checkotherwm(void) {
        otherwm = False;
 }
 
 void
 checkotherwm(void) {
        otherwm = False;

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

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

-               eprint("dwm: another window manager is already running\n");
-       XSetErrorHandler(NULL);
-       xerrorxlib = XSetErrorHandler(xerror);
+               die("dwm: another window manager is already running\n");
+       XSetErrorHandler(xerror);

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

-       Arg a = {.i = ~0};
+       Arg a = {.ui = ~0};

        Layout foo = { "", NULL };
        Layout foo = { "", NULL };

+       Monitor *m;

 
 

-       close(STDIN_FILENO);

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

-       lt[sellt] = &foo;
-       while(stack)
-               unmanage(stack);
+       lt[selmon->sellt] = &foo;
+
+       /* 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


@@ -369,11 +458,36 @@ 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);
+       cleanupmons();

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

+void
+cleanupmons(void) {
+       Monitor *m;
+
+       while(mons) {
+               m = mons->next;
+               XUnmapWindow(dpy, mons->barwin);
+               XDestroyWindow(dpy, mons->barwin);
+               free(mons);
+               mons = m;
+       }
+}
+
+void
+clearurgent(Client *c) {
+       XWMHints *wmh;
+
+       c->isurgent = False;
+       if(!(wmh = XGetWMHints(dpy, c->win)))
+               return;
+       wmh->flags &= ~XUrgencyHint;
+       XSetWMHints(dpy, c->win, wmh);
+       XFree(wmh);
+}
+

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


@@ -394,13 +508,19 @@ configure(Client *c) {
 
 void
 configurenotify(XEvent *e) {
 
 void
 configurenotify(XEvent *e) {

+       Monitor *m;

        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, sw, bh, DefaultDepth(dpy, screen));
+               updatebars();
+               for(m = mons; m; m = m->next)
+                       XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);

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


@@ -414,7 +534,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)


@@ -459,72 +579,107 @@ destroynotify(XEvent *e) {
 
 void
 detach(Client *c) {
 
 void
 detach(Client *c) {

-       Client *i;
+       Client **tc;

 
 

-       if (c != clients) {
-               for(i = clients; i->next != c; i = i->next);
-               i->next = c->next;
-       }
-       else {
-               clients = c->next;
-       }
-       c->next =  NULL;
+       for(tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
+       *tc = c->next;

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

-drawbar(void) {
-       int i, x;
+die(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
+void
+drawbar(Monitor *m) {
+       int x;
+       unsigned int i, occ = 0, urg = 0;
+       unsigned long *col;
+       Client *c;
+
+       for(c = m->clients; c; c = c->next) {
+               occ |= c->tags;
+               if(c->isurgent)
+                       urg |= c->tags;
+       }

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

+#ifdef XINERAMA
+       {
+               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;
+       }
+#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]);

-               if(tagset[seltags] & 1 << i) {
-                       drawtext(tags[i], dc.sel, isurgent(i));
-                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
-               }
-               else {
-                       drawtext(tags[i], dc.norm, isurgent(i));
-                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
-               }
+               col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
+               drawtext(tags[i], col, urg & 1 << i);
+               drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+                          occ & 1 << i, urg & 1 << i, col);

                dc.x += dc.w;
        }
        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;
+       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;
+               }
+               drawtext(stext, dc.norm, False);
+               if((dc.w = dc.x - x) > bh) {
+                       dc.x = x;
+                       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);
+               }

        }
        }

-       drawtext(stext, dc.norm, False);
-       if((dc.w = dc.x - x) > bh) {
+       else {

                dc.x = x;
                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);
+               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);
 }
 
 void
        XSync(dpy, False);
 }
 
 void

-drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
+drawbars() {
+       Monitor *m;
+
+       for(m = mons; m; m = m->next)
+               drawbar(m);
+}
+
+void
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {

        int x;
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
        int x;
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };


@@ -545,25 +700,24 @@ drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
 }
 
 void
 }
 
 void

-drawtext(const char *text, ulong col[ColLast], Bool invert) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+       char buf[256];

        int i, x, y, h, len, olen;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
        int i, x, y, h, len, olen;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };

-       char buf[256];

 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
        olen = strlen(text);
 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
        olen = strlen(text);

-       len = MIN(olen, sizeof buf);
-       memcpy(buf, text, len);

        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */
        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */

-       for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+       for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);

        if(!len)
                return;
        if(!len)
                return;

+       memcpy(buf, text, len);

        if(len < olen)
                for(i = len; i && i > len - 3; buf[--i] = '.');
        XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
        if(len < olen)
                for(i = len; i && i > len - 3; buf[--i] = '.');
        XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);


@@ -586,33 +740,30 @@ enternotify(XEvent *e) {
                focus(NULL);
 }
 
                focus(NULL);
 }
 

-void
-eprint(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
-}
-

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

+       Monitor *m;

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

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

 }
 
 void
 focus(Client *c) {
        if(!c || !ISVISIBLE(c))
 }
 
 void
 focus(Client *c) {
        if(!c || !ISVISIBLE(c))

-               for(c = stack; c && !ISVISIBLE(c); c = c->snext);
-       if(sel && sel != c) {
-               grabbuttons(sel, False);
-               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+               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) {

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

                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);


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

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

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

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

 }
 
 }
 

+#ifdef XINERAMA
+void
+focusmon(const Arg *arg) {
+       unsigned int i;
+       Monitor *m; 
+
+       for(i = 0, m = mons; m; m = m->next, i++)
+               if(i == arg->ui) {
+                       selmon = m;
+                       focus(NULL);
+                       drawbars();
+                       break;
+               }
+}
+#endif /* XINERAMA */
+

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

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

                return;
                return;

-       if (arg->i > 0) {
-               for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
+       if(arg->i > 0) {
+               for(c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);

                if(!c)
                if(!c)

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

        }
        else {
        }
        else {

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

                        if(ISVISIBLE(i))
                                c = i;
                if(!c)
                        if(ISVISIBLE(i))
                                c = i;
                if(!c)


@@ -655,25 +822,27 @@ focusstack(const Arg *arg) {
        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);

-               restack();
+               restack(selmon);

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

-ulong
+unsigned long

 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))

-               eprint("error, cannot allocate color '%s'\n", colstr);
+               die("error, cannot allocate color '%s'\n", colstr);

        return color.pixel;
 }
 
        return color.pixel;
 }
 


@@ -682,7 +851,7 @@ getstate(Window w) {
        int format, status;
        long result = -1;
        unsigned char *p = NULL;
        int format, status;
        long result = -1;
        unsigned char *p = NULL;

-       ulong n, extra;
+       unsigned long n, extra;

        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],


@@ -696,7 +865,7 @@ getstate(Window w) {
 }
 
 Bool
 }
 
 Bool

-gettextprop(Window w, Atom atom, char *text, uint size) {
+gettextprop(Window w, Atom atom, char *text, unsigned int size) {

        char **list = NULL;
        int n;
        XTextProperty name;
        char **list = NULL;
        int n;
        XTextProperty name;


@@ -723,47 +892,40 @@ gettextprop(Window w, Atom atom, char *text, uint size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
 
 void
 grabbuttons(Client *c, Bool focused) {

-       int i, j;
-       uint buttons[]   = { Button1, Button2, Button3 };
-       uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
-
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       if(focused)
-               for(i = 0; i < LENGTH(buttons); i++)
-                       for(j = 0; j < LENGTH(modifiers); j++)
-                               XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
-                                       BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-       else
-               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-                       BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+       updatenumlockmask();
+       {
+               unsigned int i, j;
+               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+               XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+               if(focused) {
+                       for(i = 0; i < LENGTH(buttons); i++)
+                               if(buttons[i].click == ClkClientWin)
+                                       for(j = 0; j < LENGTH(modifiers); j++)
+                                               XGrabButton(dpy, buttons[i].button,
+                                                           buttons[i].mask | modifiers[j],
+                                                           c->win, False, BUTTONMASK,
+                                                           GrabModeAsync, GrabModeSync, None, None);
+               } else
+                       XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+                                   BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+       }

 }
 
 void
 grabkeys(void) {
 }
 
 void
 grabkeys(void) {

-       uint i, j;
-       KeyCode code;
-       XModifierKeymap *modmap;
-
-       /* init modifier map */
-       modmap = XGetModifierMapping(dpy);
-       for(i = 0; i < 8; i++)
-               for(j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               numlockmask = (1 << i);
+       updatenumlockmask();
+       { /* grab keys */
+               unsigned int i, j;
+               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+               KeyCode code;
+
+               XUngrabKey(dpy, AnyKey, AnyModifier, root);
+               for(i = 0; i < LENGTH(keys); i++) {
+                       if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+                               for(j = 0; j < LENGTH(modifiers); j++)
+                                       XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+                                                True, GrabModeAsync, GrabModeAsync);

                }
                }

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

        }
 }
 
        }
 }
 


@@ -773,8 +935,6 @@ initfont(const char *fontstr) {
        int i, n;
 
        missing = NULL;
        int i, n;
 
        missing = NULL;

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

        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)


@@ -795,28 +955,15 @@ initfont(const char *fontstr) {
                }
        }
        else {
                }
        }
        else {

-               if(dc.font.xfont)
-                       XFreeFont(dpy, dc.font.xfont);
-               dc.font.xfont = NULL;

                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))

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

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

-Bool
-isoccupied(uint t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->tags & 1 << t)
-                       return True;
-       return False;
-}
-

 Bool
 isprotodel(Client *c) {
        int i, n;
 Bool
 isprotodel(Client *c) {
        int i, n;


@@ -832,19 +979,9 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

-Bool
-isurgent(uint t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->isurgent && c->tags & 1 << t)
-                       return True;
-       return False;
-}
-

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

-       uint i;
+       unsigned int i;

        KeySym keysym;
        XKeyEvent *ev;
 
        KeySym keysym;
        XKeyEvent *ev;
 


@@ -861,31 +998,33 @@ 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
 manage(Window w, XWindowAttributes *wa) {
 }
 
 void
 manage(Window w, XWindowAttributes *wa) {

+       static Client cz;

        Client *c, *t = NULL;
        Client *c, *t = NULL;

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

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       if(!(c = calloc(1, sizeof(Client))))
-               eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
+       if(!(c = malloc(sizeof(Client))))
+               die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+       *c = cz;

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

+       c->mon = selmon;

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


@@ -896,16 +1035,17 @@ manage(Window w, XWindowAttributes *wa) {
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;

-               c->bw = wa->border_width;
+               c->bw = 0;

        }
        else {
        }
        else {

-               if(c->x + c->w + 2 * c->bw > sx + sw)
-                       c->x = sx + sw - c->w - 2 * c->bw;
-               if(c->y + c->h + 2 * c->bw > sy + sh)
-                       c->y = sy + sh - c->h - 2 * c->bw;
+               if(c->x + WIDTH(c) > sx + sw)
+                       c->x = sx + sw - WIDTH(c);
+               if(c->y + HEIGHT(c) > sy + sh)
+                       c->y = sy + sh - HEIGHT(c);

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


@@ -917,14 +1057,14 @@ manage(Window w, XWindowAttributes *wa) {
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);

-       if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-               for(t = clients; t && t->win != trans; t = t->next);
+       if(XGetTransientForHint(dpy, w, &trans))
+               t = getclient(trans);

        if(t)
                c->tags = t->tags;
        else
                applyrules(c);
        if(!c->isfloating)
        if(t)
                c->tags = t->tags;
        else
                applyrules(c);
        if(!c->isfloating)

-               c->isfloating = (rettrans == Success) || c->isfixed;
+               c->isfloating = trans != None || c->isfixed;

        if(c->isfloating)
                XRaiseWindow(dpy, c->win);
        attach(c);
        if(c->isfloating)
                XRaiseWindow(dpy, c->win);
        attach(c);


@@ -958,67 +1098,67 @@ 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, wh, resizehints);
+       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);

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

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

        Client *c;
        Window dummy;
        XEvent ev;
 
        Client *c;
        Window dummy;
        XEvent ev;
 

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

                return;
                return;

-       restack();
-       ocx = nx = c->x;
-       ocy = ny = c->y;
+       restack(selmon);
+       ocx = c->x;
+       ocy = c->y;

        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;

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

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

-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;

                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:

-                       XSync(dpy, False);
-                       nx = ocx + (ev.xmotion.x - x1);
-                       ny = ocy + (ev.xmotion.y - y1);
-                       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 + c->w + 2 * c->bw)) < snap)
-                                       nx = wx + ww - c->w - 2 * c->bw;
-                               if(abs(wy - ny) < snap)
-                                       ny = wy;
-                               else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
-                                       ny = wy + wh - c->h - 2 * c->bw;
-                               if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                       nx = ocx + (ev.xmotion.x - x);
+                       ny = ocy + (ev.xmotion.y - y);
+                       if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
+                               && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+                               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;
                }
        }
                        break;
                }
        }

+       while(ev.type != ButtonRelease);
+       XUngrabPointer(dpy, CurrentTime);

 }
 
 Client *
 nexttiled(Client *c) {
 }
 
 Client *
 nexttiled(Client *c) {

+       // TODO: m handling

        for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
        return c;
 }
        for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
        return c;
 }


@@ -1029,9 +1169,11 @@ propertynotify(XEvent *e) {
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 

-       if(ev->state == PropertyDelete)
+       if((ev->window == root) && (ev->atom == XA_WM_NAME))
+               updatestatus();
+       else if(ev->state == PropertyDelete)

                return; /* ignore */
                return; /* ignore */

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

                switch (ev->atom) {
                default: break;
                case XA_WM_TRANSIENT_FOR:
                switch (ev->atom) {
                default: break;
                case XA_WM_TRANSIENT_FOR:


@@ -1044,77 +1186,27 @@ 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);
                        break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);

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

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

-       readin = running = False;
+       running = False;

 }
 
 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) {
-               /* set minimum possible */
-               w = MAX(1, w);
-               h = MAX(1, h);
-
-               /* 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;
-               }
-
-               /* 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 - w - 2 * c->bw;
-       if(y > sy + sh)
-               y = sh - h - 2 * c->bw;
-       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;


@@ -1134,62 +1226,59 @@ resizemouse(const Arg *arg) {
        Client *c;
        XEvent ev;
 
        Client *c;
        XEvent ev;
 

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

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

-       for(;;) {
-               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
+       do {
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);

                switch(ev.type) {
                switch(ev.type) {

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

                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:

-                       XSync(dpy, False);

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

+       while(ev.type != ButtonRelease);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+       XUngrabPointer(dpy, CurrentTime);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 void
 }
 
 void

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

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

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

                return;
                return;

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

-               wc.sibling = barwin;
-               for(c = stack; c; c = c->snext)
+               wc.sibling = m->barwin;
+               for(c = m->stack; c; c = c->snext)

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


@@ -1201,71 +1290,22 @@ restack(void) {
 
 void
 run(void) {
 
 void
 run(void) {

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

        XEvent ev;
 
        XEvent ev;
 

-       /* main event loop, also reads status text from stdin */
+       /* main event loop */

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

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

        }
 }
 
 void
 scan(void) {
        }
 }
 
 void
 scan(void) {

-       uint i, num;
-       Window *wins, d1, d2;
+       unsigned int i, num;
+       Window d1, d2, *wins = NULL;

        XWindowAttributes wa;
 
        XWindowAttributes wa;
 

-       wins = NULL;

        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)


@@ -1281,9 +1321,9 @@ scan(void) {
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }

+               if(wins)
+                       XFree(wins);

        }
        }

-       if(wins)
-               XFree(wins);

 }
 
 void
 }
 
 void


@@ -1296,14 +1336,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;
-       if(sel)
+               lt[selmon->sellt] = (Layout *)arg->v;
+       if(selmon->sel)

                arrange();
        else
                arrange();
        else

-               drawbar();
+               drawbars();

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


@@ -1311,18 +1351,18 @@ 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;
                return;

-       f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+       f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;

        if(f < 0.1 || f > 0.9)
                return;
        if(f < 0.1 || f > 0.9)
                return;

-       mfact = f;
+       selmon->mfact = f;

        arrange();
 }
 
 void
 setup(void) {
        arrange();
 }
 
 void
 setup(void) {

-       uint i;
+       unsigned int i;

        int w;
        XSetWindowAttributes wa;
 
        int w;
        XSetWindowAttributes wa;
 


@@ -1342,13 +1382,12 @@ setup(void) {
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);

-       wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);

        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 
        /* init cursors */
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 
        /* init cursors */

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

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


@@ -1360,72 +1399,104 @@ 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 */

        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;
-
-       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);
-       strcpy(stext, "dwm-"VERSION);
-       drawbar();
+       updatebars();
+       updatestatus();

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

+       wa.cursor = cursor[CurNormal];

        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask

-                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
+                       |PropertyChangeMask;

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

-
-       /* grab keys */

        grabkeys();
 }
 
        grabkeys();
 }
 

+void
+showhide(Client *c) {
+       if(!c)
+               return;
+       if(ISVISIBLE(c)) { /* show clients top down */
+               XMoveWindow(dpy, c->win, c->x, c->y);
+               if(!lt[c->mon->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);
+               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       }
+}
+
+
+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
 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();
        }
 }
 

+#ifdef XINERAMA
+void
+tagmon(const Arg *arg) {
+       unsigned int i;
+       Client *c;
+       Monitor *m;
+
+       if(!(c = selmon->sel))
+               return;
+       for(i = 0, m = mons; m; m = m->next, i++)
+               if(i == arg->ui) {
+                       detach(c);
+                       detachstack(c);
+                       c->mon = m;
+                       attach(c);
+                       attachstack(c);
+                       selmon->sel = selmon->stack;
+                       m->sel = c;
+                       arrange();
+                       break;
+               }
+}
+#endif /* XINERAMA */
+

 int
 int

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

        XRectangle r;
 
        if(dc.font.set) {
        XRectangle r;
 
        if(dc.font.set) {


@@ -1436,73 +1507,77 @@ textnw(const char *text, uint len) {
 }
 
 void
 }
 
 void

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

        int x, y, h, w, mw;
        int x, y, h, w, mw;

-       uint i, n;
+       unsigned int i, n;

        Client *c;
 
        Client *c;
 

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

-                      ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
-               if(h != wh)
-                       y = c->y + c->h + 2 * c->bw;
+                      ? 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) {
        }
 }
 
 void
 togglebar(const Arg *arg) {

-       showbar = !showbar;
-       updategeom();
-       updatebar();
+       selmon->showbar = !selmon->showbar;
+       updatebarpos(selmon);
+       XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);

        arrange();
 }
 
 void
 togglefloating(const Arg *arg) {
        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, True);
+       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();
 }
 
 void
 toggletag(const Arg *arg) {
        arrange();
 }
 
 void
 toggletag(const Arg *arg) {

-       uint mask = sel->tags ^ (arg->ui & TAGMASK);
+       unsigned int mask;

 
 

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

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

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

 
        if(mask) {
 
        if(mask) {

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

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


@@ -1518,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);


@@ -1539,39 +1614,153 @@ unmapnotify(XEvent *e) {
 }
 
 void
 }
 
 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);
+updatebars(void) {
+       Monitor *m;
+       XSetWindowAttributes wa;
+
+       wa.override_redirect = True;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask|ExposureMask;
+
+       for(m = mons; m; m = m->next) {
+               m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
+
+                                         CopyFromParent, DefaultVisual(dpy, screen),
+                                         CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+               XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
+               XMapRaised(dpy, m->barwin);
+       }
+}
+
+void
+updatebarpos(Monitor *m) {
+       m->wy = m->my;
+       m->wh = m->mh;
+       if(m->showbar) {
+               m->wh -= bh;
+               m->by = m->topbar ? m->wy : m->wy + m->wh;
+               m->wy = m->topbar ? m->wy + bh : m->wy;
+       }
+       else
+               m->by = -bh;

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

+       int i, n = 1;
+       Client *c;
+       Monitor *newmons = NULL, *m, *tm;
+

 #ifdef XINERAMA
 #ifdef XINERAMA

-       int i;

        XineramaScreenInfo *info = NULL;
 
        XineramaScreenInfo *info = NULL;
 

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

        if(XineramaIsActive(dpy)) {
        if(XineramaIsActive(dpy)) {

-               info = XineramaQueryScreens(dpy, &i);
-               wx = info[xidx].x_org;
-               wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
-               ww = info[xidx].width;
-               wh = showbar ? info[xidx].height - bh : info[xidx].height;
+               for(i = 0, m = newmons; m; m = m->next, i++) {
+                       m->screen_number = info[i].screen_number;
+                       m->wx = info[i].x_org;
+                       m->my = m->wy = info[i].y_org;
+                       m->ww = info[i].width;
+                       m->mh = m->wh = info[i].height;
+               }

                XFree(info);
        }
        else
 #endif
                XFree(info);
        }
        else
 #endif

+       /* default monitor setup */

        {
        {

-               wx = sx;
-               wy = showbar && topbar ? sy + bh : sy;
-               ww = sw;
-               wh = showbar ? sh - bh : sh;
+               m->screen_number = 0;
+               m->wx = sx;
+               m->my = m->wy = sy;
+               m->ww = sw;
+               m->mh = m->wh = sh;

        }
 
        }
 

-       /* bar position */
-       by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
+       /* 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;
+               updatebarpos(m);
+               /* reassign all clients with same screen number */
+               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 of disappeared monitors */
+       for(tm = mons; tm; tm = tm->next) {
+               while(tm->clients) {
+                       c = tm->clients->next;
+                       tm->clients->next = newmons->clients;
+                       tm->clients->mon = newmons;
+                       newmons->clients = tm->clients;
+                       tm->clients = c;
+               }
+               while(tm->stack) {
+                       c = tm->stack->snext;
+                       tm->stack->snext = newmons->stack;
+                       newmons->sel = newmons->stack = tm->stack;
+                       tm->stack = c;
+               }
+       }
+
+       /* select focused monitor */
+       if(!selmon) {
+               selmon = newmons;
+               int di, x, y;
+               unsigned int dui;
+               Window dummy;
+               if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) 
+                       for(m = newmons; m; m = m->next)
+                               if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
+                                       selmon = m;
+                                       break;
+                               }
+       }
+
+       /* final assignment of new monitors */
+       cleanupmons();
+       mons = newmons;
+}
+
+void
+updatenumlockmask(void) {
+       unsigned int i, j;
+       XModifierKeymap *modmap;
+
+       numlockmask = 0;
+       modmap = XGetModifierMapping(dpy);
+       for(i = 0; i < 8; i++)
+               for(j = 0; j < modmap->max_keypermod; j++)
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
+                          == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+       XFreeModifiermap(modmap);

 }
 
 void
 }
 
 void


@@ -1579,7 +1768,9 @@ updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 

-       XGetWMNormalHints(dpy, c->win, &size, &msize);
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+               /* size is uninitialized, ensure that size.flags aren't used */
+               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;


@@ -1619,13 +1810,20 @@ updatesizehints(Client *c) {
        else
                c->maxa = c->mina = 0.0;
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
        else
                c->maxa = c->mina = 0.0;
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh

-                       && c->maxw == c->minw && c->maxh == c->minh);
+                    && c->maxw == c->minw && c->maxh == c->minh);

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

-               gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+               gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
+}
+
+void
+updatestatus() {
+       if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+               strcpy(stext, "dwm-"VERSION);
+       drawbar(selmon);

 }
 
 void
 }
 
 void


@@ -1633,19 +1831,24 @@ updatewmhints(Client *c) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {

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

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

+

                XFree(wmh);
        }
 }
 
 void
 view(const Arg *arg) {
                XFree(wmh);
        }
 }
 
 void
 view(const Arg *arg) {

-       seltags ^= 1; /* toggle sel tagset */
-       if(arg && (arg->ui & TAGMASK))
-               tagset[seltags] = arg->i & TAGMASK;
+       if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+               return;
+       selmon->seltags ^= 1; /* toggle sel tagset */
+       if(arg->ui & TAGMASK)
+               selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;

        arrange();
 }
 
        arrange();
 }
 


@@ -1684,11 +1887,11 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 
 void
 zoom(const Arg *arg) {
 
 void
 zoom(const Arg *arg) {

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

 
 

-       if(!lt[sellt]->arrange || lt[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(clients))
+       if(c == nexttiled(selmon->clients))

                if(!c || !(c = nexttiled(c->next)))
                        return;
        detach(c);
                if(!c || !(c = nexttiled(c->next)))
                        return;
        detach(c);


@@ -1700,13 +1903,15 @@ 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]))

-               eprint("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)
        else if(argc != 1)

-               eprint("usage: dwm [-v]\n");
+               die("usage: dwm [-v]\n");
+
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fputs("warning: no locale support\n", stderr);

 
 

-       setlocale(LC_CTYPE, "");
-       if(!(dpy = XOpenDisplay(0)))
-               eprint("dwm: cannot open display\n");
+       if(!(dpy = XOpenDisplay(NULL)))
+               die("dwm: cannot open display\n");

 
        checkotherwm();
        setup();
 
        checkotherwm();
        setup();