minor update, tab to space

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 8f5ed6d..5a18093 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -3,23 +3,18 @@
  * dynamic window manager is designed like any other X client as well. It is
  * driven through handling X events. In contrast to other X clients, a window
  * manager selects for SubstructureRedirectMask on the root window, to receive
  * dynamic window manager is designed like any other X client as well. It is
  * driven through handling X events. In contrast to other X clients, a window
  * manager selects for SubstructureRedirectMask on the root window, to receive

- * events about window (dis-)appearance.  Only one X connection at a time is
+ * events about window (dis-)appearance. Only one X connection at a time is

  * allowed to select for this event mask.
  *
  * 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 an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.  For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * 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.
  *
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *


@@ -27,219 +22,614 @@
  */
 #include <errno.h>
 #include <locale.h>
  */
 #include <errno.h>
 #include <locale.h>

+#include <signal.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.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 <sys/types.h>
 #include <sys/wait.h>

-#include <regex.h>

 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>

-
-#include "dwm.h"
+#include <X11/Xresource.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif /* XINERAMA */
+#include <X11/Xft/Xft.h>
+#include <X11/Xlib-xcb.h>
+#include <xcb/res.h>
+#ifdef __OpenBSD__
+#include <sys/sysctl.h>
+#include <kvm.h>
+#endif /* __OpenBSD */
+
+#include "drw.h"
+#include "util.h"

 
 /* macros */
 
 /* macros */

-#define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
-#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
-
+#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_fontset_getwidth(drw, (X)) + lrpad)
+
+#define OPAQUE                  0xffU
+
+/* enums */
+enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+enum { SchemeNorm, SchemeSel }; /* color schemes */
+enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
+       NetWMFullscreen, NetActiveWindow, NetWMWindowType,
+       NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
+enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+       ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+
+typedef union {
+       int i;
+       unsigned int ui;
+       float f;
+       const void *v;
+} Arg;
+
+typedef struct {
+       unsigned int click;
+       unsigned int mask;
+       unsigned int 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;
+       int oldx, oldy, oldw, oldh;
+       int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+       int bw, oldbw;
+       unsigned int tags;
+       int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
+       pid_t pid;
+       Client *next;
+       Client *snext;
+       Client *swallowing;
+       Monitor *mon;
+       Window win;
+};
+
+typedef struct {
+       unsigned int mod;
+       KeySym keysym;
+       void (*func)(const Arg *);
+       const Arg arg;
+} Key;
+
+typedef struct {
+       const char *symbol;
+       void (*arrange)(Monitor *);
+} 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  */
+       int gappx;            /* gaps between windows */
+       unsigned int seltags;
+       unsigned int sellt;
+       unsigned int tagset[2];
+       int showbar;
+       int 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;
+       unsigned int tags;
+       int isfloating;
+       int isterminal;
+       int noswallow;
+       int monitor;
+} Rule;
+
+/* Xresources preferences */
+enum resource_type {
+       STRING = 0,
+       INTEGER = 1,
+       FLOAT = 2
+};
+
+typedef struct {
+       char *name;
+       enum resource_type type;
+       void *dst;
+} ResourcePref;
+
+/* function declarations */
+static void applyrules(Client *c);
+static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int 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 cleanupmon(Monitor *mon);
+static void clientmessage(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 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 focusmon(const Arg *arg);
+static void focusstack(const Arg *arg);
+static Atom getatomprop(Client *c, Atom prop);
+static int getrootptr(int *x, int *y);
+static long getstate(Window w);
+static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
+static void grabbuttons(Client *c, int focused);
+static void grabkeys(void);
+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 monocle(Monitor *m);
+static void motionnotify(XEvent *e);
+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 Monitor *recttomon(int x, int y, int w, int h);
+static void resize(Client *c, int x, int y, int w, int h, int interact);
+static void resizeclient(Client *c, int x, int y, int w, int h);
+static void resizemouse(const Arg *arg);
+static void restack(Monitor *m);
+static void run(void);
+static void scan(void);
+static int sendevent(Client *c, Atom proto);
+static void sendmon(Client *c, Monitor *m);
+static void setclientstate(Client *c, long state);
+static void setfocus(Client *c);
+static void setfullscreen(Client *c, int fullscreen);
+static void setgaps(const Arg *arg);
+static void setlayout(const Arg *arg);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void seturgent(Client *c, int urg);
+static void showhide(Client *c);
+static void sigchld(int unused);
+static void sighup(int unused);
+static void sigterm(int unused);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static void tagmon(const Arg *arg);
+static void tile(Monitor *);
+static void togglebar(const Arg *arg);
+static void togglefloating(const Arg *arg);
+static void togglefullscr(const Arg *arg);
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+static void unfocus(Client *c, int setfocus);
+static void unmanage(Client *c, int destroyed);
+static void unmapnotify(XEvent *e);
+static void updatebarpos(Monitor *m);
+static void updatebars(void);
+static void updateclientlist(void);
+static int updategeom(void);
+static void updatenumlockmask(void);
+static void updatesizehints(Client *c);
+static void updatestatus(void);
+static void updatetitle(Client *c);
+static void updatewindowtype(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 xinitvisual();
+static void zoom(const Arg *arg);
+static void load_xresources(void);
+static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst);
+
+static pid_t getparentprocess(pid_t p);
+static int isdescprocess(pid_t p, pid_t c);
+static Client *swallowingclient(Window w);
+static Client *termforwin(const Client *c);
+static pid_t winpid(Window w);
+
+/* variables */
+static const char broken[] = "broken";
+static char stext[256];
+static int screen;
+static int sw, sh;           /* X display screen geometry width, height */
+static int bh, blw = 0;      /* bar geometry */
+static int lrpad;            /* sum of left and right padding for text */
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned int numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {
+       [ButtonPress] = buttonpress,
+       [ClientMessage] = clientmessage,
+       [ConfigureRequest] = configurerequest,
+       [ConfigureNotify] = configurenotify,
+       [DestroyNotify] = destroynotify,
+       [EnterNotify] = enternotify,
+       [Expose] = expose,
+       [FocusIn] = focusin,
+       [KeyPress] = keypress,
+       [MappingNotify] = mappingnotify,
+       [MapRequest] = maprequest,
+       [MotionNotify] = motionnotify,
+       [PropertyNotify] = propertynotify,
+       [UnmapNotify] = unmapnotify
+};
+static Atom wmatom[WMLast], netatom[NetLast];
+static int restart = 0;
+static int running = 1;
+static Cur *cursor[CurLast];
+static Clr **scheme;
+static Display *dpy;
+static Drw *drw;
+static Monitor *mons, *selmon;
+static Window root, wmcheckwin;
+
+static xcb_connection_t *xcon;
+
+static int useargb = 0;
+static Visual *visual;
+static int depth;
+static Colormap cmap;
+
+/* configuration, allows nested code to access above variables */
+#include "config.h"
+
+/* 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
 void

-applyrules(Client *c) {
-       static char buf[512];
-       unsigned int i, j;
-       regmatch_t tmp;
-       Bool matched = False;
-       XClassHint ch = { 0 };
+applyrules(Client *c)
+{
+       const char *class, *instance;
+       unsigned int i;
+       const Rule *r;
+       Monitor *m;
+       XClassHint ch = { NULL, NULL };

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

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

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

-       snprintf(buf, sizeof buf, "%s:%s:%s",
-                       ch.res_class ? ch.res_class : "",
-                       ch.res_name ? ch.res_name : "", c->name);
-       for(i = 0; i < nrules; i++)
-               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
-                       c->isfloating = rules[i].isfloating;
-                       for(j = 0; regs[i].tagregex && j < ntags; j++) {
-                               if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
-                                       matched = True;
-                                       c->tags[j] = True;
-                               }
-                       }
+       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))
+               && (!r->class || strstr(class, r->class))
+               && (!r->instance || strstr(instance, r->instance)))
+               {
+                       c->isterminal = r->isterminal;
+                       c->noswallow  = r->noswallow;
+                       c->isfloating = r->isfloating;
+                       c->tags |= r->tags;
+                       for (m = mons; m && m->num != r->monitor; m = m->next);
+                       if (m)
+                               c->mon = m;

                }
                }

-       if(ch.res_class)
+       }
+       if (ch.res_class)

                XFree(ch.res_class);
                XFree(ch.res_class);

-       if(ch.res_name)
+       if (ch.res_name)

                XFree(ch.res_name);
                XFree(ch.res_name);

-       if(!matched)
-               memcpy(c->tags, seltags, sizeof seltags);
+       c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
+}
+
+int
+applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)
+{
+       int 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;
+               }
+               /* 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;

 }
 
 void
 }
 
 void

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

 
 

-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       unban(c);
-               else
-                       ban(c);
-       layouts[ltidx].arrange();
-       focus(NULL);
-       restack();
+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
 }
 
 void

-attach(Client *c) {
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
+attach(Client *c)
+{
+       c->next = c->mon->clients;
+       c->mon->clients = c;

 }
 
 void
 }
 
 void

-attachstack(Client *c) {
-       c->snext = stack;
-       stack = c;
+attachstack(Client *c)
+{
+       c->snext = c->mon->stack;
+       c->mon->stack = c;

 }
 
 void
 }
 
 void

-ban(Client *c) {
-       if(c->isbanned)
+swallow(Client *p, Client *c)
+{
+
+       if (c->noswallow || c->isterminal)

                return;
                return;

-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       c->isbanned = True;
+       if (c->noswallow && !swallowfloating && c->isfloating)
+               return;
+
+       detach(c);
+       detachstack(c);
+
+       setclientstate(c, WithdrawnState);
+       XUnmapWindow(dpy, p->win);
+
+       p->swallowing = c;
+       c->mon = p->mon;
+
+       Window w = p->win;
+       p->win = c->win;
+       c->win = w;
+       updatetitle(p);
+       XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
+       arrange(p->mon);
+       configure(p);
+       updateclientlist();
+}
+
+void
+unswallow(Client *c)
+{
+       c->win = c->swallowing->win;
+
+       free(c->swallowing);
+       c->swallowing = NULL;
+
+       /* unfullscreen the client */
+       setfullscreen(c, 0);
+       updatetitle(c);
+       arrange(c->mon);
+       XMapWindow(dpy, c->win);
+       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+       setclientstate(c, NormalState);
+       focus(NULL);
+       arrange(c->mon);

 }
 
 void
 }
 
 void

-buttonpress(XEvent *e) {
-       unsigned int i, x;
+buttonpress(XEvent *e)
+{
+       unsigned int i, x, click;
+       Arg arg = {0};

        Client *c;
        Client *c;

+       Monitor *m;

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

-       if(barwin == ev->window) {
-               x = 0;
-               for(i = 0; i < ntags; i++) {
-                       x += textw(tags[i]);
-                       if(ev->x < x) {
-                               if(ev->button == Button1) {
-                                       if(ev->state & MODKEY)
-                                               tag(tags[i]);
-                                       else
-                                               view(tags[i]);
-                               }
-                               else if(ev->button == Button3) {
-                                       if(ev->state & MODKEY)
-                                               toggletag(tags[i]);
-                                       else
-                                               toggleview(tags[i]);
-                               }
-                               return;
-                       }
-               }
-               if((ev->x < x + blw) && ev->button == Button1)
-                       setlayout(NULL);
+       click = ClkRootWin;
+       /* focus monitor if necessary */
+       if ((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel, 1);
+               selmon = m;
+               focus(NULL);

        }
        }

-       else if((c = getclient(ev->window))) {
+       if (ev->window == selmon->barwin) {
+               i = x = 0;
+               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;
+               else if (ev->x > selmon->ww - (int)TEXTW(stext))
+                       click = ClkStatusText;
+               else
+                       click = ClkWinTitle;
+       } else if ((c = wintoclient(ev->window))) {

                focus(c);
                focus(c);

-               if(CLEANMASK(ev->state) != MODKEY)
-                       return;
-               if(ev->button == Button1) {
-                       if(isarrange(floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
-                       movemouse(c);
-               }
-               else if(ev->button == Button2) {
-                       if(ISTILE && !c->isfixed && c->isfloating)
-                               togglefloating(NULL);
-                       else
-                               zoom(NULL);
-               }
-               else if(ev->button == Button3 && !c->isfixed) {
-                       if(isarrange(floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
-                       resizemouse(c);
-               }
+               restack(selmon);
+               XAllowEvents(dpy, ReplayPointer, CurrentTime);
+               click = ClkClientWin;

        }
        }

+       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 && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);

 }
 
 void
 }
 
 void

-checkotherwm(void) {
-       otherwm = False;
-       XSetErrorHandler(xerrorstart);
-
+checkotherwm(void)
+{
+       xerrorxlib = XSetErrorHandler(xerrorstart);

        /* this causes an error if some other window manager is running */
        /* this causes an error if some other window manager is running */

-       XSelectInput(dpy, root, SubstructureRedirectMask);
-       XSync(dpy, False);
-       if(otherwm)
-               eprint("dwm: another window manager is already running\n");
+       XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);

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

-       XSetErrorHandler(NULL);
-       xerrorxlib = XSetErrorHandler(xerror);
+       XSetErrorHandler(xerror);

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

-cleanup(void) {
-       close(STDIN_FILENO);
-       while(stack) {
-               unban(stack);
-               unmanage(stack);
-       }
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       else
-               XFreeFont(dpy, dc.font.xfont);
+cleanup(void)
+{
+       Arg a = {.ui = ~0};
+       Layout foo = { "", NULL };
+       Monitor *m;
+       size_t i;
+
+       view(&a);
+       selmon->lt[selmon->sellt] = &foo;
+       for (m = mons; m; m = m->next)
+               while (m->stack)
+                       unmanage(m->stack, 0);

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

-       XFreePixmap(dpy, dc.drawable);
-       XFreeGC(dpy, dc.gc);
-       XDestroyWindow(dpy, barwin);
-       XFreeCursor(dpy, cursor[CurNormal]);
-       XFreeCursor(dpy, cursor[CurResize]);
-       XFreeCursor(dpy, cursor[CurMove]);
-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       while (mons)
+               cleanupmon(mons);
+       for (i = 0; i < CurLast; i++)
+               drw_cur_free(drw, cursor[i]);
+       for (i = 0; i < LENGTH(colors); i++)
+               free(scheme[i]);
+       free(scheme);
+       XDestroyWindow(dpy, wmcheckwin);
+       drw_free(drw);

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

+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       XDeleteProperty(dpy, root, netatom[NetActiveWindow]);

 }
 
 void
 }
 
 void

-compileregs(void) {
-       unsigned int i;
-       regex_t *reg;
+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
+clientmessage(XEvent *e)
+{
+       XClientMessageEvent *cme = &e->xclient;
+       Client *c = wintoclient(cme->window);

 
 

-       if(regs)
+       if (!c)

                return;
                return;

-       nrules = sizeof rules / sizeof rules[0];
-       regs = emallocz(nrules * sizeof(Regs));
-       for(i = 0; i < nrules; i++) {
-               if(rules[i].prop) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regs[i].propregex = reg;
-               }
-               if(rules[i].tags) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regs[i].tagregex = reg;
-               }
+       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 (c != selmon->sel && !c->isurgent)
+                       seturgent(c, 1);

        }
 }
 
 void
        }
 }
 
 void

-configure(Client *c) {
+configure(Client *c)
+{

        XConfigureEvent ce;
 
        ce.type = ConfigureNotify;
        XConfigureEvent ce;
 
        ce.type = ConfigureNotify;


@@ -250,60 +640,80 @@ configure(Client *c) {
        ce.y = c->y;
        ce.width = c->w;
        ce.height = c->h;
        ce.y = c->y;
        ce.width = c->w;
        ce.height = c->h;

-       ce.border_width = c->border;
+       ce.border_width = c->bw;

        ce.above = None;
        ce.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
 void
        ce.above = None;
        ce.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
 void

-configurenotify(XEvent *e) {
+configurenotify(XEvent *e)
+{
+       Monitor *m;
+       Client *c;

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

+       int 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;

-               XFreePixmap(dpy, dc.drawable);
-               dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-               XResizeWindow(dpy, barwin, sw, bh);
-               updatebarpos();
-               arrange();
+               if (updategeom() || dirty) {
+                       drw_resize(drw, sw, bh);
+                       updatebars();
+                       for (m = mons; m; m = m->next) {
+                               for (c = m->clients; c; c = c->next)
+                                       if (c->isfullscreen)
+                                               resizeclient(c, m->mx, m->my, m->mw, m->mh);
+                               XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+                       }
+                       focus(NULL);
+                       arrange(NULL);
+               }

        }
 }
 
 void
        }
 }
 
 void

-configurerequest(XEvent *e) {
+configurerequest(XEvent *e)
+{

        Client *c;
        Client *c;

+       Monitor *m;

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

-       if((c = getclient(ev->window))) {
-               c->ismax = False;
-               if(ev->value_mask & CWBorderWidth)
-                       c->border = ev->border_width;
-               if(c->isfixed || c->isfloating || isarrange(floating)) {
-                       if(ev->value_mask & CWX)
-                               c->x = ev->x;
-                       if(ev->value_mask & CWY)
-                               c->y = ev->y;
-                       if(ev->value_mask & CWWidth)
+       if ((c = wintoclient(ev->window))) {
+               if (ev->value_mask & CWBorderWidth)
+                       c->bw = ev->border_width;
+               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 + c->w) > sw && c->isfloating)
-                               c->x = sw / 2 - c->w / 2; /* center in x direction */
-                       if((c->y + c->h) > sh && c->isfloating)
-                               c->y = sh / 2 - c->h / 2; /* center in y direction */
-                       if((ev->value_mask & (CWX | CWY))
-                       && !(ev->value_mask & (CWWidth | CWHeight)))
+                       }
+                       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);
                                configure(c);

-                       if(isvisible(c))
+                       if (ISVISIBLE(c))

                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);

-               }
-               else
+               } else

                        configure(c);
                        configure(c);

-       }
-       else {
+       } else {

                wc.x = ev->x;
                wc.y = ev->y;
                wc.width = ev->width;
                wc.x = ev->x;
                wc.y = ev->y;
                wc.width = ev->width;


@@ -316,1317 +726,1664 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

+Monitor *
+createmon(void)
+{
+       Monitor *m;
+
+       m = ecalloc(1, sizeof(Monitor));
+       m->tagset[0] = m->tagset[1] = 1;
+       m->mfact = mfact;
+       m->nmaster = nmaster;
+       m->showbar = showbar;
+       m->topbar = topbar;
+       m->gappx = gappx;
+       m->lt[0] = &layouts[0];
+       m->lt[1] = &layouts[1 % LENGTH(layouts)];
+       strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+       return m;
+}
+

 void
 void

-destroynotify(XEvent *e) {
+destroynotify(XEvent *e)
+{

        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 

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

 
 

-void
-detach(Client *c) {
-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
-               clients = c->next;
-       c->next = c->prev = NULL;
+       else if ((c = swallowingclient(ev->window)))
+               unmanage(c->swallowing, 1);

 }
 
 void
 }
 
 void

-detachstack(Client *c) {
+detach(Client *c)
+{

        Client **tc;
 
        Client **tc;
 

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

 }
 
 void
 }
 
 void

-drawbar(void) {
-       int i, x;
+detachstack(Client *c)
+{
+       Client **tc, *t;

 
 

-       dc.x = dc.y = 0;
-       for(i = 0; i < ntags; i++) {
-               dc.w = textw(tags[i]);
-               if(seltags[i]) {
-                       drawtext(tags[i], dc.sel);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
-               }
-               else {
-                       drawtext(tags[i], dc.norm);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
-               }
-               dc.x += dc.w;
-       }
-       dc.w = blw;
-       drawtext(layouts[ltidx].symbol, dc.norm);
-       x = dc.x + dc.w;
-       dc.w = textw(stext);
-       dc.x = sw - dc.w;
-       if(dc.x < x) {
-               dc.x = x;
-               dc.w = sw - x;
-       }
-       drawtext(stext, dc.norm);
-       if((dc.w = dc.x - x) > bh) {
-               dc.x = x;
-               if(sel) {
-                       drawtext(sel->name, dc.sel);
-                       drawsquare(sel->ismax, sel->isfloating, dc.sel);
-               }
-               else
-                       drawtext(NULL, dc.norm);
+       for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
+       *tc = c->snext;
+
+       if (c == c->mon->sel) {
+               for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
+               c->mon->sel = t;

        }
        }

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

 }
 
 }
 

-void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
-       int x;
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+Monitor *
+dirtomon(int dir)
+{
+       Monitor *m = NULL;

 
 

-       gcv.foreground = col[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);
-       }
+       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

-drawtext(const char *text, unsigned long col[ColLast]) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+drawbar(Monitor *m)
+{
+       int x, w, tw = 0;
+       int boxs = drw->fonts->h / 9;
+       int boxw = drw->fonts->h / 6 + 2;
+       unsigned int i, occ = 0, urg = 0;
+       Client *c;

 
 

-       XSetForeground(dpy, dc.gc, col[ColBG]);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       if(!text)
+       if (!m->showbar)

                return;
                return;

-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
-       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 */
-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
+
+       /* draw status first so it can be overdrawn by tags later */
+       if (m == selmon) { /* status is only drawn on selected monitor */
+               drw_setscheme(drw, scheme[SchemeNorm]);
+               tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+               drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);

        }
        }

-       if(w > dc.w)
-               return; /* too long */
-       XSetForeground(dpy, dc.gc, col[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 (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++) {
+               w = TEXTW(tags[i]);
+               drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
+               drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
+               if (occ & 1 << i)
+                       drw_rect(drw, x + boxs, boxs, boxw, boxw,
+                               m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+                               urg & 1 << i);
+               x += w;
+       }
+       w = blw = TEXTW(m->ltsymbol);
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+       if ((w = m->ww - tw - x) > bh) {
+               if (m->sel) {
+                       drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+                       if (m->sel->isfloating)
+                               drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
+               } else {
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_rect(drw, x, 0, w, bh, 1, 1);
+               }
+       }
+       drw_map(drw, m->barwin, 0, 0, m->ww, bh);

 }
 
 }
 

-void *
-emallocz(unsigned int size) {
-       void *res = calloc(1, size);
+void
+drawbars(void)
+{
+       Monitor *m;

 
 

-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
+       for (m = mons; m; m = m->next)
+               drawbar(m);

 }
 
 void
 }
 
 void

-enternotify(XEvent *e) {
+enternotify(XEvent *e)
+{

        Client *c;
        Client *c;

+       Monitor *m;

        XCrossingEvent *ev = &e->xcrossing;
 
        XCrossingEvent *ev = &e->xcrossing;
 

-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+       if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)

                return;
                return;

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

 }
 
 void
 }
 
 void

-eprint(const char *errstr, ...) {
-       va_list ap;
+expose(XEvent *e)
+{
+       Monitor *m;
+       XExposeEvent *ev = &e->xexpose;

 
 

-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
+       if (ev->count == 0 && (m = wintomon(ev->window)))
+               drawbar(m);

 }
 
 void
 }
 
 void

-expose(XEvent *e) {
-       XExposeEvent *ev = &e->xexpose;
-
-       if(ev->count == 0) {
-               if(barwin == ev->window)
-                       drawbar();
+focus(Client *c)
+{
+       if (!c || !ISVISIBLE(c))
+               for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+       if (selmon->sel && selmon->sel != c)
+               unfocus(selmon->sel, 0);
+       if (c) {
+               if (c->mon != selmon)
+                       selmon = c->mon;
+               if (c->isurgent)
+                       seturgent(c, 0);
+               detachstack(c);
+               attachstack(c);
+               grabbuttons(c, 1);
+               XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
+               setfocus(c);
+       } else {
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               XDeleteProperty(dpy, root, netatom[NetActiveWindow]);

        }
        }

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

 }
 
 }
 

+/* there are some broken focus acquiring clients needing extra handling */

 void
 void

-floating(void) { /* default floating layout */
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       resize(c, c->x, c->y, c->w, c->h, True);
-}
+focusin(XEvent *e)
+{
+       XFocusChangeEvent *ev = &e->xfocus;

 
 

-void
-focus(Client *c) {
-       if((!c && selscreen) || (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]);
-       }
-       if(c) {
-               detachstack(c);
-               attachstack(c);
-               grabbuttons(c, True);
-       }
-       sel = c;
-       drawbar();
-       if(!selscreen)
-               return;
-       if(c) {
-               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
-               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       }
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       if (selmon->sel && ev->window != selmon->sel->win)
+               setfocus(selmon->sel);

 }
 
 void
 }
 
 void

-focusnext(const char *arg) {
-       Client *c;
+focusmon(const Arg *arg)
+{
+       Monitor *m;

 
 

-       if(!sel)
+       if (!mons->next)

                return;
                return;

-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack();
-       }
+       if ((m = dirtomon(arg->i)) == selmon)
+               return;
+       unfocus(selmon->sel, 0);
+       selmon = m;
+       focus(NULL);

 }
 
 void
 }
 
 void

-focusprev(const char *arg) {
-       Client *c;
+focusstack(const Arg *arg)
+{
+       Client *c = NULL, *i;

 
 

-       if(!sel)
+       if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))

                return;
                return;

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

        }
        }

-       if(c) {
+       if (c) {

                focus(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;

 }
 
 }
 

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

 
 

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

 }
 
 long
 }
 
 long

-getstate(Window w) {
-       int format, status;
+getstate(Window w)
+{
+       int format;

        long result = -1;
        unsigned char *p = NULL;
        unsigned long n, extra;
        Atom real;
 
        long result = -1;
        unsigned char *p = NULL;
        unsigned long n, extra;
        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;
                return -1;

-       if(n != 0)
+       if (n != 0)

                result = *p;
        XFree(p);
        return result;
 }
 
                result = *p;
        XFree(p);
        return result;
 }
 

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

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

-       if(!text || size == 0)
-               return False;
+       if (!text || size == 0)
+               return 0;

        text[0] = '\0';
        text[0] = '\0';

-       XGetTextProperty(dpy, w, &name, atom);
-       if(!name.nitems)
-               return False;
-       if(name.encoding == XA_STRING)
+       if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)
+               return 0;
+       if (name.encoding == XA_STRING)

                strncpy(text, (char *)name.value, size - 1);
        else {
                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);
                }
        }
        text[size - 1] = '\0';
        XFree(name.value);
                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }
        }
        text[size - 1] = '\0';
        XFree(name.value);

-       return True;
-}
-
-void
-grabbuttons(Client *c, Bool focused) {
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-
-       if(focused) {
-               XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-
-               XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-
-               XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-       }
-       else
-               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-}
-
-unsigned int
-idxoftag(const char *tag) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(tags[i] == tag)
-                       return i;
-       return 0;
+       return 1;

 }
 
 void
 }
 
 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++) {
-                       if(dc.font.ascent < (*xfonts)->ascent)
-                               dc.font.ascent = (*xfonts)->ascent;
-                       if(dc.font.descent < (*xfonts)->descent)
-                               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")))
-                       eprint("error, cannot load font: '%s'\n", fontstr);
-               dc.font.ascent = dc.font.xfont->ascent;
-               dc.font.descent = dc.font.xfont->descent;
+grabbuttons(Client *c, int focused)
+{
+       updatenumlockmask();
+       {
+               unsigned int i, j;
+               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+               XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+               if (!focused)
+                       XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+                               BUTTONMASK, GrabModeSync, GrabModeSync, None, None);
+               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);

        }
        }

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

 }
 
 }
 

-Bool
-isarrange(void (*func)())
+void
+grabkeys(void)

 {
 {

-       return func == layouts[ltidx].arrange;
-}
-
-Bool
-isoccupied(unsigned int t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
-}
+       updatenumlockmask();
+       {
+               unsigned int i, j;
+               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+               KeyCode code;

 
 

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

        }
        }

-       return ret;

 }
 
 }
 

-Bool
-isvisible(Client *c) {
-       unsigned int i;
+void
+incnmaster(const Arg *arg)
+{
+       selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+       arrange(selmon);
+}

 
 

-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltags[i])
-                       return True;
-       return False;
+#ifdef XINERAMA
+static int
+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 0;
+       return 1;

 }
 }

+#endif /* XINERAMA */

 
 void
 
 void

-keypress(XEvent *e) {
-       KEYS
-       unsigned int len = sizeof keys / sizeof keys[0];
+keypress(XEvent *e)
+{

        unsigned int i;
        unsigned int i;

-       KeyCode code;

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

-       if(!e) { /* grabkeys */
-               XUngrabKey(dpy, AnyKey, AnyModifier, root);
-               for(i = 0; i < len; 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);
-               }
-               return;
-       }

        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < len; i++)
-               if(keysym == keys[i].keysym
-               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
-               {
-                       if(keys[i].func)
-                               keys[i].func(keys[i].arg);
-               }
+       for (i = 0; i < LENGTH(keys); i++)
+               if (keysym == keys[i].keysym
+               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+               && keys[i].func)
+                       keys[i].func(&(keys[i].arg));

 }
 
 void
 }
 
 void

-killclient(const char *arg) {
-       XEvent ev;
-
-       if(!sel)
+killclient(const Arg *arg)
+{
+       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);
-       }
-       else
-               XKillClient(dpy, sel->win);
-}
-
-void
-leavenotify(XEvent *e) {
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen) {
-               selscreen = False;
-               focus(NULL);
+       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);

        }
 }
 
 void
        }
 }
 
 void

-manage(Window w, XWindowAttributes *wa) {
-       Client *c, *t = NULL;
-       Window trans;
-       Status rettrans;
+manage(Window w, XWindowAttributes *wa)
+{
+       Client *c, *t = NULL, *term = NULL;
+       Window trans = None;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       c = emallocz(sizeof(Client));
-       c->tags = emallocz(sizeof seltags);
+       c = ecalloc(1, sizeof(Client));

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

-       c->x = wa->x;
-       c->y = wa->y;
-       c->w = wa->width;
-       c->h = wa->height;
-       c->oldborder = wa->border_width;
-       if(c->w == sw && c->h == sh) {
-               c->x = sx;
-               c->y = sy;
-               c->border = wa->border_width;
-       }
-       else {
-               if(c->x + c->w + 2 * c->border > wax + waw)
-                       c->x = wax + waw - c->w - 2 * c->border;
-               if(c->y + c->h + 2 * c->border > way + wah)
-                       c->y = way + wah - c->h - 2 * c->border;
-               if(c->x < wax)
-                       c->x = wax;
-               if(c->y < way)
-                       c->y = way;
-               c->border = BORDERPX;
+       c->pid = winpid(w);
+       /* 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;
+
+       updatetitle(c);
+       if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
+               c->mon = t->mon;
+               c->tags = t->tags;
+       } else {
+               c->mon = selmon;
+               applyrules(c);
+               term = termforwin(c);

        }
        }

-       wc.border_width = c->border;
+
+       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);
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);

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

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

-       XSelectInput(dpy, w,
-               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       grabbuttons(c, False);
-       updatetitle(c);
-       if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-               for(t = clients; t && t->win != trans; t = t->next);
-       if(t)
-               memcpy(c->tags, t->tags, sizeof seltags);
-       applyrules(c);
-       if(!c->isfloating)
-               c->isfloating = (rettrans == Success) || c->isfixed;
+       updatewmhints(c);
+       XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
+       grabbuttons(c, 0);
+       if (!c->isfloating)
+               c->isfloating = c->oldstate = trans != None || c->isfixed;
+       if (c->isfloating)
+               XRaiseWindow(dpy, c->win);

        attach(c);
        attachstack(c);
        attach(c);
        attachstack(c);

-       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-       ban(c);
-       XMapWindow(dpy, c->win);
+       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 */

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

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

 }
 
 void
 }
 
 void

-mappingnotify(XEvent *e) {
+mappingnotify(XEvent *e)
+{

        XMappingEvent *ev = &e->xmapping;
 
        XRefreshKeyboardMapping(ev);
        XMappingEvent *ev = &e->xmapping;
 
        XRefreshKeyboardMapping(ev);

-       if(ev->request == MappingKeyboard)
-               keypress(NULL);
+       if (ev->request == MappingKeyboard)
+               grabkeys();

 }
 
 void
 }
 
 void

-maprequest(XEvent *e) {
+maprequest(XEvent *e)
+{

        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;
 
        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;
 

-       if(!XGetWindowAttributes(dpy, ev->window, &wa))
+       if (!XGetWindowAttributes(dpy, ev->window, &wa))

                return;
                return;

-       if(wa.override_redirect)
+       if (wa.override_redirect)

                return;
                return;

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

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

-movemouse(Client *c) {
-       int x1, y1, ocx, ocy, di, nx, ny;
-       unsigned int dui;
-       Window dummy;
-       XEvent ev;
+monocle(Monitor *m)
+{
+       unsigned int n = 0;
+       Client *c;
+
+       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, 0);
+}
+
+void
+motionnotify(XEvent *e)
+{
+       static Monitor *mon = NULL;
+       Monitor *m;
+       XMotionEvent *ev = &e->xmotion;

 
 

-       ocx = nx = c->x;
-       ocy = ny = c->y;
-       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                       None, cursor[CurMove], CurrentTime) != GrabSuccess)
+       if (ev->window != root)

                return;
                return;

-       c->ismax = False;
-       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
-       for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
-               switch (ev.type) {
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
+       if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
+               unfocus(selmon->sel, 1);
+               selmon = m;
+               focus(NULL);
+       }
+       mon = m;
+}
+
+void
+movemouse(const Arg *arg)
+{
+       int x, y, ocx, ocy, nx, ny;
+       Client *c;
+       Monitor *m;
+       XEvent ev;
+       Time lasttime = 0;
+
+       if (!(c = selmon->sel))
+               return;
+       if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
+               return;
+       restack(selmon);
+       ocx = c->x;
+       ocy = c->y;
+       if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+               None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
+               return;
+       if (!getrootptr(&x, &y))
+               return;
+       do {
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
+               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(abs(wax + nx) < SNAP)
-                               nx = wax;
-                       else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
-                               nx = wax + waw - c->w - 2 * c->border;
-                       if(abs(way - ny) < SNAP)
-                               ny = way;
-                       else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
-                               ny = way + wah - c->h - 2 * c->border;
-                       resize(c, nx, ny, c->w, c->h, False);
+                       if ((ev.xmotion.time - lasttime) <= (1000 / 60))
+                               continue;
+                       lasttime = ev.xmotion.time;
+
+                       nx = ocx + (ev.xmotion.x - x);
+                       ny = ocy + (ev.xmotion.y - y);
+                       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);
+                       if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, 1);

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

        }
 }
 
 Client *
        }
 }
 
 Client *

-nexttiled(Client *c) {
-       for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+nexttiled(Client *c)
+{
+       for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);

        return c;
 }
 
 void
        return c;
 }
 
 void

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

        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        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) {
-                       default: break;
-                       case XA_WM_TRANSIENT_FOR:
-                               XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-                                       arrange();
-                               break;
-                       case XA_WM_NORMAL_HINTS:
-                               updatesizehints(c);
-                               break;
+       else if ((c = wintoclient(ev->window))) {
+               switch(ev->atom) {
+               default: break;
+               case XA_WM_TRANSIENT_FOR:
+                       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);
+                       drawbars();
+                       break;

                }
                }

-               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+               if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {

                        updatetitle(c);
                        updatetitle(c);

-                       if(c == sel)
-                               drawbar();
+                       if (c == c->mon->sel)
+                               drawbar(c->mon);

                }
                }

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

        }
 }
 
 void
        }
 }
 
 void

-quit(const char *arg) {
-       readin = running = False;
+quit(const Arg *arg)
+{
+       if(arg->i) restart = 1;
+       running = 0;

 }
 
 }
 

-void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-       XWindowChanges wc;
-
-       if(sizehints) {
-               /* set minimum possible */
-               if (w < 1)
-                       w = 1;
-               if (h < 1)
-                       h = 1;
-
-               /* 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->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
-                       if (w * c->maxay > h * c->maxax)
-                               w = h * c->maxax / c->maxay;
-                       else if (w * c->minay < h * c->minax)
-                               h = w * c->minay / c->minax;
+       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;
+void
+resize(Client *c, int x, int y, int w, int h, int interact)
+{
+       if (applysizehints(c, &x, &y, &w, &h, interact))
+               resizeclient(c, x, y, w, h);
+}

 
 

-               /* restore base dimensions */
-               w += c->basew;
-               h += c->baseh;
-
-               if(c->minw > 0 && w < c->minw)
-                       w = c->minw;
-               if(c->minh > 0 && h < c->minh)
-                       h = c->minh;
-               if(c->maxw > 0 && w > c->maxw)
-                       w = c->maxw;
-               if(c->maxh > 0 && h > c->maxh)
-                       h = c->maxh;
-       }
-       if(w <= 0 || h <= 0)
-               return;
-       /* offscreen appearance fixes */
-       if(x > sw)
-               x = sw - w - 2 * c->border;
-       if(y > sh)
-               y = sh - h - 2 * c->border;
-       if(x + w + 2 * c->border < sx)
-               x = sx;
-       if(y + h + 2 * c->border < sy)
-               y = sy;
-       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->border;
-               XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
-               configure(c);
-               XSync(dpy, False);
-       }
+void
+resizeclient(Client *c, int x, int y, int w, int h)
+{
+       XWindowChanges wc;
+
+       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

-resizemouse(Client *c) {
-       int ocx, ocy;
-       int nw, nh;
+resizemouse(const Arg *arg)
+{
+       int ocx, ocy, nw, nh;
+       Client *c;
+       Monitor *m;

        XEvent ev;
        XEvent ev;

+       Time lasttime = 0;

 
 

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

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

-       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                       None, cursor[CurResize], CurrentTime) != GrabSuccess)
+       if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+               None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)

                return;
                return;

-       c->ismax = False;
-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
-       for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+       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->border - 1, c->h + c->border - 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);
-                       if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
-                               nw = 1;
-                       if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
-                               nh = 1;
-                       resize(c, c->x, c->y, nw, nh, True);
+                       if ((ev.xmotion.time - lasttime) <= (1000 / 60))
+                               continue;
+                       lasttime = ev.xmotion.time;
+
+                       nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+                       nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+                       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);
+                       }
+                       if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, c->x, c->y, nw, nh, 1);

                        break;
                }
                        break;
                }

+       } while (ev.type != ButtonRelease);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+       XUngrabPointer(dpy, CurrentTime);
+       while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+       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 || isarrange(floating))
-               XRaiseWindow(dpy, sel->win);
-       if(!isarrange(floating)) {
+       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;
-               if(!sel->isfloating) {
-                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
-                       wc.sibling = sel->win;
-               }
-               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-                       if(c == sel)
-                               continue;
-                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-                       wc.sibling = c->win;
-               }
+               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;
+                       }

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

-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+       while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 void
 }
 
 void

-run(void) {
-       char *p;
-       int r, xfd;
-       fd_set rd;
+run(void)
+{

        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;
-       while(running) {
-               FD_ZERO(&rd);
-               if(readin)
-                       FD_SET(STDIN_FILENO, &rd);
-               FD_SET(xfd, &rd);
-               if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
-                       if(errno == EINTR)
-                               continue;
-                       eprint("select failed\n");
-               }
-               if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
-                       case -1:
-                               strncpy(stext, strerror(errno), sizeof stext - 1);
-                               stext[sizeof stext - 1] = '\0';
-                               readin = False;
-                               break;
-                       case 0:
-                               strncpy(stext, "EOF", 4);
-                               readin = False;
-                               break;
-                       default:
-                               for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-                               for(; p >= stext && *p != '\n'; --p);
-                               if(p > stext)
-                                       strncpy(stext, p + 1, sizeof stext);
-                       }
-                       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
 }
 
 void

-scan(void) {
+scan(void)
+{

        unsigned int i, num;
        unsigned int i, num;

-       Window *wins, d1, d2;
+       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)

                        || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;

-                       if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+                       if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)

                                manage(wins[i], &wa);
                }
                                manage(wins[i], &wa);
                }

-               for(i = 0; i < num; i++) { /* now the transients */
-                       if(!XGetWindowAttributes(dpy, wins[i], &wa))
+               for (i = 0; i < num; i++) { /* now the transients */
+                       if (!XGetWindowAttributes(dpy, wins[i], &wa))

                                continue;
                                continue;

-                       if(XGetTransientForHint(dpy, wins[i], &d1)
+                       if (XGetTransientForHint(dpy, wins[i], &d1)

                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }

+               if (wins)
+                       XFree(wins);

        }
        }

-       if(wins)
-               XFree(wins);

 }
 
 void
 }
 
 void

-setclientstate(Client *c, long state) {
-       long data[] = {state, None};
+sendmon(Client *c, Monitor *m)
+{
+       if (c->mon == m)
+               return;
+       unfocus(c, 1);
+       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)
+{
+       long data[] = { state, None };

 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,

-                       PropModeReplace, (unsigned char *)data, 2);
+               PropModeReplace, (unsigned char *)data, 2);

 }
 
 }
 

-void
-setlayout(const char *arg) {
-       unsigned int i;
+int
+sendevent(Client *c, Atom proto)
+{
+       int n;
+       Atom *protocols;
+       int exists = 0;
+       XEvent ev;

 
 

-       if(!arg) {
-               if(++ltidx == nlayouts)
-                       ltidx = 0;;
+       if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+               while (!exists && n--)
+                       exists = protocols[n] == proto;
+               XFree(protocols);

        }
        }

-       else {
-               for(i = 0; i < nlayouts; i++)
-                       if(!strcmp(arg, layouts[i].symbol))
-                               break;
-               if(i == nlayouts)
-                       return;
-               ltidx = i;
+       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);

        }
        }

-       if(sel)
-               arrange();
+       sendevent(c, wmatom[WMTakeFocus]);
+}
+
+void
+setfullscreen(Client *c, int fullscreen)
+{
+       if (fullscreen && !c->isfullscreen) {
+               XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+               c->isfullscreen = 1;
+               c->oldstate = c->isfloating;
+               c->oldbw = c->bw;
+               c->bw = 0;
+               c->isfloating = 1;
+               resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+               XRaiseWindow(dpy, c->win);
+       } else if (!fullscreen && c->isfullscreen){
+               XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char*)0, 0);
+               c->isfullscreen = 0;
+               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
+setgaps(const Arg *arg)
+{
+       if ((arg->i == 0) || (selmon->gappx + arg->i < 0))
+               selmon->gappx = 0;
+       else
+               selmon->gappx += arg->i;
+       arrange(selmon);
+}
+
+void
+setlayout(const Arg *arg)
+{
+       if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+               selmon->sellt ^= 1;
+       if (arg && arg->v)
+               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 absolutely */

 void
 void

-setmwfact(const char *arg) {
-       double delta;
+setmfact(const Arg *arg)
+{
+       float f;

 
 

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

                return;
                return;

-       /* arg handling, manipulate mwfact */
-       if(arg == NULL)
-               mwfact = MWFACT;
-       else if(1 == sscanf(arg, "%lf", &delta)) {
-               if(arg[0] == '+' || arg[0] == '-')
-                       mwfact += delta;
-               else
-                       mwfact = delta;
-               if(mwfact < 0.1)
-                       mwfact = 0.1;
-               else if(mwfact > 0.9)
-                       mwfact = 0.9;
-       }
-       arrange();
+       f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+       if (f < 0.05 || f > 0.95)
+               return;
+       selmon->mfact = f;
+       arrange(selmon);

 }
 
 void
 }
 
 void

-setup(void) {
-       int d;
-       unsigned int i, j, mask;
-       Window w;
-       XModifierKeymap *modmap;
+setup(void)
+{
+       int i;

        XSetWindowAttributes wa;
        XSetWindowAttributes wa;

+       Atom utf8string;
+
+       /* clean up any zombies immediately */
+       sigchld(0);
+
+       signal(SIGHUP, sighup);
+       signal(SIGTERM, sigterm);

 
 

+       /* init screen */
+       screen = DefaultScreen(dpy);
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+       root = RootWindow(dpy, screen);
+       xinitvisual();
+       drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap);
+       if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+               die("no fonts could be loaded.");
+       lrpad = drw->fonts->h;
+       bh = drw->fonts->h + 2;
+       updategeom();

        /* init atoms */
        /* init atoms */

+       utf8string = XInternAtom(dpy, "UTF8_STRING", False);

        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        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);

-       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-                       PropModeReplace, (unsigned char *) netatom, NetLast);
-
+       netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
+       netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", 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 */

-       cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
-       cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
-       cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-
-       /* init geometry */
-       sx = sy = 0;
-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-
-       /* 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);
-
-       /* select for events */
-       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-               | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
-       wa.cursor = cursor[CurNormal];
-       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+       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 */
+       scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
+       for (i = 0; i < LENGTH(colors); i++)
+               scheme[i] = drw_scm_create(drw, colors[i], alphas[i], 3);
+       /* init bars */
+       updatebars();
+       updatestatus();
+       /* supporting window for NetWMCheck */
+       wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
+       XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
+               PropModeReplace, (unsigned char *) &wmcheckwin, 1);
+       XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
+               PropModeReplace, (unsigned char *) "dwm", 3);
+       XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
+               PropModeReplace, (unsigned char *) &wmcheckwin, 1);
+       /* EWMH support per view */
+       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+               PropModeReplace, (unsigned char *) netatom, NetLast);
+       XDeleteProperty(dpy, root, netatom[NetClientList]);
+       /* select events */
+       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);
        XSelectInput(dpy, root, wa.event_mask);

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

 
 

-       /* grab keys */
-       keypress(NULL);

 
 

-       /* init tags */
-       compileregs();
+void
+seturgent(Client *c, int urg)
+{
+       XWMHints *wmh;

 
 

-       /* init appearance */
-       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
-       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-       dc.sel[ColBG] = getcolor(SELBGCOLOR);
-       dc.sel[ColFG] = getcolor(SELFGCOLOR);
-       initfont(FONT);
-       dc.h = bh = dc.font.height + 2;
-
-       /* init layouts */
-       mwfact = MWFACT;
-       nlayouts = sizeof layouts / sizeof layouts[0];
-       for(blw = i = 0; i < nlayouts; i++) {
-               j = textw(layouts[i].symbol);
-               if(j > blw)
-                       blw = j;
-       }
+       c->isurgent = urg;
+       if (!(wmh = XGetWMHints(dpy, c->win)))
+               return;
+       wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
+       XSetWMHints(dpy, c->win, wmh);
+       XFree(wmh);
+}

 
 

-       /* init bar */
-       bpos = BARPOS;
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask | ExposureMask;
-       barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       updatebarpos();
-       XMapRaised(dpy, barwin);
-       strcpy(stext, "dwm-"VERSION);
-       dc.drawable = XCreatePixmap(dpy, root, sw, 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);
-
-       /* multihead support */
-       selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
-}
-
-void
-spawn(const char *arg) {
-       static char *shell = NULL;
-
-       if(!shell && !(shell = getenv("SHELL")))
-               shell = "/bin/sh";
-       if(!arg)
+void
+showhide(Client *c)
+{
+       if (!c)

                return;
                return;

-       /* The double-fork construct avoids zombie processes and keeps the code
-        * clean from stupid signal handlers. */
-       if(fork() == 0) {
-               if(fork() == 0) {
-                       if(dpy)
-                               close(ConnectionNumber(dpy));
-                       setsid();
-                       execl(shell, shell, "-c", arg, (char *)NULL);
-                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
-                       perror(" failed");
-               }
-               exit(0);
+       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, 0);
+               showhide(c->snext);
+       } else {
+               /* hide clients bottom up */
+               showhide(c->snext);
+               XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);

        }
        }

-       wait(0);

 }
 
 void
 }
 
 void

-tag(const char *arg) {
-       unsigned int i;
+sigchld(int unused)
+{
+       if (signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("can't install SIGCHLD handler:");
+       while (0 < waitpid(-1, NULL, WNOHANG));
+}

 
 

-       if(!sel)
-               return;
-       for(i = 0; i < ntags; i++)
-               sel->tags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               sel->tags[i] = True;
-       arrange();
+void
+sighup(int unused)
+{
+       Arg a = {.i = 1};
+       quit(&a);

 }
 
 }
 

-unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
+void
+sigterm(int unused)
+{
+       Arg a = {.i = 0};
+       quit(&a);
+}

 
 

-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
+void
+spawn(const Arg *arg)
+{
+       if (arg->v == dmenucmd)
+               dmenumon[0] = '0' + selmon->num;
+       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(EXIT_SUCCESS);

        }
        }

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

 }
 
 }
 

-unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
+void
+tag(const Arg *arg)
+{
+       if (selmon->sel && arg->ui & TAGMASK) {
+               selmon->sel->tags = arg->ui & TAGMASK;
+               focus(NULL);
+               arrange(selmon);
+       }

 }
 
 void
 }
 
 void

-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
-       Client *c, *mc;
+tagmon(const Arg *arg)
+{
+       if (!selmon->sel || !mons->next)
+               return;
+       sendmon(selmon->sel, dirtomon(arg->i));
+}

 
 

-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
+void
+tile(Monitor *m)
+{
+       unsigned int i, n, h, mw, my, ty;
+       Client *c;

 
 

-       /* window geoms */
-       mw = (n == 1) ? waw : mwfact * waw;
-       th = (n > 1) ? wah / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = wah;
+       for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+       if (n == 0)
+               return;

 
 

-       nx = wax;
-       ny = way;
-       nw = 0; /* gcc stupidity requires this */
-       for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
-               c->ismax = False;
-               if(i == 0) { /* master */
-                       nw = mw - 2 * c->border;
-                       nh = wah - 2 * c->border;
-               }
-               else {  /* tile window */
-                       if(i == 1) {
-                               ny = way;
-                               nx += mc->w + 2 * mc->border;
-                               nw = waw - nx - 2 * c->border;
-                       }
-                       if(i + 1 == n) /* remainder */
-                               nh = (way + wah) - ny - 2 * c->border;
-                       else
-                               nh = th - 2 * c->border;
+       if (n > m->nmaster)
+               mw = m->nmaster ? m->ww * m->mfact : 0;
+       else
+               mw = m->ww - m->gappx;
+       for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+               if (i < m->nmaster) {
+                       h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx;
+                       resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0);
+                       if (my + HEIGHT(c) + m->gappx < m->wh)
+                               my += HEIGHT(c) + m->gappx;
+               } else {
+                       h = (m->wh - ty) / (n - i) - m->gappx;
+                       resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0);
+                       if (ty + HEIGHT(c) + m->gappx < m->wh)
+                               ty += HEIGHT(c) + m->gappx;

                }
                }

-               resize(c, nx, ny, nw, nh, RESIZEHINTS);
-               if(n > 1 && th != wah)
-                       ny = c->y + c->h + 2 * c->border;
-       }

 }
 
 void
 }
 
 void

-togglebar(const char *arg) {
-       if(bpos == BarOff)
-               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-       else
-               bpos = BarOff;
-       updatebarpos();
-       arrange();
+togglebar(const Arg *arg)
+{
+       selmon->showbar = !selmon->showbar;
+       updatebarpos(selmon);
+       XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
+       arrange(selmon);

 }
 
 void
 }
 
 void

-togglefloating(const char *arg) {
-       if(!sel)
+togglefloating(const Arg *arg)
+{
+       if (!selmon->sel)
+               return;
+       if (selmon->sel->isfullscreen) /* no support for fullscreen windows */

                return;
                return;

-       sel->isfloating = !sel->isfloating;
-       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, 0);
+       arrange(selmon);

 }
 
 void
 }
 
 void

-togglemax(const char *arg) {
-       XEvent ev;
-
-       if(!sel || sel->isfixed)
-               return;
-       if((sel->ismax = !sel->ismax)) {
-               if(isarrange(floating) || sel->isfloating)
-                       sel->wasfloating = True;
-               else {
-                       togglefloating(NULL);
-                       sel->wasfloating = False;
-               }
-               sel->rx = sel->x;
-               sel->ry = sel->y;
-               sel->rw = sel->w;
-               sel->rh = sel->h;
-               resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
-       }
-       else {
-               resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-               if(!sel->wasfloating)
-                       togglefloating(NULL);
-       }
-       drawbar();
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+togglefullscr(const Arg *arg)
+{
+  if(selmon->sel)
+    setfullscreen(selmon->sel, !selmon->sel->isfullscreen);

 }
 
 void
 }
 
 void

-toggletag(const char *arg) {
-       unsigned int i, j;
+toggletag(const Arg *arg)
+{
+       unsigned int newtags;

 
 

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

                return;
                return;

-       i = idxoftag(arg);
-       sel->tags[i] = !sel->tags[i];
-       for(j = 0; j < ntags && !sel->tags[j]; j++);
-       if(j == ntags)
-               sel->tags[i] = True;
-       arrange();
+       newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
+       if (newtags) {
+               selmon->sel->tags = newtags;
+               focus(NULL);
+               arrange(selmon);
+       }

 }
 
 void
 }
 
 void

-toggleview(const char *arg) {
-       unsigned int i, j;
+toggleview(const Arg *arg)
+{
+       unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);

 
 

-       i = idxoftag(arg);
-       seltags[i] = !seltags[i];
-       for(j = 0; j < ntags && !seltags[j]; j++);
-       if(j == ntags)
-               seltags[i] = True; /* at least one tag must be viewed */
-       arrange();
+       if (newtagset) {
+               selmon->tagset[selmon->seltags] = newtagset;
+               focus(NULL);
+               arrange(selmon);
+       }

 }
 
 void
 }
 
 void

-unban(Client *c) {
-       if(!c->isbanned)
+unfocus(Client *c, int setfocus)
+{
+       if (!c)

                return;
                return;

-       XMoveWindow(dpy, c->win, c->x, c->y);
-       c->isbanned = False;
+       grabbuttons(c, 0);
+       XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
+       if (setfocus) {
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+       }

 }
 
 void
 }
 
 void

-unmanage(Client *c) {
+unmanage(Client *c, int destroyed)
+{
+       Monitor *m = c->mon;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       wc.border_width = c->oldborder;
-       /* The server grab construct avoids race conditions. */
-       XGrabServer(dpy);
-       XSetErrorHandler(xerrordummy);
-       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+       if (c->swallowing) {
+               unswallow(c);
+               return;
+       }
+
+       Client *s = swallowingclient(c->win);
+       if (s) {
+               free(s->swallowing);
+               s->swallowing = NULL;
+               arrange(m);
+               focus(NULL);
+               return;
+       }
+

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

-       if(sel == c)
-               focus(NULL);
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       setclientstate(c, WithdrawnState);
-       free(c->tags);
+       if (!destroyed) {
+               wc.border_width = c->oldbw;
+               XGrabServer(dpy); /* avoid race conditions */
+               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();
+
+       if (!s) {
+               arrange(m);
+               focus(NULL);
+               updateclientlist();
+       }

 }
 
 void
 }
 
 void

-unmapnotify(XEvent *e) {
+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, 0);
+       }

 }
 
 void
 }
 
 void

-updatebarpos(void) {
-       XEvent ev;
+updatebars(void)
+{
+       Monitor *m;
+       XSetWindowAttributes wa = {
+               .override_redirect = True,
+               .background_pixel = 0,
+               .border_pixel = 0,
+               .colormap = cmap,
+               .event_mask = ButtonPressMask|ExposureMask
+       };
+       XClassHint ch = {"dwm", "dwm"};
+       for (m = mons; m; m = m->next) {
+               if (m->barwin)
+                       continue;
+               m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth,
+                                         InputOutput, visual,
+                                         CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
+               XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
+               XMapRaised(dpy, m->barwin);
+               XSetClassHint(dpy, m->barwin, &ch);
+       }
+}

 
 

-       wax = sx;
-       way = sy;
-       wah = sh;
-       waw = sw;
-       switch(bpos) {
-       default:
-               wah -= bh;
-               way += bh;
-               XMoveWindow(dpy, barwin, sx, sy);
-               break;
-       case BarBot:
-               wah -= bh;
-               XMoveWindow(dpy, barwin, sx, sy + wah);
-               break;
-       case BarOff:
-               XMoveWindow(dpy, barwin, sx, sy - bh);
-               break;
+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);
+}
+
+int
+updategeom(void)
+{
+       int dirty = 0;
+
+#ifdef XINERAMA
+       if (XineramaIsActive(dpy)) {
+               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 */
+               unique = ecalloc(nn, sizeof(XineramaScreenInfo));
+               for (i = 0, j = 0; i < nn; i++)
+                       if (isuniquegeom(unique, j, &info[i]))
+                               memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
+               XFree(info);
+               nn = j;
+               if (n <= nn) { /* new monitors available */
+                       for (i = 0; i < (nn - n); i++) {
+                               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 = 1;
+                                       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 ((c = m->clients)) {
+                                       dirty = 1;
+                                       m->clients = c->next;
+                                       detachstack(c);
+                                       c->mon = mons;
+                                       attach(c);
+                                       attachstack(c);
+                               }
+                               if (m == selmon)
+                                       selmon = mons;
+                               cleanupmon(m);
+                       }
+               }
+               free(unique);
+       } else
+#endif /* XINERAMA */
+       { /* default monitor setup */
+               if (!mons)
+                       mons = createmon();
+               if (mons->mw != sw || mons->mh != sh) {
+                       dirty = 1;
+                       mons->mw = mons->ww = sw;
+                       mons->mh = mons->wh = sh;
+                       updatebarpos(mons);
+               }

        }
        }

-       XSync(dpy, False);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+       if (dirty) {
+               selmon = mons;
+               selmon = wintomon(root);
+       }
+       return dirty;

 }
 
 void
 }
 
 void

-updatesizehints(Client *c) {
+updatenumlockmask(void)
+{
+       unsigned int i, j;
+       XModifierKeymap *modmap;
+
+       numlockmask = 0;
+       modmap = XGetModifierMapping(dpy);
+       for (i = 0; i < 8; i++)
+               for (j = 0; j < modmap->max_keypermod; j++)
+                       if (modmap->modifiermap[i * modmap->max_keypermod + j]
+                               == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+       XFreeModifiermap(modmap);
+}
+
+void
+updatesizehints(Client *c)
+{

        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 

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

                size.flags = PSize;
                size.flags = PSize;

-       c->flags = size.flags;
-       if(c->flags & PBaseSize) {
+       if (size.flags & PBaseSize) {

                c->basew = size.base_width;
                c->baseh = size.base_height;
                c->basew = size.base_width;
                c->baseh = size.base_height;

-       }
-       else if(c->flags & PMinSize) {
+       } else if (size.flags & PMinSize) {

                c->basew = size.min_width;
                c->baseh = size.min_height;
                c->basew = size.min_width;
                c->baseh = size.min_height;

-       }
-       else
+       } else

                c->basew = c->baseh = 0;
                c->basew = c->baseh = 0;

-       if(c->flags & PResizeInc) {
+       if (size.flags & PResizeInc) {

                c->incw = size.width_inc;
                c->inch = size.height_inc;
                c->incw = size.width_inc;
                c->inch = size.height_inc;

-       }
-       else
+       } else

                c->incw = c->inch = 0;
                c->incw = c->inch = 0;

-       if(c->flags & PMaxSize) {
+       if (size.flags & PMaxSize) {

                c->maxw = size.max_width;
                c->maxh = size.max_height;
                c->maxw = size.max_width;
                c->maxh = size.max_height;

-       }
-       else
+       } else

                c->maxw = c->maxh = 0;
                c->maxw = c->maxh = 0;

-       if(c->flags & PMinSize) {
+       if (size.flags & PMinSize) {

                c->minw = size.min_width;
                c->minh = size.min_height;
                c->minw = size.min_width;
                c->minh = size.min_height;

-       }
-       else if(c->flags & PBaseSize) {
+       } else if (size.flags & PBaseSize) {

                c->minw = size.base_width;
                c->minh = size.base_height;
                c->minw = size.base_width;
                c->minh = size.base_height;

-       }
-       else
+       } else

                c->minw = c->minh = 0;
                c->minw = c->minh = 0;

-       if(c->flags & PAspect) {
-               c->minax = size.min_aspect.x;
-               c->maxax = size.max_aspect.x;
-               c->minay = size.min_aspect.y;
-               c->maxay = size.max_aspect.y;
+       if (size.flags & PAspect) {
+               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->maxh && c->maxw == c->minw && c->maxh == c->minh);
+}
+
+void
+updatestatus(void)
+{
+       if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+               strcpy(stext, "dwm-"VERSION);
+       drawbar(selmon);
+}
+
+void
+updatetitle(Client *c)
+{
+       if (!gettextprop(c->win, netatom[NetWMName], 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
+updatewindowtype(Client *c)
+{
+       Atom state = getatomprop(c, netatom[NetWMState]);
+       Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
+
+       if (state == netatom[NetWMFullscreen])
+               setfullscreen(c, 1);
+       if (wtype == netatom[NetWMWindowTypeDialog])
+               c->isfloating = 1;
+}
+
+void
+updatewmhints(Client *c)
+{
+       XWMHints *wmh;
+
+       if ((wmh = XGetWMHints(dpy, c->win))) {
+               if (c == selmon->sel && wmh->flags & XUrgencyHint) {
+                       wmh->flags &= ~XUrgencyHint;
+                       XSetWMHints(dpy, c->win, wmh);
+               } else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
+               if (wmh->flags & InputHint)
+                       c->neverfocus = !wmh->input;
+               else
+                       c->neverfocus = 0;
+               XFree(wmh);

        }
        }

-       else
-               c->minax = c->maxax = c->minay = c->maxay = 0;
-       c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-                       && c->maxw == c->minw && c->maxh == c->minh);

 }
 
 void
 }
 
 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);
+view(const Arg *arg)
+{
+       if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+               return;
+       selmon->seltags ^= 1; /* toggle sel tagset */
+       if (arg->ui & TAGMASK)
+               selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+       focus(NULL);
+       arrange(selmon);
+}
+
+pid_t
+winpid(Window w)
+{
+
+       pid_t result = 0;
+
+#ifdef __linux__
+       xcb_res_client_id_spec_t spec = {0};
+       spec.client = w;
+       spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
+
+       xcb_generic_error_t *e = NULL;
+       xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec);
+       xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e);
+
+       if (!r)
+               return (pid_t)0;
+
+       xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r);
+       for (; i.rem; xcb_res_client_id_value_next(&i)) {
+               spec = i.data->spec;
+               if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) {
+                       uint32_t *t = xcb_res_client_id_value_value(i.data);
+                       result = *t;
+                       break;
+               }
+       }
+
+       free(r);
+
+       if (result == (pid_t)-1)
+               result = 0;
+
+#endif /* __linux__ */
+
+#ifdef __OpenBSD__
+        Atom type;
+        int format;
+        unsigned long len, bytes;
+        unsigned char *prop;
+        pid_t ret;
+
+        if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop)
+               return 0;
+
+        ret = *(pid_t*)prop;
+        XFree(prop);
+        result = ret;
+
+#endif /* __OpenBSD__ */
+       return result;
+}
+
+pid_t
+getparentprocess(pid_t p)
+{
+       unsigned int v = 0;
+
+#ifdef __linux__
+       FILE *f;
+       char buf[256];
+       snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
+
+       if (!(f = fopen(buf, "r")))
+               return 0;
+
+       fscanf(f, "%*u %*s %*c %u", &v);
+       fclose(f);
+#endif /* __linux__*/
+
+#ifdef __OpenBSD__
+       int n;
+       kvm_t *kd;
+       struct kinfo_proc *kp;
+
+       kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL);
+       if (!kd)
+               return 0;
+
+       kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n);
+       v = kp->p_ppid;
+#endif /* __OpenBSD__ */
+
+       return (pid_t)v;
+}
+
+int
+isdescprocess(pid_t p, pid_t c)
+{
+       while (p != c && c != 0)
+               c = getparentprocess(c);
+
+       return (int)c;
+}
+
+Client *
+termforwin(const Client *w)
+{
+       Client *c;
+       Monitor *m;
+
+       if (!w->pid || w->isterminal)
+               return NULL;
+
+       for (m = mons; m; m = m->next) {
+               for (c = m->clients; c; c = c->next) {
+                       if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
+                               return c;
+               }
+       }
+
+       return NULL;
+}
+
+Client *
+swallowingclient(Window w)
+{
+       Client *c;
+       Monitor *m;
+
+       for (m = mons; m; m = m->next) {
+               for (c = m->clients; c; c = c->next) {
+                       if (c->swallowing && c->swallowing->win == w)
+                               return c;
+               }
+       }
+
+       return NULL;
+}
+
+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

- * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
- * default error handler, which may call exit.  */
+ * ignored (especially on UnmapNotify's). Other types of errors call Xlibs
+ * default error handler, which may call exit. */

 int
 int

-xerror(Display *dpy, XErrorEvent *ee) {
-       if(ee->error_code == BadWindow
+xerror(Display *dpy, XErrorEvent *ee)
+{
+       if (ee->error_code == BadWindow

        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)

+       || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)

        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;


@@ -1636,76 +2393,150 @@ xerror(Display *dpy, XErrorEvent *ee) {
 }
 
 int
 }
 
 int

-xerrordummy(Display *dsply, XErrorEvent *ee) {
+xerrordummy(Display *dpy, XErrorEvent *ee)
+{

        return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
 int
        return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
 int

-xerrorstart(Display *dsply, XErrorEvent *ee) {
-       otherwm = True;
+xerrorstart(Display *dpy, XErrorEvent *ee)
+{
+       die("dwm: another window manager is already running");

        return -1;
 }
 
 void
        return -1;
 }
 
 void

-view(const char *arg) {
-       unsigned int i;
+xinitvisual()
+{
+       XVisualInfo *infos;
+       XRenderPictFormat *fmt;
+       int nitems;
+       int i;
+
+       XVisualInfo tpl = {
+               .screen = screen,
+               .depth = 32,
+               .class = TrueColor
+       };
+       long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
+
+       infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
+       visual = NULL;
+       for(i = 0; i < nitems; i ++) {
+               fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
+               if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
+                       visual = infos[i].visual;
+                       depth = infos[i].depth;
+                       cmap = XCreateColormap(dpy, root, visual, AllocNone);
+                       useargb = 1;
+                       break;
+               }
+       }
+
+       XFree(infos);

 
 

-       memcpy(prevtags, seltags, sizeof seltags);
-       for(i = 0; i < ntags; i++)
-               seltags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               seltags[i] = True;
-       arrange();
+       if (! visual) {
+               visual = DefaultVisual(dpy, screen);
+               depth = DefaultDepth(dpy, screen);
+               cmap = DefaultColormap(dpy, screen);
+       }

 }
 
 void
 }
 
 void

-viewprevtag(const char *arg) {
-       static Bool tmptags[sizeof tags / sizeof tags[0]];
+zoom(const Arg *arg)
+{
+       Client *c = selmon->sel;

 
 

-       memcpy(tmptags, seltags, sizeof seltags);
-       memcpy(seltags, prevtags, sizeof seltags);
-       memcpy(prevtags, tmptags, sizeof seltags);
-       arrange();
+       if (!selmon->lt[selmon->sellt]->arrange
+       || (selmon->sel && selmon->sel->isfloating))
+               return;
+       if (c == nexttiled(selmon->clients))
+               if (!c || !(c = nexttiled(c->next)))
+                       return;
+       pop(c);

 }
 
 void
 }
 
 void

-zoom(const char *arg) {
-       Client *c;
+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
+{
+       char *sdst = NULL;
+       int *idst = NULL;
+       float *fdst = NULL;
+
+       sdst = dst;
+       idst = dst;
+       fdst = dst;
+
+       char fullname[256];
+       char *type;
+       XrmValue ret;
+
+       snprintf(fullname, sizeof(fullname), "%s.%s", "dwm", name);
+       fullname[sizeof(fullname) - 1] = '\0';
+
+       XrmGetResource(db, fullname, "*", &type, &ret);
+       if (!(ret.addr == NULL || strncmp("String", type, 64)))
+       {
+               switch (rtype) {
+               case STRING:
+                       strcpy(sdst, ret.addr);
+                       break;
+               case INTEGER:
+                       *idst = strtoul(ret.addr, NULL, 10);
+                       break;
+               case FLOAT:
+                       *fdst = strtof(ret.addr, NULL);
+                       break;
+               }
+       }
+}

 
 

-       if(!sel || !ISTILE || sel->isfloating)
+void
+load_xresources(void)
+{
+       Display *display;
+       char *resm;
+       XrmDatabase db;
+       ResourcePref *p;
+
+       display = XOpenDisplay(NULL);
+       resm = XResourceManagerString(display);
+       if (!resm)

                return;
                return;

-       if((c = sel) == nexttiled(clients))
-               if(!(c = nexttiled(c->next)))
-                       return;
-       detach(c);
-       attach(c);
-       focus(c);
-       arrange();
+
+       db = XrmGetStringDatabase(resm);
+       for (p = resources; p < resources + LENGTH(resources); p++)
+               resource_load(db, p->name, p->type, p->dst);
+       XCloseDisplay(display);

 }
 
 int
 }
 
 int

-main(int argc, char *argv[]) {
-       if(argc == 2 && !strcmp("-v", argv[1]))
-               eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
-       else if(argc != 1)
-               eprint("usage: dwm [-v]\n");
-
-       setlocale(LC_CTYPE, "");
-       if(!(dpy = XOpenDisplay(0)))
-               eprint("dwm: cannot open display\n");
-       screen = DefaultScreen(dpy);
-       root = RootWindow(dpy, screen);
-
+main(int argc, char *argv[])
+{
+       if (argc == 2 && !strcmp("-v", argv[1]))
+               die("dwm-"VERSION);
+       else if (argc != 1)
+               die("usage: dwm [-v]");
+       if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fputs("warning: no locale support\n", stderr);
+       if (!(dpy = XOpenDisplay(NULL)))
+               die("dwm: cannot open display");
+       if (!(xcon = XGetXCBConnection(dpy)))
+               die("dwm: cannot get xcb connection\n");

        checkotherwm();
        checkotherwm();

+       XrmInitialize();
+       load_xresources();

        setup();
        setup();

-       drawbar();
+#ifdef __OpenBSD__
+       if (pledge("stdio rpath proc exec ps", NULL) == -1)
+               die("pledge");
+#endif /* __OpenBSD__ */

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

+       if(restart) execvp(argv[0], argv);

        cleanup();
        cleanup();

-

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

-       return 0;
+       return EXIT_SUCCESS;

 }
 }