same as before with dwm.c as well

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 48785c7..ffc8864 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -6,17 +6,14 @@
  * 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
  *
  * 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
- * stack list. Each client contains a bit array to indicate the tags of a
+ * set the override_redirect flag.  Clients are organized in a linked client
+ * list on each monitor, the focus history is remembered through a stack list
+ * on each monitor. Each client contains a bit array to indicate the tags of a

  * client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  * client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.


@@ -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,78 +38,68 @@
 #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 */
+
+#include "drw.h"
+#include "util.h"

 
 /* 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) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
+#define INTERSECT(x,y,w,h,m)    (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
+                               * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
+#define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
+#define LENGTH(X)               (sizeof X / sizeof X[0])
+#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
+#define WIDTH(X)                ((X)->w + 2 * (X)->bw)
+#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
+#define TAGMASK                 ((1 << LENGTH(tags)) - 1)
+#define TEXTW(X)                (drw_font_getexts_width(drw->font, X, strlen(X)) + drw->font->h)

 
 /* enums */
 
 /* 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 { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
+enum { NetSupported, NetWMName, NetWMState,
+       NetWMFullscreen, NetActiveWindow, NetWMWindowType,
+       NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
+enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */

 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,

-       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
-
-/* typedefs */
-typedef unsigned int uint;
-typedef unsigned long ulong;
+       ClkClientWin, ClkRootWin, ClkLast }; /* clicks */

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

-       uint ui;
+       unsigned int ui;

        float f;
        float f;

-       void *v;
+       const void *v;

 } Arg;
 
 typedef struct {
 } 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];
        float mina, maxa;
        int x, y, w, h;
 typedef struct Client Client;
 struct Client {
        char name[256];
        float mina, maxa;
        int x, y, w, h;

+       int oldx, oldy, oldw, oldh;

        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;

-       uint tags;
-       Bool isfixed, isfloating, isurgent;
+       unsigned int tags;
+       Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;

        Client *next;
        Client *snext;
        Client *next;
        Client *snext;

+       Monitor *mon;

        Window win;
 };
 
 typedef struct {
        Window win;
 };
 
 typedef struct {

-       int x, y, w, h;
-       ulong norm[ColLast];
-       ulong sel[ColLast];
-       Drawable drawable;
-       GC gc;
-       struct {
-               int ascent;
-               int descent;
-               int height;
-               XFontSet set;
-               XFontStruct *xfont;
-       } font;
-} 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,100 +107,143 @@ typedef struct {
 
 typedef struct {
        const char *symbol;
 
 typedef struct {
        const char *symbol;

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

 } Layout;
 
 } Layout;
 

+struct Monitor {
+       char ltsymbol[16];
+       float mfact;
+       int nmaster;
+       int num;
+       int by;               /* bar geometry */
+       int mx, my, mw, mh;   /* screen size */
+       int wx, wy, ww, wh;   /* window area  */
+       unsigned int seltags;
+       unsigned int sellt;
+       unsigned int tagset[2];
+       Bool showbar;
+       Bool topbar;
+       Client *clients;
+       Client *sel;
+       Client *stack;
+       Monitor *next;
+       Window barwin;
+       const Layout *lt[2];
+};
+

 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;
        Bool isfloating;

+       int monitor;

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

-static void arrange(void);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
+static void arrange(Monitor *m);
+static void arrangemon(Monitor *m);

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

-static void clearurgent(void);
+static void cleanupmon(Monitor *mon);
+static void clearurgent(Client *c);
+static void clientmessage(XEvent *e);

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

+static Monitor *createmon(void);

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

-static void die(const char *errstr, ...);
-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 Monitor *dirtomon(int dir);
+static void drawbar(Monitor *m);
+static void drawbars(void);

 static void enternotify(XEvent *e);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
 static void enternotify(XEvent *e);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);

+static void focusmon(const Arg *arg);

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

-static Client *getclient(Window w);
-static ulong getcolor(const char *colstr);
+static Bool getrootptr(int *x, int *y);

 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 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 isurgent(uint t);
+static void incnmaster(const Arg *arg);

 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 motionnotify(XEvent *e);

 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);

+static void pop(Client *);

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

-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static Monitor *recttomon(int x, int y, int w, int h);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact);
+static void resizeclient(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 run(void);
 static void scan(void);

+static Bool sendevent(Client *c, Atom proto);
+static void sendmon(Client *c, Monitor *m);

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

+static void setfocus(Client *c);
+static void setfullscreen(Client *c, Bool fullscreen);

 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 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 unused);

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

-static int textnw(const char *text, uint len);
-static void tile(void);
+static void tagmon(const Arg *arg);
+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 togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);

-static void unmanage(Client *c);
+static void unfocus(Client *c, Bool setfocus);
+static void unmanage(Client *c, Bool destroyed);

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

-static void updatebar(void);
-static void updategeom(void);
+static Bool updategeom(void);
+static void updatebarpos(Monitor *m);
+static void updatebars(void);
+static void updateclientlist(void);
+static void updatenumlockmask(void);

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

+static void updatestatus(void);
+static void updatewindowtype(Client *c);

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

+static Client *wintoclient(Window w);
+static Monitor *wintomon(Window w);

 static int xerror(Display *dpy, XErrorEvent *ee);
 static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 
 /* variables */
 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);
 
 /* variables */

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

 static char stext[256];
 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 sw, sh;           /* X display screen geometry 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,
 static void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,

+       [ClientMessage] = clientmessage,

        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,


@@ -223,173 +253,286 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,

+       [MotionNotify] = motionnotify,

        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];

-static Bool otherwm, readin;

 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 Cur *cursor[CurLast];
+static ClrScheme scheme[SchemeLast];

 static Display *dpy;
 static Display *dpy;

-static DC dc = {0};
-static Layout *lt[] = { NULL, NULL };
-static Window root, barwin;
+static Drw *drw;
+static Fnt *fnt;
+static Monitor *mons, *selmon;
+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[LENGTH(tags) > 31 ? -1 : 1]; };

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

-       uint i;
-       Rule *r;
-       XClassHint ch = { 0 };
+       const char *class, *instance;
+       unsigned int i;
+       const Rule *r;
+       Monitor *m;
+       XClassHint ch = { NULL, NULL };

 
        /* rule matching */
 
        /* rule matching */

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

        XGetClassHint(dpy, c->win, &ch);
        XGetClassHint(dpy, c->win, &ch);

+       class    = ch.res_class ? ch.res_class : broken;
+       instance = ch.res_name  ? ch.res_name  : broken;
+

        for(i = 0; i < LENGTH(rules); i++) {
                r = &rules[i];
                if((!r->title || strstr(c->name, r->title))
        for(i = 0; i < LENGTH(rules); i++) {
                r = &rules[i];
                if((!r->title || strstr(c->name, r->title))

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

                        c->isfloating = r->isfloating;
                        c->isfloating = r->isfloating;

-                       c->tags |= r->tags & TAGMASK;
+                       c->tags |= r->tags;
+                       for(m = mons; m && m->num != r->monitor; m = m->next);
+                       if(m)
+                               c->mon = m;

                }
        }
        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;
-
-       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);
+Bool
+applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
+       Bool baseismin;
+       Monitor *m = c->mon;
+
+       /* set minimum possible */
+       *w = MAX(1, *w);
+       *h = MAX(1, *h);
+       if(interact) {
+               if(*x > sw)
+                       *x = sw - WIDTH(c);
+               if(*y > sh)
+                       *y = sh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw < 0)
+                       *x = 0;
+               if(*y + *h + 2 * c->bw < 0)
+                       *y = 0;
+       }
+       else {
+               if(*x >= m->wx + m->ww)
+                       *x = m->wx + m->ww - WIDTH(c);
+               if(*y >= m->wy + m->wh)
+                       *y = m->wy + m->wh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw <= m->wx)
+                       *x = m->wx;
+               if(*y + *h + 2 * c->bw <= m->wy)
+                       *y = m->wy;
+       }
+       if(*h < bh)
+               *h = bh;
+       if(*w < bh)
+               *w = bh;
+       if(resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
+               /* 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;

                }
                }

-               else {
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+               /* adjust for aspect limits */
+               if(c->mina > 0 && c->maxa > 0) {
+                       if(c->maxa < (float)*w / *h)
+                               *w = *h * c->maxa + 0.5;
+                       else if(c->mina < (float)*h / *w)
+                               *h = *w * c->mina + 0.5;
+               }
+               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 = MAX(*w + c->basew, c->minw);
+               *h = MAX(*h + c->baseh, 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;
+}

 
 

-       focus(NULL);
-       if(lt[sellt]->arrange)
-               lt[sellt]->arrange();
-       restack();
+void
+arrange(Monitor *m) {
+       if(m)
+               showhide(m->stack);
+       else for(m = mons; m; m = m->next)
+               showhide(m->stack);
+       if(m) {
+               arrangemon(m);
+               restack(m);
+       } else for(m = mons; m; m = m->next)
+               arrangemon(m);
+}
+
+void
+arrangemon(Monitor *m) {
+       strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
+       if(m->lt[m->sellt]->arrange)
+               m->lt[m->sellt]->arrange(m);

 }
 
 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;
        Arg arg = {0};
        Client *c;

+       Monitor *m;

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

-       if(ev->window == barwin) {
+       /* focus monitor if necessary */
+       if((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel, True);
+               selmon = m;
+               focus(NULL);
+       }
+       if(ev->window == selmon->barwin) {

                i = x = 0;
                i = x = 0;

-               do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+               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->ww - TEXTW(stext))

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

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

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

-

        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button

-                  && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-                       buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
+               && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+                       buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);

 }
 
 void
 checkotherwm(void) {
 }
 
 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);
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);

-       if(otherwm)
-               die("dwm: another window manager is already running\n");
-       XSetErrorHandler(NULL);
-       xerrorxlib = XSetErrorHandler(xerror);
+       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);
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       else
-               XFreeFont(dpy, dc.font.xfont);
+       selmon->lt[selmon->sellt] = &foo;
+       for(m = mons; m; m = m->next)
+               while(m->stack)
+                       unmanage(m->stack, False);

        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);

-       XFreePixmap(dpy, dc.drawable);
-       XFreeGC(dpy, dc.gc);
-       XFreeCursor(dpy, cursor[CurNormal]);
-       XFreeCursor(dpy, cursor[CurResize]);
-       XFreeCursor(dpy, cursor[CurMove]);
-       XDestroyWindow(dpy, barwin);
+       while(mons)
+               cleanupmon(mons);
+       drw_cur_free(drw, cursor[CurNormal]);
+       drw_cur_free(drw, cursor[CurResize]);
+       drw_cur_free(drw, cursor[CurMove]);
+       drw_font_free(dpy, fnt);
+       drw_clr_free(scheme[SchemeNorm].border);
+       drw_clr_free(scheme[SchemeNorm].bg);
+       drw_clr_free(scheme[SchemeNorm].fg);
+       drw_clr_free(scheme[SchemeSel].border);
+       drw_clr_free(scheme[SchemeSel].bg);
+       drw_clr_free(scheme[SchemeSel].fg);
+       drw_free(drw);

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

+       XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+}
+
+void
+cleanupmon(Monitor *mon) {
+       Monitor *m;
+
+       if(mon == mons)
+               mons = mons->next;
+       else {
+               for(m = mons; m && m->next != mon; m = m->next);
+               m->next = mon->next;
+       }
+       XUnmapWindow(dpy, mon->barwin);
+       XDestroyWindow(dpy, mon->barwin);
+       free(mon);

 }
 
 void
 }
 
 void

-clearurgent(void) {
+clearurgent(Client *c) {

        XWMHints *wmh;
        XWMHints *wmh;

-       Client *c;

 
 

-       for(c = clients; c; c = c->next)
-               if(ISVISIBLE(c) && c->isurgent) {
-                       c->isurgent = False;
-                       if (!(wmh = XGetWMHints(dpy, c->win)))
-                               continue;
+       c->isurgent = False;
+       if(!(wmh = XGetWMHints(dpy, c->win)))
+               return;
+       wmh->flags &= ~XUrgencyHint;
+       XSetWMHints(dpy, c->win, wmh);
+       XFree(wmh);
+}

 
 

-                       wmh->flags &= ~XUrgencyHint;
-                       XSetWMHints(dpy, c->win, wmh);
-                       XFree(wmh);
+void
+clientmessage(XEvent *e) {
+       XClientMessageEvent *cme = &e->xclient;
+       Client *c = wintoclient(cme->window);
+
+       if(!c)
+               return;
+       if(cme->message_type == netatom[NetWMState]) {
+               if(cme->data.l[1] == netatom[NetWMFullscreen] || cme->data.l[2] == netatom[NetWMFullscreen])
+                       setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
+                                     || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
+       }
+       else if(cme->message_type == netatom[NetActiveWindow]) {
+               if(!ISVISIBLE(c)) {
+                       c->mon->seltags ^= 1;
+                       c->mon->tagset[c->mon->seltags] = c->tags;

                }
                }

+               pop(c);
+       }

 }
 
 void
 }
 
 void


@@ -412,39 +555,58 @@ configure(Client *c) {
 
 void
 configurenotify(XEvent *e) {
 
 void
 configurenotify(XEvent *e) {

+       Monitor *m;

        XConfigureEvent *ev = &e->xconfigure;
        XConfigureEvent *ev = &e->xconfigure;

+       Bool dirty;

 
 

-       if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+       // TODO: updategeom handling sucks, needs to be simplified
+       if(ev->window == root) {
+               dirty = (sw != ev->width || sh != ev->height);

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

-               updategeom();
-               updatebar();
-               arrange();
+               if(updategeom() || dirty) {
+                       drw_resize(drw, sw, bh);
+                       updatebars();
+                       for(m = mons; m; m = m->next)
+                               XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+                       focus(NULL);
+                       arrange(NULL);
+               }

        }
 }
 
 void
 configurerequest(XEvent *e) {
        Client *c;
        }
 }
 
 void
 configurerequest(XEvent *e) {
        Client *c;

+       Monitor *m;

        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 

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

                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;

-               else if(c->isfloating || !lt[sellt]->arrange) {
-                       if(ev->value_mask & CWX)
-                               c->x = sx + ev->x;
-                       if(ev->value_mask & CWY)
-                               c->y = sy + ev->y;
-                       if(ev->value_mask & CWWidth)
+               else if(c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
+                       m = c->mon;
+                       if(ev->value_mask & CWX) {
+                               c->oldx = c->x;
+                               c->x = m->mx + ev->x;
+                       }
+                       if(ev->value_mask & CWY) {
+                               c->oldy = c->y;
+                               c->y = m->my + ev->y;
+                       }
+                       if(ev->value_mask & CWWidth) {
+                               c->oldw = c->w;

                                c->w = ev->width;
                                c->w = ev->width;

-                       if(ev->value_mask & CWHeight)
+                       }
+                       if(ev->value_mask & CWHeight) {
+                               c->oldh = c->h;

                                c->h = ev->height;
                                c->h = ev->height;

-                       if((c->x - sx + c->w) > sw && c->isfloating)
-                               c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
-                       if((c->y - sy + c->h) > sh && c->isfloating)
-                               c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+                       }
+                       if((c->x + c->w) > m->mx + m->mw && c->isfloating)
+                               c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
+                       if((c->y + c->h) > m->my + m->mh && c->isfloating)
+                               c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */

                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                        if(ISVISIBLE(c))
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                        if(ISVISIBLE(c))


@@ -466,198 +628,216 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

+Monitor *
+createmon(void) {
+       Monitor *m;
+
+       if(!(m = (Monitor *)calloc(1, sizeof(Monitor))))
+               die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
+       m->tagset[0] = m->tagset[1] = 1;
+       m->mfact = mfact;
+       m->nmaster = nmaster;
+       m->showbar = showbar;
+       m->topbar = topbar;
+       m->lt[0] = &layouts[0];
+       m->lt[1] = &layouts[1 % LENGTH(layouts)];
+       strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+       return m;
+}
+

 void
 destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
 void
 destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 

-       if((c = getclient(ev->window)))
-               unmanage(c);
+       if((c = wintoclient(ev->window)))
+               unmanage(c, True);

 }
 
 void
 detach(Client *c) {
        Client **tc;
 
 }
 
 void
 detach(Client *c) {
        Client **tc;
 

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

        *tc = c->next;
 }
 
 void
 detachstack(Client *c) {
        *tc = c->next;
 }
 
 void
 detachstack(Client *c) {

-       Client **tc;
+       Client **tc, *t;

 
 

-       for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
+       for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);

        *tc = c->snext;
        *tc = c->snext;

+
+       if(c == c->mon->sel) {
+               for(t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
+               c->mon->sel = t;
+       }

 }
 
 }
 

-void
-die(const char *errstr, ...) {
-       va_list ap;
+Monitor *
+dirtomon(int dir) {
+       Monitor *m = NULL;

 
 

-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
+       if(dir > 0) {
+               if(!(m = selmon->next))
+                       m = mons;
+       }
+       else if(selmon == mons)
+               for(m = mons; m->next; m = m->next);
+       else
+               for(m = mons; m->next != selmon; m = m->next);
+       return m;

 }
 
 void
 }
 
 void

-drawbar(void) {
-       int i, x;
+drawbar(Monitor *m) {
+       int x, xx, w;
+       unsigned int i, occ = 0, urg = 0;
+       Client *c;

 
 

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

        for(i = 0; i < LENGTH(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);
-               }
-               dc.x += dc.w;
+               w = TEXTW(tags[i]);
+               drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
+               drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
+               drw_rect(drw, x, 0, w, bh, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+                          occ & 1 << i, urg & 1 << i);
+               x += w;

        }
        }

-       if(blw > 0) {
-               dc.w = blw;
-               drawtext(lt[sellt]->symbol, dc.norm, False);
-               x = dc.x + dc.w;
+       w = blw = TEXTW(m->ltsymbol);
+       drw_setscheme(drw, &scheme[SchemeNorm]);
+       drw_text(drw, x, 0, w, bh, m->ltsymbol, 0);
+       x += w;
+       xx = x;
+       if(m == selmon) { /* status is only drawn on selected monitor */
+               w = TEXTW(stext);
+               x = m->ww - w;
+               if(x < xx) {
+                       x = xx;
+                       w = m->ww - xx;
+               }
+               drw_text(drw, x, 0, w, bh, stext, 0);

        }
        else
        }
        else

-               x = dc.x;
-       dc.w = TEXTW(stext);
-       dc.x = ww - dc.w;
-       if(dc.x < x) {
-               dc.x = x;
-               dc.w = ww - x;
-       }
-       drawtext(stext, dc.norm, False);
-       if((dc.w = dc.x - x) > bh) {
-               dc.x = x;
-               if(sel) {
-                       drawtext(sel->name, dc.sel, False);
-                       drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
+               x = m->ww;
+       if((w = x - xx) > bh) {
+               x = xx;
+               if(m->sel) {
+                       drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, m->sel->name, 0);
+                       drw_rect(drw, x, 0, w, bh, m->sel->isfixed, m->sel->isfloating, 0);
+               }
+               else {
+                       drw_setscheme(drw, &scheme[SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, NULL, 0);

                }
                }

-               else
-                       drawtext(NULL, dc.norm, False);
-       }
-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
-       XSync(dpy, False);
-}
-
-void
-drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
-       int x;
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       gcv.foreground = col[invert ? ColBG : ColFG];
-       XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-       x = (dc.font.ascent + dc.font.descent + 2) / 4;
-       r.x = dc.x + 1;
-       r.y = dc.y + 1;
-       if(filled) {
-               r.width = r.height = x + 1;
-               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       }
-       else if(empty) {
-               r.width = r.height = x;
-               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
        }

+       drw_map(drw, m->barwin, 0, 0, m->ww, bh);

 }
 
 void
 }
 
 void

-drawtext(const char *text, ulong col[ColLast], Bool invert) {
-       int i, x, y, h, len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-       char buf[256];
+drawbars(void) {
+       Monitor *m;

 
 

-       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 */
-       for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
-       if(!len)
-               return;
-       if(len < olen)
-               for(i = len; i && i > len - 3; buf[--i] = '.');
-       XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
-       if(dc.font.set)
-               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-       else
-               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+       for(m = mons; m; m = m->next)
+               drawbar(m);

 }
 
 void
 enternotify(XEvent *e) {
        Client *c;
 }
 
 void
 enternotify(XEvent *e) {
        Client *c;

+       Monitor *m;

        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;

-       if((c = getclient(ev->window)))
-               focus(c);
-       else
-               focus(NULL);
+       c = wintoclient(ev->window);
+       m = c ? c->mon : wintomon(ev->window);
+       if(m != selmon) {
+               unfocus(selmon->sel, True);
+               selmon = m;
+       }
+       else if(!c || c == selmon->sel)
+               return;
+       focus(c);

 }
 
 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 && (m = wintomon(ev->window)))
+               drawbar(m);

 }
 
 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);
+       /* was if(selmon->sel) */
+       if(selmon->sel && selmon->sel != c)
+               unfocus(selmon->sel, False);

        if(c) {
        if(c) {

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

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

-               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
-               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+               XSetWindowBorder(dpy, c->win, scheme[SchemeSel].border->rgb);
+               setfocus(c);

        }
        }

-       else
+       else {

                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

-       sel = c;
-       drawbar();
+               XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+       }
+       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)
+               setfocus(selmon->sel);
+}
+
+void
+focusmon(const Arg *arg) {
+       Monitor *m;
+
+       if(!mons->next)
+               return;
+       if((m = dirtomon(arg->i)) == selmon)
+               return;
+       unfocus(selmon->sel, False); /* s/True/False/ fixes input focus issues
+                                       in gedit and anjuta */
+       selmon = m;
+       focus(NULL);

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


@@ -667,39 +847,44 @@ focusstack(const Arg *arg) {
        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);

-               restack();
+               restack(selmon);

        }
 }
 
        }
 }
 

-Client *
-getclient(Window w) {
-       Client *c;
+Atom
+getatomprop(Client *c, Atom prop) {
+       int di;
+       unsigned long dl;
+       unsigned char *p = NULL;
+       Atom da, atom = None;

 
 

-       for(c = clients; c && c->win != w; c = c->next);
-       return c;
+       if(XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
+                             &da, &di, &dl, &dl, &p) == Success && p) {
+               atom = *(Atom *)p;
+               XFree(p);
+       }
+       return atom;

 }
 
 }
 

-ulong
-getcolor(const char *colstr) {
-       Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color;
+Bool
+getrootptr(int *x, int *y) {
+       int di;
+       unsigned int dui;
+       Window dummy;

 
 

-       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-               die("error, cannot allocate color '%s'\n", colstr);
-       return color.pixel;
+       return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);

 }
 
 long
 getstate(Window w) {
 }
 
 long
 getstate(Window w) {

-       int format, status;
+       int format;

        long result = -1;
        unsigned char *p = NULL;
        long result = -1;
        unsigned char *p = NULL;

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

        Atom real;
 
        Atom real;
 

-       status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-                       &real, &format, &n, &extra, (unsigned char **)&p);
-       if(status != Success)
+       if(XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
+                             &real, &format, &n, &extra, (unsigned char **)&p) != Success)

                return -1;
        if(n != 0)
                result = *p;
                return -1;
        if(n != 0)
                result = *p;


@@ -708,7 +893,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;


@@ -722,8 +907,7 @@ gettextprop(Window w, Atom atom, char *text, uint size) {
        if(name.encoding == XA_STRING)
                strncpy(text, (char *)name.value, size - 1);
        else {
        if(name.encoding == XA_STRING)
                strncpy(text, (char *)name.value, size - 1);
        else {

-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-               && n > 0 && *list) {
+               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {

                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }
                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }


@@ -735,127 +919,63 @@ gettextprop(Window w, Atom atom, char *text, uint size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
 
 void
 grabbuttons(Client *c, Bool focused) {

-       uint i, j;
-       uint 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);
+       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);
-               }
-       XFreeModifiermap(modmap);
+       updatenumlockmask();
+       {
+               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++) {
-               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);
-       }
-}
-
-void
-initfont(const char *fontstr) {
-       char *def, **missing;
-       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--)
-                       fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
-               XFreeStringList(missing);
-       }
-       if(dc.font.set) {
-               XFontSetExtents *font_extents;
-               XFontStruct **xfonts;
-               char **font_names;
-               dc.font.ascent = dc.font.descent = 0;
-               font_extents = XExtentsOfFontSet(dc.font.set);
-               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-                       dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
-                       dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
-                       xfonts++;
-               }
-       }
-       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")))
-                       die("error, cannot load font: '%s'\n", fontstr);
-               dc.font.ascent = dc.font.xfont->ascent;
-               dc.font.descent = dc.font.xfont->descent;
+               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);

        }
        }

-       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;
-       Atom *protocols;
-       Bool ret = False;
-
-       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-               for(i = 0; !ret && i < n; i++)
-                       if(protocols[i] == wmatom[WMDelete])
-                               ret = True;
-               XFree(protocols);
-       }
-       return ret;
+void
+incnmaster(const Arg *arg) {
+       selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+       arrange(selmon);

 }
 
 }
 

-Bool
-isurgent(uint t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->isurgent && c->tags & 1 << t)
-                       return True;
-       return False;
+#ifdef XINERAMA
+static Bool
+isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
+       while(n--)
+               if(unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
+               && unique[n].width == info->width && unique[n].height == info->height)
+                       return False;
+       return True;

 }
 }

+#endif /* XINERAMA */

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

-       uint i;
+       unsigned int i;

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


@@ -863,87 +983,86 @@ keypress(XEvent *e) {
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym

-                  && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-                  && keys[i].func)
+               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+               && keys[i].func)

                        keys[i].func(&(keys[i].arg));
 }
 
 void
 killclient(const Arg *arg) {
                        keys[i].func(&(keys[i].arg));
 }
 
 void
 killclient(const Arg *arg) {

-       XEvent ev;
-
-       if(!sel)
+       if(!selmon->sel)

                return;
                return;

-       if(isprotodel(sel)) {
-               ev.type = ClientMessage;
-               ev.xclient.window = 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;
-               XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+       if(!sendevent(selmon->sel, wmatom[WMDelete])) {
+               XGrabServer(dpy);
+               XSetErrorHandler(xerrordummy);
+               XSetCloseDownMode(dpy, DestroyAll);
+               XKillClient(dpy, selmon->sel->win);
+               XSync(dpy, False);
+               XSetErrorHandler(xerror);
+               XUngrabServer(dpy);

        }
        }

-       else
-               XKillClient(dpy, sel->win);

 }
 
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
 }
 
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

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

        XWindowChanges wc;
 
        if(!(c = calloc(1, sizeof(Client))))
        XWindowChanges wc;
 
        if(!(c = calloc(1, sizeof(Client))))

-               die("fatal: could not calloc() %u bytes\n", sizeof(Client));
+               die("fatal: could not malloc() %u bytes\n", sizeof(Client));

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

-
-       /* geometry */
-       c->x = wa->x;
-       c->y = wa->y;
-       c->w = wa->width;
-       c->h = wa->height;
-       c->oldbw = wa->border_width;
-       if(c->w == sw && c->h == sh) {
-               c->x = sx;
-               c->y = sy;
-               c->bw = wa->border_width;
+       updatetitle(c);
+       if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
+               c->mon = t->mon;
+               c->tags = t->tags;

        }
        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;
-               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->bw = borderpx;
+               c->mon = selmon;
+               applyrules(c);

        }
        }

+       /* geometry */
+       c->x = c->oldx = wa->x;
+       c->y = c->oldy = wa->y;
+       c->w = c->oldw = wa->width;
+       c->h = c->oldh = wa->height;
+       c->oldbw = wa->border_width;
+
+       if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+               c->x = c->mon->mx + c->mon->mw - WIDTH(c);
+       if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+               c->y = c->mon->my + c->mon->mh - HEIGHT(c);
+       c->x = MAX(c->x, c->mon->mx);
+       /* only fix client y-offset, if the client center might cover the bar */
+       c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
+                  && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
+       c->bw = borderpx;

 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);

-       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+       XSetWindowBorder(dpy, w, scheme[SchemeNorm].border->rgb);

        configure(c); /* propagates border_width, if size doesn't change */
        configure(c); /* propagates border_width, if size doesn't change */

+       updatewindowtype(c);

        updatesizehints(c);
        updatesizehints(c);

+       updatewmhints(c);

        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        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(t)
-               c->tags = t->tags;
-       else
-               applyrules(c);

        if(!c->isfloating)
        if(!c->isfloating)

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

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

+       XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
+                       (unsigned char *) &(c->win), 1);

        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */

-       XMapWindow(dpy, c->win);

        setclientstate(c, NormalState);
        setclientstate(c, NormalState);

-       arrange();
+       if (c->mon == selmon)
+               unfocus(selmon->sel, False);
+       c->mon->sel = c;
+       arrange(c->mon);
+       XMapWindow(dpy, c->win);
+       focus(NULL);

 }
 
 void
 }
 
 void


@@ -964,67 +1083,94 @@ maprequest(XEvent *e) {
                return;
        if(wa.override_redirect)
                return;
                return;
        if(wa.override_redirect)
                return;

-       if(!getclient(ev->window))
+       if(!wintoclient(ev->window))

                manage(ev->window, &wa);
 }
 
 void
                manage(ev->window, &wa);
 }
 
 void

-monocle(void) {
+monocle(Monitor *m) {
+       unsigned int n = 0;

        Client *c;
 
        Client *c;
 

-       for(c = nexttiled(clients); c; c = nexttiled(c->next))
-               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+       for(c = m->clients; c; c = c->next)
+               if(ISVISIBLE(c))
+                       n++;
+       if(n > 0) /* override layout symbol */
+               snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
+       for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
+               resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
+}
+
+void
+motionnotify(XEvent *e) {
+       static Monitor *mon = NULL;
+       Monitor *m;
+       XMotionEvent *ev = &e->xmotion;
+
+       if(ev->window != root)
+               return;
+       if((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
+               unfocus(selmon->sel, True);
+               selmon = m;
+               focus(NULL);
+       }
+       mon = m;

 }
 
 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, nx, ny;

        Client *c;
        Client *c;

-       Window dummy;
+       Monitor *m;

        XEvent ev;
 
        XEvent ev;
 

-       if(!(c = sel))
+       if(!(c = selmon->sel))
+               return;
+       if(c->isfullscreen) /* no support moving fullscreen windows by mouse */

                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,
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

-       None, cursor[CurMove], CurrentTime) != GrabSuccess)
+       None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
+               return;
+       if(!getrootptr(&x, &y))

                return;
                return;

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

                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);

-               switch (ev.type) {
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
+               switch(ev.type) {

                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(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 && selmon->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(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, True);

                        break;
                }
                        break;
                }

+       } while(ev.type != ButtonRelease);
+       XUngrabPointer(dpy, CurrentTime);
+       if((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
+               sendmon(c, m);
+               selmon = m;
+               focus(NULL);

        }
 }
 
        }
 }
 


@@ -1034,108 +1180,86 @@ nexttiled(Client *c) {
        return c;
 }
 
        return c;
 }
 

+void
+pop(Client *c) {
+       detach(c);
+       attach(c);
+       focus(c);
+       arrange(c->mon);
+}
+

 void
 propertynotify(XEvent *e) {
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
 void
 propertynotify(XEvent *e) {
        Client *c;
        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))) {
-               switch (ev->atom) {
+       else if((c = wintoclient(ev->window))) {
+               switch(ev->atom) {

                default: break;
                case XA_WM_TRANSIENT_FOR:
                default: break;
                case XA_WM_TRANSIENT_FOR:

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

                        break;
                case XA_WM_NORMAL_HINTS:
                        updatesizehints(c);
                        break;
                case XA_WM_HINTS:
                        updatewmhints(c);
                        break;
                case XA_WM_NORMAL_HINTS:
                        updatesizehints(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 == c->mon->sel)
+                               drawbar(c->mon);

                }
                }

+               if(ev->atom == netatom[NetWMWindowType])
+                       updatewindowtype(c);

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

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

 }
 
 }
 

-void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-       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;
+Monitor *
+recttomon(int x, int y, int w, int h) {
+       Monitor *m, *r = selmon;
+       int a, area = 0;

 
 

-               /* 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;
+       for(m = mons; m; m = m->next)
+               if((a = INTERSECT(x, y, w, h, m)) > area) {
+                       area = a;
+                       r = m;

                }
                }

+       return r;
+}

 
 

-               /* 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);
+void
+resize(Client *c, int x, int y, int w, int h, Bool interact) {
+       if(applysizehints(c, &x, &y, &w, &h, interact))
+               resizeclient(c, x, y, w, h);
+}

 
 

-               if(c->maxw)
-                       w = MIN(w, c->maxw);
+void
+resizeclient(Client *c, int x, int y, int w, int h) {
+       XWindowChanges wc;

 
 

-               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) {
-               c->x = wc.x = x;
-               c->y = wc.y = y;
-               c->w = wc.width = w;
-               c->h = wc.height = h;
-               wc.border_width = c->bw;
-               XConfigureWindow(dpy, c->win,
-                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
-               configure(c);
-               XSync(dpy, False);
-       }
+       c->oldx = c->x; c->x = wc.x = x;
+       c->oldy = c->y; c->y = wc.y = y;
+       c->oldw = c->w; c->w = wc.width = w;
+       c->oldh = c->h; c->h = wc.height = h;
+       wc.border_width = c->bw;
+       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       configure(c);
+       XSync(dpy, False);

 }
 
 void
 }
 
 void


@@ -1143,64 +1267,68 @@ resizemouse(const Arg *arg) {
        int ocx, ocy;
        int nw, nh;
        Client *c;
        int ocx, ocy;
        int nw, nh;
        Client *c;

+       Monitor *m;

        XEvent ev;
 
        XEvent ev;
 

-       if(!(c = sel))
+       if(!(c = selmon->sel))
+               return;
+       if(c->isfullscreen) /* no support resizing fullscreen windows by mouse */

                return;
                return;

-       restack();
+       restack(selmon);

        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

-       None, cursor[CurResize], CurrentTime) != GrabSuccess)
+                       None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)

                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
                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
-                                  && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                       if(c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
+                       && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
+                       {
+                               if(!c->isfloating && selmon->lt[selmon->sellt]->arrange
+                               && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))

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

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

                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
                                resize(c, c->x, c->y, nw, nh, True);
                        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));
+       if((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
+               sendmon(c, m);
+               selmon = m;
+               focus(NULL);

        }
 }
 
 void
        }
 }
 
 void

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

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

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

                return;
                return;

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

                wc.stack_mode = Below;
                wc.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;


@@ -1212,71 +1340,20 @@ 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;
-                       die("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)


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

 }
 
 void
 setclientstate(Client *c, long state) {
 }
 
 void
 setclientstate(Client *c, long state) {

-       long data[] = {state, None};
+       long data[] = { state, None };

 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
 

+Bool
+sendevent(Client *c, Atom proto) {
+       int n;
+       Atom *protocols;
+       Bool exists = False;
+       XEvent ev;
+
+       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+               while(!exists && n--)
+                       exists = protocols[n] == proto;
+               XFree(protocols);
+       }
+       if(exists) {
+               ev.type = ClientMessage;
+               ev.xclient.window = c->win;
+               ev.xclient.message_type = wmatom[WMProtocols];
+               ev.xclient.format = 32;
+               ev.xclient.data.l[0] = proto;
+               ev.xclient.data.l[1] = CurrentTime;
+               XSendEvent(dpy, c->win, False, NoEventMask, &ev);
+       }
+       return exists;
+}
+
+void
+setfocus(Client *c) {
+       if(!c->neverfocus) {
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+               XChangeProperty(dpy, root, netatom[NetActiveWindow],
+                               XA_WINDOW, 32, PropModeReplace,
+                               (unsigned char *) &(c->win), 1);
+       }
+       sendevent(c, wmatom[WMTakeFocus]);
+}
+
+void
+setfullscreen(Client *c, Bool fullscreen) {
+       if(fullscreen) {
+               XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                               PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+               c->isfullscreen = True;
+               c->oldstate = c->isfloating;
+               c->oldbw = c->bw;
+               c->bw = 0;
+               c->isfloating = True;
+               resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+               XRaiseWindow(dpy, c->win);
+       }
+       else {
+               XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                               PropModeReplace, (unsigned char*)0, 0);
+               c->isfullscreen = False;
+               c->isfloating = c->oldstate;
+               c->bw = c->oldbw;
+               c->x = c->oldx;
+               c->y = c->oldy;
+               c->w = c->oldw;
+               c->h = c->oldh;
+               resizeclient(c, c->x, c->y, c->w, c->h);
+               arrange(c->mon);
+       }
+}
+

 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 != selmon->lt[selmon->sellt])
+               selmon->sellt ^= 1;

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

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

        else
        else

-               drawbar();
+               drawbar(selmon);

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


@@ -1322,223 +1478,234 @@ void
 setmfact(const Arg *arg) {
        float f;
 
 setmfact(const Arg *arg) {
        float f;
 

-       if(!arg || !lt[sellt]->arrange)
+       if(!arg || !selmon->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;
-       arrange();
+       selmon->mfact = f;
+       arrange(selmon);

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

-       uint i;
-       int w;

        XSetWindowAttributes wa;
 
        XSetWindowAttributes wa;
 

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

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

-       initfont(font);
-       sx = 0;
-       sy = 0;
+       fnt = drw_font_create(dpy, font);

        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

-       bh = dc.h = dc.font.height + 2;
-       lt[0] = &layouts[0];
-       lt[1] = &layouts[1 % LENGTH(layouts)];
+       bh = fnt->h + 2;
+       drw = drw_create(dpy, screen, root, sw, sh);
+       drw_setfont(drw, fnt);

        updategeom();
        updategeom();

-

        /* 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);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);

+       wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+       netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);

        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);

-
+       netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
+       netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
+       netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
+       netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
+       netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);

        /* init cursors */
        /* init cursors */

-       wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
-       cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
-       cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-
+       cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
+       cursor[CurResize] = drw_cur_create(drw, XC_sizing);
+       cursor[CurMove] = drw_cur_create(drw, XC_fleur);

        /* init appearance */
        /* init appearance */

-       dc.norm[ColBorder] = getcolor(normbordercolor);
-       dc.norm[ColBG] = getcolor(normbgcolor);
-       dc.norm[ColFG] = getcolor(normfgcolor);
-       dc.sel[ColBorder] = getcolor(selbordercolor);
-       dc.sel[ColBG] = getcolor(selbgcolor);
-       dc.sel[ColFG] = getcolor(selfgcolor);
-       dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
-       dc.gc = XCreateGC(dpy, root, 0, 0);
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       if(!dc.font.set)
-               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-
-       /* init bar */
-       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();
-
+       scheme[SchemeNorm].border = drw_clr_create(drw, normbordercolor);
+       scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
+       scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
+       scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
+       scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
+       scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
+       /* init bars */
+       updatebars();
+       updatestatus();

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

-
+       XDeleteProperty(dpy, root, netatom[NetClientList]);

        /* select for events */
        /* select for events */

-       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
-                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+       wa.cursor = cursor[CurNormal]->cursor;
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask|PointerMotionMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;

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

+       grabkeys();
+       focus(NULL);
+}

 
 

+void
+showhide(Client *c) {
+       if(!c)
+               return;
+       if(ISVISIBLE(c)) { /* show clients top down */
+               XMoveWindow(dpy, c->win, c->x, c->y);
+               if((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
+                       resize(c, c->x, c->y, c->w, c->h, False);
+               showhide(c->snext);
+       }
+       else { /* hide clients bottom up */
+               showhide(c->snext);
+               XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
+       }
+}

 
 

-       /* grab keys */
-       grabkeys();
+void
+sigchld(int unused) {
+       if(signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("Can't install SIGCHLD handler");
+       while(0 < waitpid(-1, NULL, WNOHANG));

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

-       /* The double-fork construct avoids zombie processes and keeps the code
-        * clean from stupid signal handlers. */
+       if(arg->v == dmenucmd)
+               dmenumon[0] = '0' + selmon->num;

        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");
-               }
-               exit(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");
+               exit(EXIT_SUCCESS);

        }
        }

-       wait(0);

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

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

        }
 }
 
        }
 }
 

-int
-textnw(const char *text, uint len) {
-       XRectangle r;
-
-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(dc.font.xfont, text, len);
+void
+tagmon(const Arg *arg) {
+       if(!selmon->sel || !mons->next)
+               return;
+       sendmon(selmon->sel, dirtomon(arg->i));

 }
 
 void
 }
 
 void

-tile(void) {
-       int x, y, h, w, mw;
-       uint i, n;
+tile(Monitor *m) {
+       unsigned int i, n, h, mw, my, ty;

        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;
 
        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);
-
-       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;
-       if(h < bh)
-               h = 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)
-                      ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
-               if(h != wh)
-                       y = c->y + c->h + 2 * c->bw;
-       }
+       if(n > m->nmaster)
+               mw = m->nmaster ? m->ww * m->mfact : 0;
+       else
+               mw = m->ww;
+       for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+               if(i < m->nmaster) {
+                       h = (m->wh - my) / (MIN(n, m->nmaster) - i);
+                       resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False);
+                       my += HEIGHT(c);
+               }
+               else {
+                       h = (m->wh - ty) / (n - i);
+                       resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False);
+                       ty += HEIGHT(c);
+               }

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

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

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

-       if(!sel)
+       if(!selmon->sel)
+               return;
+       if(selmon->sel->isfullscreen) /* no support for fullscreen windows */

                return;
                return;

-       sel->isfloating = !sel->isfloating || sel->isfixed;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-       arrange();
+       selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+       if(selmon->sel->isfloating)
+               resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+                      selmon->sel->w, selmon->sel->h, False);
+       arrange(selmon);

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

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

 
 

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

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

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

 
 

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

        }
 }
 
 void
        }
 }
 
 void

-unmanage(Client *c) {
+unfocus(Client *c, Bool setfocus) {
+       if(!c)
+               return;
+       grabbuttons(c, False);
+       XSetWindowBorder(dpy, c->win, scheme[SchemeNorm].border->rgb);
+       if(setfocus) {
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+       }
+}
+
+void
+unmanage(Client *c, Bool destroyed) {
+       Monitor *m = c->mon;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       wc.border_width = c->oldbw;

        /* The server grab construct avoids race conditions. */
        /* The server grab construct avoids race conditions. */

-       XGrabServer(dpy);
-       XSetErrorHandler(xerrordummy);
-       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */

        detach(c);
        detachstack(c);
        detach(c);
        detachstack(c);

-       if(sel == c)
-               focus(NULL);
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       setclientstate(c, WithdrawnState);
+       if(!destroyed) {
+               wc.border_width = c->oldbw;
+               XGrabServer(dpy);
+               XSetErrorHandler(xerrordummy);
+               XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+               XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+               setclientstate(c, WithdrawnState);
+               XSync(dpy, False);
+               XSetErrorHandler(xerror);
+               XUngrabServer(dpy);
+       }

        free(c);
        free(c);

-       XSync(dpy, False);
-       XSetErrorHandler(xerror);
-       XUngrabServer(dpy);
-       arrange();
+       focus(NULL);
+       updateclientlist();
+       arrange(m);

 }
 
 void
 }
 
 void


@@ -1546,44 +1713,154 @@ unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 

-       if((c = getclient(ev->window)))
-               unmanage(c);
+       if((c = wintoclient(ev->window))) {
+               if(ev->send_event)
+                       setclientstate(c, WithdrawnState);
+               else
+                       unmanage(c, False);
+       }

 }
 
 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 = {
+               .override_redirect = True,
+               .background_pixmap = ParentRelative,
+               .event_mask = ButtonPressMask|ExposureMask
+       };
+       for(m = mons; m; m = m->next) {
+               if (m->barwin)
+                       continue;
+               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]->cursor);
+               XMapRaised(dpy, m->barwin);
+       }

 }
 
 void
 }
 
 void

+updatebarpos(Monitor *m) {
+       m->wy = m->my;
+       m->wh = m->mh;
+       if(m->showbar) {
+               m->wh -= bh;
+               m->by = m->topbar ? m->wy : m->wy + m->wh;
+               m->wy = m->topbar ? m->wy + bh : m->wy;
+       }
+       else
+               m->by = -bh;
+}
+
+void
+updateclientlist() {
+       Client *c;
+       Monitor *m;
+
+       XDeleteProperty(dpy, root, netatom[NetClientList]);
+       for(m = mons; m; m = m->next)
+               for(c = m->clients; c; c = c->next)
+                       XChangeProperty(dpy, root, netatom[NetClientList],
+                                       XA_WINDOW, 32, PropModeAppend,
+                                       (unsigned char *) &(c->win), 1);
+}
+
+Bool

 updategeom(void) {
 updategeom(void) {

-#ifdef XINERAMA
-       int i;
-       XineramaScreenInfo *info = NULL;
+       Bool dirty = False;

 
 

-       /* window area geometry */
+#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;
+               int i, j, n, nn;
+               Client *c;
+               Monitor *m;
+               XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
+               XineramaScreenInfo *unique = NULL;
+
+               for(n = 0, m = mons; m; m = m->next, n++);
+               /* only consider unique geometries as separate screens */
+               if(!(unique = (XineramaScreenInfo *)malloc(sizeof(XineramaScreenInfo) * nn)))
+                       die("fatal: could not malloc() %u bytes\n", sizeof(XineramaScreenInfo) * nn);
+               for(i = 0, j = 0; i < nn; i++)
+                       if(isuniquegeom(unique, j, &info[i]))
+                               memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));

                XFree(info);
                XFree(info);

+               nn = j;
+               if(n <= nn) {
+                       for(i = 0; i < (nn - n); i++) { /* new monitors available */
+                               for(m = mons; m && m->next; m = m->next);
+                               if(m)
+                                       m->next = createmon();
+                               else
+                                       mons = createmon();
+                       }
+                       for(i = 0, m = mons; i < nn && m; m = m->next, i++)
+                               if(i >= n
+                               || (unique[i].x_org != m->mx || unique[i].y_org != m->my
+                                   || unique[i].width != m->mw || unique[i].height != m->mh))
+                               {
+                                       dirty = True;
+                                       m->num = i;
+                                       m->mx = m->wx = unique[i].x_org;
+                                       m->my = m->wy = unique[i].y_org;
+                                       m->mw = m->ww = unique[i].width;
+                                       m->mh = m->wh = unique[i].height;
+                                       updatebarpos(m);
+                               }
+               }
+               else { /* less monitors available nn < n */
+                       for(i = nn; i < n; i++) {
+                               for(m = mons; m && m->next; m = m->next);
+                               while(m->clients) {
+                                       dirty = True;
+                                       c = m->clients;
+                                       m->clients = c->next;
+                                       detachstack(c);
+                                       c->mon = mons;
+                                       attach(c);
+                                       attachstack(c);
+                               }
+                               if(m == selmon)
+                                       selmon = mons;
+                               cleanupmon(m);
+                       }
+               }
+               free(unique);

        }
        else
        }
        else

-#endif
+#endif /* XINERAMA */
+       /* default monitor setup */

        {
        {

-               wx = sx;
-               wy = showbar && topbar ? sy + bh : sy;
-               ww = sw;
-               wh = showbar ? sh - bh : sh;
+               if(!mons)
+                       mons = createmon();
+               if(mons->mw != sw || mons->mh != sh) {
+                       dirty = True;
+                       mons->mw = mons->ww = sw;
+                       mons->mh = mons->wh = sh;
+                       updatebarpos(mons);
+               }
+       }
+       if(dirty) {
+               selmon = mons;
+               selmon = wintomon(root);

        }
        }

+       return dirty;
+}
+
+void
+updatenumlockmask(void) {
+       unsigned int i, j;
+       XModifierKeymap *modmap;

 
 

-       /* bar position */
-       by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
+       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


@@ -1591,7 +1868,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;


@@ -1625,19 +1904,39 @@ updatesizehints(Client *c) {
        else
                c->minw = c->minh = 0;
        if(size.flags & PAspect) {
        else
                c->minw = c->minh = 0;
        if(size.flags & PAspect) {

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

        }
        else
                c->maxa = c->mina = 0.0;
        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);
+       if(c->name[0] == '\0') /* hack to mark broken clients */
+               strcpy(c->name, broken);
+}
+
+void
+updatestatus(void) {
+       if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+               strcpy(stext, "dwm-"VERSION);
+       drawbar(selmon);
+}
+
+void
+updatewindowtype(Client *c) {
+       Atom state = getatomprop(c, netatom[NetWMState]);
+       Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
+
+       if(state == netatom[NetWMFullscreen])
+               setfullscreen(c, True);
+       if(wtype == netatom[NetWMWindowTypeDialog])
+               c->isfloating = True;

 }
 
 void
 }
 
 void


@@ -1645,26 +1944,57 @@ updatewmhints(Client *c) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {

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

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

-
+               if(wmh->flags & InputHint)
+                       c->neverfocus = !wmh->input;
+               else
+                       c->neverfocus = False;

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

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

                return;
                return;

-       seltags ^= 1; /* toggle sel tagset */
-       if(arg && (arg->ui & TAGMASK))
-               tagset[seltags] = arg->i & TAGMASK;
-       clearurgent();
-       arrange();
+       selmon->seltags ^= 1; /* toggle sel tagset */
+       if(arg->ui & TAGMASK)
+               selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+       focus(NULL);
+       arrange(selmon);
+}
+
+Client *
+wintoclient(Window w) {
+       Client *c;
+       Monitor *m;
+
+       for(m = mons; m; m = m->next)
+               for(c = m->clients; c; c = c->next)
+                       if(c->win == w)
+                               return c;
+       return NULL;
+}
+
+Monitor *
+wintomon(Window w) {
+       int x, y;
+       Client *c;
+       Monitor *m;
+
+       if(w == root && getrootptr(&x, &y))
+               return recttomon(x, y, 1, 1);
+       for(m = mons; m; m = m->next)
+               if(w == m->barwin)
+                       return m;
+       if((c = wintoclient(w)))
+               return c->mon;
+       return selmon;

 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are


@@ -1696,44 +2026,38 @@ xerrordummy(Display *dpy, XErrorEvent *ee) {
  * is already running. */
 int
 xerrorstart(Display *dpy, XErrorEvent *ee) {
  * is already running. */
 int
 xerrorstart(Display *dpy, XErrorEvent *ee) {

-       otherwm = True;
+       die("dwm: another window manager is already running\n");

        return -1;
 }
 
 void
 zoom(const Arg *arg) {
        return -1;
 }
 
 void
 zoom(const Arg *arg) {

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

 
 

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

                return;
                return;

-       if(c == nexttiled(clients))
+       if(c == nexttiled(selmon->clients))

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

-       detach(c);
-       attach(c);
-       focus(c);
-       arrange();
+       pop(c);

 }
 
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 }
 
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

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

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

-

        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())

-               fprintf(stderr, "warning: no locale support\n");
-
-       if(!(dpy = XOpenDisplay(0)))
+               fputs("warning: no locale support\n", stderr);
+       if(!(dpy = XOpenDisplay(NULL)))

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

-

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

-

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

-       return 0;
+       return EXIT_SUCCESS;

 }
 }