patch: xresources

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index ffc8864..5a18093 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -3,7 +3,7 @@
  * 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.
  *
  * The event handlers of dwm are organized in an array which is accessed
  * allowed to select for this event mask.
  *
  * The event handlers of dwm are organized in an array which is accessed


@@ -11,7 +11,7 @@
  * in O(1) time.
  *
  * Each child of the root window is called a client, except windows which have
  * in O(1) time.
  *
  * Each child of the root window is called a client, except windows which have

- * set the override_redirect flag.  Clients are organized in a linked client
+ * 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.
  * 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.


@@ -22,8 +22,8 @@
  */
 #include <errno.h>
 #include <locale.h>
  */
 #include <errno.h>
 #include <locale.h>

-#include <stdarg.h>

 #include <signal.h>
 #include <signal.h>

+#include <stdarg.h>

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


@@ -36,9 +36,17 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>

+#include <X11/Xresource.h>

 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif /* XINERAMA */
 #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"
 
 #include "drw.h"
 #include "util.h"


@@ -54,12 +62,14 @@
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)

-#define TEXTW(X)                (drw_font_getexts_width(drw->font, X, strlen(X)) + drw->font->h)
+#define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
+
+#define OPAQUE                  0xffU

 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */

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


@@ -91,9 +101,11 @@ struct Client {
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
        unsigned int tags;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
        unsigned int tags;

-       Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+       int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
+       pid_t pid;

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

+       Client *swallowing;

        Monitor *mon;
        Window win;
 };
        Monitor *mon;
        Window win;
 };


@@ -118,11 +130,12 @@ struct Monitor {
        int by;               /* bar geometry */
        int mx, my, mw, mh;   /* screen size */
        int wx, wy, ww, wh;   /* window area  */
        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];
        unsigned int seltags;
        unsigned int sellt;
        unsigned int tagset[2];

-       Bool showbar;
-       Bool topbar;
+       int showbar;
+       int topbar;

        Client *clients;
        Client *sel;
        Client *stack;
        Client *clients;
        Client *sel;
        Client *stack;


@@ -136,13 +149,28 @@ typedef struct {
        const char *instance;
        const char *title;
        unsigned int tags;
        const char *instance;
        const char *title;
        unsigned int tags;

-       Bool isfloating;
+       int isfloating;
+       int isterminal;
+       int noswallow;

        int monitor;
 } Rule;
 
        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);
 /* function declarations */
 static void applyrules(Client *c);

-static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
+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 arrange(Monitor *m);
 static void arrangemon(Monitor *m);
 static void attach(Client *c);


@@ -151,7 +179,6 @@ static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);
 static void cleanupmon(Monitor *mon);
 static void checkotherwm(void);
 static void cleanup(void);
 static void cleanupmon(Monitor *mon);

-static void clearurgent(Client *c);

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


@@ -169,10 +196,11 @@ static void focus(Client *c);
 static void focusin(XEvent *e);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
 static void focusin(XEvent *e);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);

-static Bool getrootptr(int *x, int *y);
+static Atom getatomprop(Client *c, Atom prop);
+static int getrootptr(int *x, int *y);

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

-static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, Bool focused);
+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 grabkeys(void);
 static void incnmaster(const Arg *arg);
 static void keypress(XEvent *e);


@@ -188,42 +216,47 @@ 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 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, Bool interact);
+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 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 Bool sendevent(Client *c, Atom proto);
+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 sendmon(Client *c, Monitor *m);
 static void setclientstate(Client *c, long state);
 static void setfocus(Client *c);

-static void setfullscreen(Client *c, Bool fullscreen);
+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 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 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 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 toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);

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

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

-static Bool updategeom(void);

 static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static void updateclientlist(void);
 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 updatenumlockmask(void);
 static void updatesizehints(Client *c);
 static void updatestatus(void);

-static void updatewindowtype(Client *c);

 static void updatetitle(Client *c);
 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 void updatewmhints(Client *c);
 static void view(const Arg *arg);
 static Client *wintoclient(Window w);


@@ -231,7 +264,16 @@ 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 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 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";
 
 /* variables */
 static const char broken[] = "broken";


@@ -239,6 +281,7 @@ 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 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 *) = {
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {


@@ -258,14 +301,21 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];

-static Bool running = True;
+static int restart = 0;
+static int running = 1;

 static Cur *cursor[CurLast];
 static Cur *cursor[CurLast];

-static ClrScheme scheme[SchemeLast];
+static Clr **scheme;

 static Display *dpy;
 static Drw *drw;
 static Display *dpy;
 static Drw *drw;

-static Fnt *fnt;

 static Monitor *mons, *selmon;
 static Monitor *mons, *selmon;

-static Window root;
+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"
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"


@@ -275,7 +325,8 @@ struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
 
 /* function implementations */
 void
 
 /* function implementations */
 void

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

        const char *class, *instance;
        unsigned int i;
        const Rule *r;
        const char *class, *instance;
        unsigned int i;
        const Rule *r;


@@ -283,131 +334,186 @@ applyrules(Client *c) {
        XClassHint ch = { NULL, NULL };
 
        /* rule matching */
        XClassHint ch = { NULL, NULL };
 
        /* rule matching */

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

        XGetClassHint(dpy, c->win, &ch);
        class    = ch.res_class ? ch.res_class : broken;
        instance = ch.res_name  ? ch.res_name  : broken;
 
        XGetClassHint(dpy, c->win, &ch);
        class    = ch.res_class ? ch.res_class : broken;
        instance = ch.res_name  ? ch.res_name  : broken;
 

-       for(i = 0; i < LENGTH(rules); i++) {
+       for (i = 0; i < LENGTH(rules); i++) {

                r = &rules[i];
                r = &rules[i];

-               if((!r->title || strstr(c->name, r->title))
+               if ((!r->title || strstr(c->name, r->title))

                && (!r->class || strstr(class, r->class))
                && (!r->instance || strstr(instance, r->instance)))
                {
                && (!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;
                        c->isfloating = r->isfloating;
                        c->tags |= r->tags;

-                       for(m = mons; m && m->num != r->monitor; m = m->next);
-                       if(m)
+                       for (m = mons; m && m->num != r->monitor; m = m->next);
+                       if (m)

                                c->mon = 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);
        c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
 }
 
                XFree(ch.res_name);
        c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
 }
 

-Bool
-applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
-       Bool baseismin;
+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);
        Monitor *m = c->mon;
 
        /* set minimum possible */
        *w = MAX(1, *w);
        *h = MAX(1, *h);

-       if(interact) {
-               if(*x > sw)
+       if (interact) {
+               if (*x > sw)

                        *x = sw - WIDTH(c);
                        *x = sw - WIDTH(c);

-               if(*y > sh)
+               if (*y > sh)

                        *y = sh - HEIGHT(c);
                        *y = sh - HEIGHT(c);

-               if(*x + *w + 2 * c->bw < 0)
+               if (*x + *w + 2 * c->bw < 0)

                        *x = 0;
                        *x = 0;

-               if(*y + *h + 2 * c->bw < 0)
+               if (*y + *h + 2 * c->bw < 0)

                        *y = 0;
                        *y = 0;

-       }
-       else {
-               if(*x >= m->wx + m->ww)
+       } else {
+               if (*x >= m->wx + m->ww)

                        *x = m->wx + m->ww - WIDTH(c);
                        *x = m->wx + m->ww - WIDTH(c);

-               if(*y >= m->wy + m->wh)
+               if (*y >= m->wy + m->wh)

                        *y = m->wy + m->wh - HEIGHT(c);
                        *y = m->wy + m->wh - HEIGHT(c);

-               if(*x + *w + 2 * c->bw <= m->wx)
+               if (*x + *w + 2 * c->bw <= m->wx)

                        *x = m->wx;
                        *x = m->wx;

-               if(*y + *h + 2 * c->bw <= m->wy)
+               if (*y + *h + 2 * c->bw <= m->wy)

                        *y = m->wy;
        }
                        *y = m->wy;
        }

-       if(*h < bh)
+       if (*h < bh)

                *h = bh;
                *h = bh;

-       if(*w < bh)
+       if (*w < bh)

                *w = bh;
                *w = bh;

-       if(resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
+       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;
                /* 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 */
+               if (!baseismin) { /* temporarily remove base dimensions */

                        *w -= c->basew;
                        *h -= c->baseh;
                }
                /* adjust for aspect limits */
                        *w -= c->basew;
                        *h -= c->baseh;
                }
                /* adjust for aspect limits */

-               if(c->mina > 0 && c->maxa > 0) {
-                       if(c->maxa < (float)*w / *h)
+               if (c->mina > 0 && c->maxa > 0) {
+                       if (c->maxa < (float)*w / *h)

                                *w = *h * c->maxa + 0.5;
                                *w = *h * c->maxa + 0.5;

-                       else if(c->mina < (float)*h / *w)
+                       else if (c->mina < (float)*h / *w)

                                *h = *w * c->mina + 0.5;
                }
                                *h = *w * c->mina + 0.5;
                }

-               if(baseismin) { /* increment calculation requires this */
+               if (baseismin) { /* increment calculation requires this */

                        *w -= c->basew;
                        *h -= c->baseh;
                }
                /* adjust for increment value */
                        *w -= c->basew;
                        *h -= c->baseh;
                }
                /* adjust for increment value */

-               if(c->incw)
+               if (c->incw)

                        *w -= *w % c->incw;
                        *w -= *w % c->incw;

-               if(c->inch)
+               if (c->inch)

                        *h -= *h % c->inch;
                /* restore base dimensions */
                *w = MAX(*w + c->basew, c->minw);
                *h = MAX(*h + c->baseh, c->minh);
                        *h -= *h % c->inch;
                /* restore base dimensions */
                *w = MAX(*w + c->basew, c->minw);
                *h = MAX(*h + c->baseh, c->minh);

-               if(c->maxw)
+               if (c->maxw)

                        *w = MIN(*w, c->maxw);
                        *w = MIN(*w, c->maxw);

-               if(c->maxh)
+               if (c->maxh)

                        *h = MIN(*h, c->maxh);
        }
        return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
 }
 
 void
                        *h = MIN(*h, c->maxh);
        }
        return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
 }
 
 void

-arrange(Monitor *m) {
-       if(m)
+arrange(Monitor *m)
+{
+       if (m)

                showhide(m->stack);
                showhide(m->stack);

-       else for(m = mons; m; m = m->next)
+       else for (m = mons; m; m = m->next)

                showhide(m->stack);
                showhide(m->stack);

-       if(m) {
+       if (m) {

                arrangemon(m);
                restack(m);
                arrangemon(m);
                restack(m);

-       } else for(m = mons; m; m = m->next)
+       } else for (m = mons; m; m = m->next)

                arrangemon(m);
 }
 
 void
                arrangemon(m);
 }
 
 void

-arrangemon(Monitor *m) {
+arrangemon(Monitor *m)
+{

        strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
        strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);

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

                m->lt[m->sellt]->arrange(m);
 }
 
 void
                m->lt[m->sellt]->arrange(m);
 }
 
 void

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

        c->next = c->mon->clients;
        c->mon->clients = c;
 }
 
 void
        c->next = c->mon->clients;
        c->mon->clients = c;
 }
 
 void

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

        c->snext = c->mon->stack;
        c->mon->stack = c;
 }
 
 void
        c->snext = c->mon->stack;
        c->mon->stack = c;
 }
 
 void

-buttonpress(XEvent *e) {
+swallow(Client *p, Client *c)
+{
+
+       if (c->noswallow || c->isterminal)
+               return;
+       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
+buttonpress(XEvent *e)
+{

        unsigned int i, x, click;
        Arg arg = {0};
        Client *c;
        unsigned int i, x, click;
        Arg arg = {0};
        Client *c;


@@ -416,39 +522,40 @@ buttonpress(XEvent *e) {
 
        click = ClkRootWin;
        /* focus monitor if necessary */
 
        click = ClkRootWin;
        /* focus monitor if necessary */

-       if((m = wintomon(ev->window)) && m != selmon) {
-               unfocus(selmon->sel, True);
+       if ((m = wintomon(ev->window)) && m != selmon) {
+               unfocus(selmon->sel, 1);

                selmon = m;
                focus(NULL);
        }
                selmon = m;
                focus(NULL);
        }

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

                i = x = 0;
                do
                        x += TEXTW(tags[i]);
                i = x = 0;
                do
                        x += TEXTW(tags[i]);

-               while(ev->x >= x && ++i < LENGTH(tags));
-               if(i < LENGTH(tags)) {
+               while (ev->x >= x && ++i < LENGTH(tags));
+               if (i < LENGTH(tags)) {

                        click = ClkTagBar;
                        arg.ui = 1 << i;
                        click = ClkTagBar;
                        arg.ui = 1 << i;

-               }
-               else if(ev->x < x + blw)
+               } else if (ev->x < x + blw)

                        click = ClkLtSymbol;
                        click = ClkLtSymbol;

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

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

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

                focus(c);
                focus(c);

+               restack(selmon);
+               XAllowEvents(dpy, ReplayPointer, CurrentTime);

                click = ClkClientWin;
        }
                click = ClkClientWin;
        }

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

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

-checkotherwm(void) {
+checkotherwm(void)
+{

        xerrorxlib = XSetErrorHandler(xerrorstart);
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        xerrorxlib = XSetErrorHandler(xerrorstart);
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);


@@ -458,29 +565,27 @@ checkotherwm(void) {
 }
 
 void
 }
 
 void

-cleanup(void) {
+cleanup(void)
+{

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

+       size_t i;

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

-       for(m = mons; m; m = m->next)
-               while(m->stack)
-                       unmanage(m->stack, False);
+       for (m = mons; m; m = m->next)
+               while (m->stack)
+                       unmanage(m->stack, 0);

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

-       while(mons)
+       while (mons)

                cleanupmon(mons);
                cleanupmon(mons);

-       drw_cur_free(drw, cursor[CurNormal]);
-       drw_cur_free(drw, cursor[CurResize]);
-       drw_cur_free(drw, cursor[CurMove]);
-       drw_font_free(dpy, fnt);
-       drw_clr_free(scheme[SchemeNorm].border);
-       drw_clr_free(scheme[SchemeNorm].bg);
-       drw_clr_free(scheme[SchemeNorm].fg);
-       drw_clr_free(scheme[SchemeSel].border);
-       drw_clr_free(scheme[SchemeSel].bg);
-       drw_clr_free(scheme[SchemeSel].fg);
+       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);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        drw_free(drw);
        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);


@@ -488,13 +593,14 @@ cleanup(void) {
 }
 
 void
 }
 
 void

-cleanupmon(Monitor *mon) {
+cleanupmon(Monitor *mon)
+{

        Monitor *m;
 
        Monitor *m;
 

-       if(mon == mons)
+       if (mon == mons)

                mons = mons->next;
        else {
                mons = mons->next;
        else {

-               for(m = mons; m && m->next != mon; m = m->next);
+               for (m = mons; m && m->next != mon; m = m->next);

                m->next = mon->next;
        }
        XUnmapWindow(dpy, mon->barwin);
                m->next = mon->next;
        }
        XUnmapWindow(dpy, mon->barwin);


@@ -503,40 +609,27 @@ cleanupmon(Monitor *mon) {
 }
 
 void
 }
 
 void

-clearurgent(Client *c) {
-       XWMHints *wmh;
-
-       c->isurgent = False;
-       if(!(wmh = XGetWMHints(dpy, c->win)))
-               return;
-       wmh->flags &= ~XUrgencyHint;
-       XSetWMHints(dpy, c->win, wmh);
-       XFree(wmh);
-}
-
-void
-clientmessage(XEvent *e) {
+clientmessage(XEvent *e)
+{

        XClientMessageEvent *cme = &e->xclient;
        Client *c = wintoclient(cme->window);
 
        XClientMessageEvent *cme = &e->xclient;
        Client *c = wintoclient(cme->window);
 

-       if(!c)
+       if (!c)

                return;
                return;

-       if(cme->message_type == netatom[NetWMState]) {
-               if(cme->data.l[1] == netatom[NetWMFullscreen] || cme->data.l[2] == netatom[NetWMFullscreen])
+       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    */
                        setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */

-                                     || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
-       }
-       else if(cme->message_type == netatom[NetActiveWindow]) {
-               if(!ISVISIBLE(c)) {
-                       c->mon->seltags ^= 1;
-                       c->mon->tagset[c->mon->seltags] = c->tags;
-               }
-               pop(c);
+                               || (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;


@@ -554,21 +647,27 @@ configure(Client *c) {
 }
 
 void
 }
 
 void

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

        Monitor *m;
        Monitor *m;

+       Client *c;

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

-       Bool dirty;
+       int dirty;

 
 

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

-               if(updategeom() || dirty) {
+               if (updategeom() || dirty) {

                        drw_resize(drw, sw, bh);
                        updatebars();
                        drw_resize(drw, sw, bh);
                        updatebars();

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

+                       }

                        focus(NULL);
                        arrange(NULL);
                }
                        focus(NULL);
                        arrange(NULL);
                }


@@ -576,46 +675,45 @@ configurenotify(XEvent *e) {
 }
 
 void
 }
 
 void

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

        Client *c;
        Monitor *m;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        Client *c;
        Monitor *m;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 

-       if((c = wintoclient(ev->window))) {
-               if(ev->value_mask & CWBorderWidth)
+       if ((c = wintoclient(ev->window))) {
+               if (ev->value_mask & CWBorderWidth)

                        c->bw = ev->border_width;
                        c->bw = ev->border_width;

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

                        m = c->mon;
                        m = c->mon;

-                       if(ev->value_mask & CWX) {
+                       if (ev->value_mask & CWX) {

                                c->oldx = c->x;
                                c->x = m->mx + ev->x;
                        }
                                c->oldx = c->x;
                                c->x = m->mx + ev->x;
                        }

-                       if(ev->value_mask & CWY) {
+                       if (ev->value_mask & CWY) {

                                c->oldy = c->y;
                                c->y = m->my + ev->y;
                        }
                                c->oldy = c->y;
                                c->y = m->my + ev->y;
                        }

-                       if(ev->value_mask & CWWidth) {
+                       if (ev->value_mask & CWWidth) {

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

-                       if(ev->value_mask & CWHeight) {
+                       if (ev->value_mask & CWHeight) {

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

-                       if((c->x + c->w) > m->mx + m->mw && c->isfloating)
+                       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 */
                                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)
+                       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 */
                                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)))
+                       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;


@@ -629,16 +727,17 @@ configurerequest(XEvent *e) {
 }
 
 Monitor *
 }
 
 Monitor *

-createmon(void) {
+createmon(void)
+{

        Monitor *m;
 
        Monitor *m;
 

-       if(!(m = (Monitor *)calloc(1, sizeof(Monitor))))
-               die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
+       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->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);
        m->lt[0] = &layouts[0];
        m->lt[1] = &layouts[1 % LENGTH(layouts)];
        strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);


@@ -646,156 +745,165 @@ createmon(void) {
 }
 
 void
 }
 
 void

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

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

-       if((c = wintoclient(ev->window)))
-               unmanage(c, True);
+       if ((c = wintoclient(ev->window)))
+               unmanage(c, 1);
+
+       else if ((c = swallowingclient(ev->window)))
+               unmanage(c->swallowing, 1);

 }
 
 void
 }
 
 void

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

        Client **tc;
 
        Client **tc;
 

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

        *tc = c->next;
 }
 
 void
        *tc = c->next;
 }
 
 void

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

        Client **tc, *t;
 
        Client **tc, *t;
 

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

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

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

                c->mon->sel = t;
        }
 }
 
 Monitor *
                c->mon->sel = t;
        }
 }
 
 Monitor *

-dirtomon(int dir) {
+dirtomon(int dir)
+{

        Monitor *m = NULL;
 
        Monitor *m = NULL;
 

-       if(dir > 0) {
-               if(!(m = selmon->next))
+       if (dir > 0) {
+               if (!(m = selmon->next))

                        m = mons;
                        m = mons;

-       }
-       else if(selmon == mons)
-               for(m = mons; m->next; m = m->next);
+       } else if (selmon == mons)
+               for (m = mons; m->next; m = m->next);

        else
        else

-               for(m = mons; m->next != selmon; m = m->next);
+               for (m = mons; m->next != selmon; m = m->next);

        return m;
 }
 
 void
        return m;
 }
 
 void

-drawbar(Monitor *m) {
-       int x, xx, w;
+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;
 
        unsigned int i, occ = 0, urg = 0;
        Client *c;
 

-       for(c = m->clients; c; c = c->next) {
+       if (!m->showbar)
+               return;
+
+       /* 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);
+       }
+
+       for (c = m->clients; c; c = c->next) {

                occ |= c->tags;
                occ |= c->tags;

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

                        urg |= c->tags;
        }
        x = 0;
                        urg |= c->tags;
        }
        x = 0;

-       for(i = 0; i < LENGTH(tags); i++) {
+       for (i = 0; i < LENGTH(tags); i++) {

                w = TEXTW(tags[i]);
                w = TEXTW(tags[i]);

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

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_text(drw, x, 0, w, bh, m->ltsymbol, 0);
-       x += w;
-       xx = x;
-       if(m == selmon) { /* status is only drawn on selected monitor */
-               w = TEXTW(stext);
-               x = m->ww - w;
-               if(x < xx) {
-                       x = xx;
-                       w = m->ww - xx;
-               }
-               drw_text(drw, x, 0, w, bh, stext, 0);
-       }
-       else
-               x = m->ww;
-       if((w = x - xx) > bh) {
-               x = xx;
-               if(m->sel) {
-                       drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, m->sel->name, 0);
-                       drw_rect(drw, x, 0, w, bh, m->sel->isfixed, m->sel->isfloating, 0);
-               }
-               else {
-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, NULL, 0);
+       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
                }
        }
        drw_map(drw, m->barwin, 0, 0, m->ww, bh);
 }
 
 void

-drawbars(void) {
+drawbars(void)
+{

        Monitor *m;
 
        Monitor *m;
 

-       for(m = mons; m; m = m->next)
+       for (m = mons; m; m = m->next)

                drawbar(m);
 }
 
 void
                drawbar(m);
 }
 
 void

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

        Client *c;
        Monitor *m;
        XCrossingEvent *ev = &e->xcrossing;
 
        Client *c;
        Monitor *m;
        XCrossingEvent *ev = &e->xcrossing;
 

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

                return;
        c = wintoclient(ev->window);
        m = c ? c->mon : wintomon(ev->window);
                return;
        c = wintoclient(ev->window);
        m = c ? c->mon : wintomon(ev->window);

-       if(m != selmon) {
-               unfocus(selmon->sel, True);
+       if (m != selmon) {
+               unfocus(selmon->sel, 1);

                selmon = m;
                selmon = m;

-       }
-       else if(!c || c == selmon->sel)
+       } else if (!c || c == selmon->sel)

                return;
        focus(c);
 }
 
 void
                return;
        focus(c);
 }
 
 void

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

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

-       if(ev->count == 0 && (m = wintomon(ev->window)))
+       if (ev->count == 0 && (m = wintomon(ev->window)))

                drawbar(m);
 }
 
 void
                drawbar(m);
 }
 
 void

-focus(Client *c) {
-       if(!c || !ISVISIBLE(c))
-               for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
-       /* was if(selmon->sel) */
-       if(selmon->sel && selmon->sel != c)
-               unfocus(selmon->sel, False);
-       if(c) {
-               if(c->mon != selmon)
+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;
                        selmon = c->mon;

-               if(c->isurgent)
-                       clearurgent(c);
+               if (c->isurgent)
+                       seturgent(c, 0);

                detachstack(c);
                attachstack(c);
                detachstack(c);
                attachstack(c);

-               grabbuttons(c, True);
-               XSetWindowBorder(dpy, c->win, scheme[SchemeSel].border->rgb);
+               grabbuttons(c, 1);
+               XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);

                setfocus(c);
                setfocus(c);

-       }
-       else {
+       } else {

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


@@ -803,71 +911,75 @@ focus(Client *c) {
        drawbars();
 }
 
        drawbars();
 }
 

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

 void
 void

-focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+focusin(XEvent *e)
+{

        XFocusChangeEvent *ev = &e->xfocus;
 
        XFocusChangeEvent *ev = &e->xfocus;
 

-       if(selmon->sel && ev->window != selmon->sel->win)
+       if (selmon->sel && ev->window != selmon->sel->win)

                setfocus(selmon->sel);
 }
 
 void
                setfocus(selmon->sel);
 }
 
 void

-focusmon(const Arg *arg) {
+focusmon(const Arg *arg)
+{

        Monitor *m;
 
        Monitor *m;
 

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

                return;
                return;

-       if((m = dirtomon(arg->i)) == selmon)
+       if ((m = dirtomon(arg->i)) == selmon)

                return;
                return;

-       unfocus(selmon->sel, False); /* s/True/False/ fixes input focus issues
-                                       in gedit and anjuta */
+       unfocus(selmon->sel, 0);

        selmon = m;
        focus(NULL);
 }
 
 void
        selmon = m;
        focus(NULL);
 }
 
 void

-focusstack(const Arg *arg) {
+focusstack(const Arg *arg)
+{

        Client *c = NULL, *i;
 
        Client *c = NULL, *i;
 

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

                return;
                return;

-       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))
+       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;
                                c = i;

-               if(!c)
-                       for(; i; i = i->next)
-                               if(ISVISIBLE(i))
+               if (!c)
+                       for (; i; i = i->next)
+                               if (ISVISIBLE(i))

                                        c = i;
        }
                                        c = i;
        }

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

                focus(c);
                restack(selmon);
        }
 }
 
 Atom
                focus(c);
                restack(selmon);
        }
 }
 
 Atom

-getatomprop(Client *c, Atom prop) {
+getatomprop(Client *c, Atom prop)
+{

        int di;
        unsigned long dl;
        unsigned char *p = NULL;
        Atom da, atom = None;
 
        int di;
        unsigned long dl;
        unsigned char *p = NULL;
        Atom da, atom = None;
 

-       if(XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-                             &da, &di, &dl, &dl, &p) == Success && p) {
+       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;
 }
 
                atom = *(Atom *)p;
                XFree(p);
        }
        return atom;
 }
 

-Bool
-getrootptr(int *x, int *y) {
+int
+getrootptr(int *x, int *y)
+{

        int di;
        unsigned int dui;
        Window dummy;
        int di;
        unsigned int dui;
        Window dummy;


@@ -876,71 +988,72 @@ getrootptr(int *x, int *y) {
 }
 
 long
 }
 
 long

-getstate(Window w) {
+getstate(Window w)
+{

        int format;
        long result = -1;
        unsigned char *p = NULL;
        unsigned long n, extra;
        Atom real;
 
        int format;
        long result = -1;
        unsigned char *p = NULL;
        unsigned long n, extra;
        Atom real;
 

-       if(XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-                             &real, &format, &n, &extra, (unsigned char **)&p) != 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;
+       return 1;

 }
 
 void
 }
 
 void

-grabbuttons(Client *c, Bool focused) {
+grabbuttons(Client *c, int focused)
+{

        updatenumlockmask();
        {
                unsigned int i, j;
                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
                XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        updatenumlockmask();
        {
                unsigned int i, j;
                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
                XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

-               if(focused) {
-                       for(i = 0; i < LENGTH(buttons); i++)
-                               if(buttons[i].click == ClkClientWin)
-                                       for(j = 0; j < LENGTH(modifiers); j++)
-                                               XGrabButton(dpy, buttons[i].button,
-                                                           buttons[i].mask | modifiers[j],
-                                                           c->win, False, BUTTONMASK,
-                                                           GrabModeAsync, GrabModeSync, None, None);
-               }
-               else
+               if (!focused)

                        XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
                        XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,

-                                   BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+                               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);

        }
 }
 
 void
        }
 }
 
 void

-grabkeys(void) {
+grabkeys(void)
+{

        updatenumlockmask();
        {
                unsigned int i, j;
        updatenumlockmask();
        {
                unsigned int i, j;


@@ -948,51 +1061,55 @@ grabkeys(void) {
                KeyCode code;
 
                XUngrabKey(dpy, AnyKey, AnyModifier, root);
                KeyCode code;
 
                XUngrabKey(dpy, AnyKey, AnyModifier, root);

-               for(i = 0; i < LENGTH(keys); i++)
-                       if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
-                               for(j = 0; j < LENGTH(modifiers); j++)
+               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,
                                        XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,

-                                                True, GrabModeAsync, GrabModeAsync);
+                                               True, GrabModeAsync, GrabModeAsync);

        }
 }
 
 void
        }
 }
 
 void

-incnmaster(const Arg *arg) {
+incnmaster(const Arg *arg)
+{

        selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
        arrange(selmon);
 }
 
 #ifdef XINERAMA
        selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
        arrange(selmon);
 }
 
 #ifdef XINERAMA

-static Bool
-isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
-       while(n--)
-               if(unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
+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)
                && unique[n].width == info->width && unique[n].height == info->height)

-                       return False;
-       return True;
+                       return 0;
+       return 1;

 }
 #endif /* XINERAMA */
 
 void
 }
 #endif /* XINERAMA */
 
 void

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

        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev;
 
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev;
 
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < LENGTH(keys); i++)
-               if(keysym == keys[i].keysym
+       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
                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
                && keys[i].func)
                        keys[i].func(&(keys[i].arg));
 }
 
 void

-killclient(const Arg *arg) {
-       if(!selmon->sel)
+killclient(const Arg *arg)
+{
+       if (!selmon->sel)

                return;
                return;

-       if(!sendevent(selmon->sel, wmatom[WMDelete])) {
+       if (!sendevent(selmon->sel, wmatom[WMDelete])) {

                XGrabServer(dpy);
                XSetErrorHandler(xerrordummy);
                XSetCloseDownMode(dpy, DestroyAll);
                XGrabServer(dpy);
                XSetErrorHandler(xerrordummy);
                XSetCloseDownMode(dpy, DestroyAll);


@@ -1004,23 +1121,15 @@ killclient(const Arg *arg) {
 }
 
 void
 }
 
 void

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

        Window trans = None;
        XWindowChanges wc;
 
        Window trans = None;
        XWindowChanges wc;
 

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

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

-       updatetitle(c);
-       if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
-               c->mon = t->mon;
-               c->tags = t->tags;
-       }
-       else {
-               c->mon = selmon;
-               applyrules(c);
-       }
+       c->pid = winpid(w);

        /* geometry */
        c->x = c->oldx = wa->x;
        c->y = c->oldy = wa->y;
        /* geometry */
        c->x = c->oldx = wa->x;
        c->y = c->oldy = wa->y;


@@ -1028,89 +1137,105 @@ manage(Window w, XWindowAttributes *wa) {
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;
 
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;
 

-       if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+       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);
+       }
+
+       if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw)

                c->x = c->mon->mx + c->mon->mw - WIDTH(c);
                c->x = c->mon->mx + c->mon->mw - WIDTH(c);

-       if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+       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->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->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);
        c->bw = borderpx;
 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);

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

        configure(c); /* propagates border_width, if size doesn't change */
        updatewindowtype(c);
        updatesizehints(c);
        updatewmhints(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        configure(c); /* propagates border_width, if size doesn't change */
        updatewindowtype(c);
        updatesizehints(c);
        updatewmhints(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);

-       grabbuttons(c, False);
-       if(!c->isfloating)
+       grabbuttons(c, 0);
+       if (!c->isfloating)

                c->isfloating = c->oldstate = trans != None || c->isfixed;
                c->isfloating = c->oldstate = trans != None || c->isfixed;

-       if(c->isfloating)
+       if (c->isfloating)

                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);
        XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);
        XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,

-                       (unsigned char *) &(c->win), 1);
+               (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);
        if (c->mon == selmon)
        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
        setclientstate(c, NormalState);
        if (c->mon == selmon)

-               unfocus(selmon->sel, False);
+               unfocus(selmon->sel, 0);

        c->mon->sel = c;
        arrange(c->mon);
        XMapWindow(dpy, c->win);
        c->mon->sel = c;
        arrange(c->mon);
        XMapWindow(dpy, c->win);

+       if (term)
+               swallow(term, c);

        focus(NULL);
 }
 
 void
        focus(NULL);
 }
 
 void

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

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

-       if(ev->request == MappingKeyboard)
+       if (ev->request == MappingKeyboard)

                grabkeys();
 }
 
 void
                grabkeys();
 }
 
 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(!wintoclient(ev->window))
+       if (!wintoclient(ev->window))

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

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

        unsigned int n = 0;
        Client *c;
 
        unsigned int n = 0;
        Client *c;
 

-       for(c = m->clients; c; c = c->next)
-               if(ISVISIBLE(c))
+       for (c = m->clients; c; c = c->next)
+               if (ISVISIBLE(c))

                        n++;
                        n++;

-       if(n > 0) /* override layout symbol */
+       if (n > 0) /* override layout symbol */

                snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
                snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);

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

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

        static Monitor *mon = NULL;
        Monitor *m;
        XMotionEvent *ev = &e->xmotion;
 
        static Monitor *mon = NULL;
        Monitor *m;
        XMotionEvent *ev = &e->xmotion;
 

-       if(ev->window != root)
+       if (ev->window != root)

                return;
                return;

-       if((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
-               unfocus(selmon->sel, True);
+       if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
+               unfocus(selmon->sel, 1);

                selmon = m;
                focus(NULL);
        }
                selmon = m;
                focus(NULL);
        }


@@ -1118,23 +1243,25 @@ motionnotify(XEvent *e) {
 }
 
 void
 }
 
 void

-movemouse(const Arg *arg) {
+movemouse(const Arg *arg)
+{

        int x, y, ocx, ocy, nx, ny;
        Client *c;
        Monitor *m;
        XEvent ev;
        int x, y, ocx, ocy, nx, ny;
        Client *c;
        Monitor *m;
        XEvent ev;

+       Time lasttime = 0;

 
 

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

                return;
                return;

-       if(c->isfullscreen) /* no support moving fullscreen windows by mouse */
+       if (c->isfullscreen) /* no support moving fullscreen windows by mouse */

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

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

                return;
                return;

-       if(!getrootptr(&x, &y))
+       if (!getrootptr(&x, &y))

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


@@ -1145,29 +1272,30 @@ movemouse(const Arg *arg) {
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:

+                       if ((ev.xmotion.time - lasttime) <= (1000 / 60))
+                               continue;
+                       lasttime = ev.xmotion.time;
+

                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);
                        nx = ocx + (ev.xmotion.x - x);
                        ny = ocy + (ev.xmotion.y - y);

-                       if(nx >= selmon->wx && nx <= selmon->wx + selmon->ww
-                       && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
-                               if(abs(selmon->wx - nx) < snap)
-                                       nx = selmon->wx;
-                               else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
-                                       nx = selmon->wx + selmon->ww - WIDTH(c);
-                               if(abs(selmon->wy - ny) < snap)
-                                       ny = selmon->wy;
-                               else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
-                                       ny = selmon->wy + selmon->wh - HEIGHT(c);
-                               if(!c->isfloating && selmon->lt[selmon->sellt]->arrange
-                               && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
-                                       togglefloating(NULL);
-                       }
-                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, nx, ny, c->w, c->h, True);
+                       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);
+       } while (ev.type != ButtonRelease);

        XUngrabPointer(dpy, CurrentTime);
        XUngrabPointer(dpy, CurrentTime);

-       if((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
+       if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {

                sendmon(c, m);
                selmon = m;
                focus(NULL);
                sendmon(c, m);
                selmon = m;
                focus(NULL);


@@ -1175,13 +1303,15 @@ movemouse(const Arg *arg) {
 }
 
 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

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

        detach(c);
        attach(c);
        focus(c);
        detach(c);
        attach(c);
        focus(c);


@@ -1189,21 +1319,22 @@ pop(Client *c) {
 }
 
 void
 }
 
 void

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

        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 

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

                updatestatus();
                updatestatus();

-       else if(ev->state == PropertyDelete)
+       else if (ev->state == PropertyDelete)

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

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

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

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

                                arrange(c->mon);
                        break;
                case XA_WM_NORMAL_HINTS:
                                arrange(c->mon);
                        break;
                case XA_WM_NORMAL_HINTS:


@@ -1214,28 +1345,31 @@ propertynotify(XEvent *e) {
                        drawbars();
                        break;
                }
                        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 == c->mon->sel)
+                       if (c == c->mon->sel)

                                drawbar(c->mon);
                }
                                drawbar(c->mon);
                }

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

                        updatewindowtype(c);
        }
 }
 
 void
                        updatewindowtype(c);
        }
 }
 
 void

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

 }
 
 Monitor *
 }
 
 Monitor *

-recttomon(int x, int y, int w, int h) {
+recttomon(int x, int y, int w, int h)
+{

        Monitor *m, *r = selmon;
        int a, area = 0;
 
        Monitor *m, *r = selmon;
        int a, area = 0;
 

-       for(m = mons; m; m = m->next)
-               if((a = INTERSECT(x, y, w, h, m)) > area) {
+       for (m = mons; m; m = m->next)
+               if ((a = INTERSECT(x, y, w, h, m)) > area) {

                        area = a;
                        r = m;
                }
                        area = a;
                        r = m;
                }


@@ -1243,13 +1377,15 @@ recttomon(int x, int y, int w, int h) {
 }
 
 void
 }
 
 void

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

-resizeclient(Client *c, int x, int y, int w, int h) {
+resizeclient(Client *c, int x, int y, int w, int h)
+{

        XWindowChanges wc;
 
        c->oldx = c->x; c->x = wc.x = x;
        XWindowChanges wc;
 
        c->oldx = c->x; c->x = wc.x = x;


@@ -1263,22 +1399,23 @@ resizeclient(Client *c, int x, int y, int w, int h) {
 }
 
 void
 }
 
 void

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

        Client *c;
        Monitor *m;
        XEvent ev;
        Client *c;
        Monitor *m;
        XEvent ev;

+       Time lasttime = 0;

 
 

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

                return;
                return;

-       if(c->isfullscreen) /* no support resizing fullscreen windows by mouse */
+       if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */

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

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

                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        do {
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        do {


@@ -1290,24 +1427,28 @@ resizemouse(const Arg *arg) {
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:

+                       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);
                        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
+                       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)
                        {
                        && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
                        {

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

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

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

                        break;
                }
                        break;
                }

-       } while(ev.type != ButtonRelease);
+       } 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);
        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) {
+       while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+       if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {

                sendmon(c, m);
                selmon = m;
                focus(NULL);
                sendmon(c, m);
                selmon = m;
                focus(NULL);


@@ -1315,70 +1456,74 @@ resizemouse(const Arg *arg) {
 }
 
 void
 }
 
 void

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

        Client *c;
        XEvent ev;
        XWindowChanges wc;
 
        drawbar(m);
        Client *c;
        XEvent ev;
        XWindowChanges wc;
 
        drawbar(m);

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

                return;
                return;

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

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

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

                wc.stack_mode = Below;
                wc.sibling = m->barwin;
                wc.stack_mode = Below;
                wc.sibling = m->barwin;

-               for(c = m->stack; c; c = c->snext)
-                       if(!c->isfloating && ISVISIBLE(c)) {
+               for (c = m->stack; c; c = c->snext)
+                       if (!c->isfloating && ISVISIBLE(c)) {

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

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

 }
 
 void
 }
 
 void

-run(void) {
+run(void)
+{

        XEvent ev;
        /* main event loop */
        XSync(dpy, False);
        XEvent ev;
        /* main event loop */
        XSync(dpy, False);

-       while(running && !XNextEvent(dpy, &ev))
-               if(handler[ev.type])
+       while (running && !XNextEvent(dpy, &ev))
+               if (handler[ev.type])

                        handler[ev.type](&ev); /* call handler */
 }
 
 void
                        handler[ev.type](&ev); /* call handler */
 }
 
 void

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

        unsigned int i, num;
        Window d1, d2, *wins = NULL;
        XWindowAttributes wa;
 
        unsigned int i, num;
        Window d1, d2, *wins = NULL;
        XWindowAttributes wa;
 

-       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)
+               if (wins)

                        XFree(wins);
        }
 }
 
 void
                        XFree(wins);
        }
 }
 
 void

-sendmon(Client *c, Monitor *m) {
-       if(c->mon == m)
+sendmon(Client *c, Monitor *m)
+{
+       if (c->mon == m)

                return;
                return;

-       unfocus(c, True);
+       unfocus(c, 1);

        detach(c);
        detachstack(c);
        c->mon = m;
        detach(c);
        detachstack(c);
        c->mon = m;


@@ -1390,26 +1535,28 @@ sendmon(Client *c, Monitor *m) {
 }
 
 void
 }
 
 void

-setclientstate(Client *c, long state) {
+setclientstate(Client *c, long state)
+{

        long data[] = { state, None };
 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
        long data[] = { state, None };
 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,

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

 }
 
 }
 

-Bool
-sendevent(Client *c, Atom proto) {
+int
+sendevent(Client *c, Atom proto)
+{

        int n;
        Atom *protocols;
        int n;
        Atom *protocols;

-       Bool exists = False;
+       int exists = 0;

        XEvent ev;
 
        XEvent ev;
 

-       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-               while(!exists && n--)
+       if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+               while (!exists && n--)

                        exists = protocols[n] == proto;
                XFree(protocols);
        }
                        exists = protocols[n] == proto;
                XFree(protocols);
        }

-       if(exists) {
+       if (exists) {

                ev.type = ClientMessage;
                ev.xclient.window = c->win;
                ev.xclient.message_type = wmatom[WMProtocols];
                ev.type = ClientMessage;
                ev.xclient.window = c->win;
                ev.xclient.message_type = wmatom[WMProtocols];


@@ -1422,33 +1569,34 @@ sendevent(Client *c, Atom proto) {
 }
 
 void
 }
 
 void

-setfocus(Client *c) {
-       if(!c->neverfocus) {
+setfocus(Client *c)
+{
+       if (!c->neverfocus) {

                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                XChangeProperty(dpy, root, netatom[NetActiveWindow],
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                XChangeProperty(dpy, root, netatom[NetActiveWindow],

-                               XA_WINDOW, 32, PropModeReplace,
-                               (unsigned char *) &(c->win), 1);
+                       XA_WINDOW, 32, PropModeReplace,
+                       (unsigned char *) &(c->win), 1);

        }
        sendevent(c, wmatom[WMTakeFocus]);
 }
 
 void
        }
        sendevent(c, wmatom[WMTakeFocus]);
 }
 
 void

-setfullscreen(Client *c, Bool fullscreen) {
-       if(fullscreen) {
+setfullscreen(Client *c, int fullscreen)
+{
+       if (fullscreen && !c->isfullscreen) {

                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,

-                               PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
-               c->isfullscreen = True;
+                       PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+               c->isfullscreen = 1;

                c->oldstate = c->isfloating;
                c->oldbw = c->bw;
                c->bw = 0;
                c->oldstate = c->isfloating;
                c->oldbw = c->bw;
                c->bw = 0;

-               c->isfloating = True;
+               c->isfloating = 1;

                resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
                XRaiseWindow(dpy, c->win);
                resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
                XRaiseWindow(dpy, c->win);

-       }
-       else {
+       } else if (!fullscreen && c->isfullscreen){

                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
                XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,

-                               PropModeReplace, (unsigned char*)0, 0);
-               c->isfullscreen = False;
+                       PropModeReplace, (unsigned char*)0, 0);
+               c->isfullscreen = 0;

                c->isfloating = c->oldstate;
                c->bw = c->oldbw;
                c->x = c->oldx;
                c->isfloating = c->oldstate;
                c->bw = c->oldbw;
                c->x = c->oldx;


@@ -1461,50 +1609,71 @@ setfullscreen(Client *c, Bool fullscreen) {
 }
 
 void
 }
 
 void

-setlayout(const Arg *arg) {
-       if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+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;
                selmon->sellt ^= 1;

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

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

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

                arrange(selmon);
        else
                drawbar(selmon);
 }
 
                arrange(selmon);
        else
                drawbar(selmon);
 }
 

-/* arg > 1.0 will set mfact absolutly */
+/* arg > 1.0 will set mfact absolutely */

 void
 void

-setmfact(const Arg *arg) {
+setmfact(const Arg *arg)
+{

        float f;
 
        float f;
 

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

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

-       if(f < 0.1 || f > 0.9)
+       if (f < 0.05 || f > 0.95)

                return;
        selmon->mfact = f;
        arrange(selmon);
 }
 
 void
                return;
        selmon->mfact = f;
        arrange(selmon);
 }
 
 void

-setup(void) {
+setup(void)
+{
+       int i;

        XSetWindowAttributes wa;
        XSetWindowAttributes wa;

+       Atom utf8string;

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

+       signal(SIGHUP, sighup);
+       signal(SIGTERM, sigterm);
+

        /* init screen */
        screen = DefaultScreen(dpy);
        /* init screen */
        screen = DefaultScreen(dpy);

-       root = RootWindow(dpy, screen);
-       fnt = drw_font_create(dpy, font);

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

-       bh = fnt->h + 2;
-       drw = drw_create(dpy, screen, root, sw, sh);
-       drw_setfont(drw, fnt);
+       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 */
        updategeom();
        /* init atoms */

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

        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);


@@ -1513,6 +1682,7 @@ setup(void) {
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);

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


@@ -1522,58 +1692,96 @@ setup(void) {
        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
        cursor[CurMove] = drw_cur_create(drw, XC_fleur);
        /* init appearance */
        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
        cursor[CurMove] = drw_cur_create(drw, XC_fleur);
        /* init appearance */

-       scheme[SchemeNorm].border = drw_clr_create(drw, normbordercolor);
-       scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
-       scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
-       scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
-       scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
-       scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
+       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();
        /* 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,
        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,

-                       PropModeReplace, (unsigned char *) netatom, NetLast);
+               PropModeReplace, (unsigned char *) netatom, NetLast);

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

-       /* select for events */
+       /* select events */

        wa.cursor = cursor[CurNormal]->cursor;
        wa.cursor = cursor[CurNormal]->cursor;

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

        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
        grabkeys();
        focus(NULL);
 }
 
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
        grabkeys();
        focus(NULL);
 }
 

+

 void
 void

-showhide(Client *c) {
-       if(!c)
+seturgent(Client *c, int urg)
+{
+       XWMHints *wmh;
+
+       c->isurgent = urg;
+       if (!(wmh = XGetWMHints(dpy, c->win)))

                return;
                return;

-       if(ISVISIBLE(c)) { /* show clients top down */
+       wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
+       XSetWMHints(dpy, c->win, wmh);
+       XFree(wmh);
+}
+
+void
+showhide(Client *c)
+{
+       if (!c)
+               return;
+       if (ISVISIBLE(c)) {
+               /* show clients top down */

                XMoveWindow(dpy, c->win, c->x, c->y);
                XMoveWindow(dpy, c->win, c->x, c->y);

-               if((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
-                       resize(c, c->x, c->y, c->w, c->h, False);
+               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);
                showhide(c->snext);

-       }
-       else { /* hide clients bottom up */
+       } else {
+               /* hide clients bottom up */

                showhide(c->snext);
                XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
        }
 }
 
 void
                showhide(c->snext);
                XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
        }
 }
 
 void

-sigchld(int unused) {
-       if(signal(SIGCHLD, sigchld) == SIG_ERR)
-               die("Can't install SIGCHLD handler");
-       while(0 < waitpid(-1, NULL, WNOHANG));
+sigchld(int unused)
+{
+       if (signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("can't install SIGCHLD handler:");
+       while (0 < waitpid(-1, NULL, WNOHANG));
+}
+
+void
+sighup(int unused)
+{
+       Arg a = {.i = 1};
+       quit(&a);
+}
+
+void
+sigterm(int unused)
+{
+       Arg a = {.i = 0};
+       quit(&a);

 }
 
 void
 }
 
 void

-spawn(const Arg *arg) {
-       if(arg->v == dmenucmd)
+spawn(const Arg *arg)
+{
+       if (arg->v == dmenucmd)

                dmenumon[0] = '0' + selmon->num;
                dmenumon[0] = '0' + selmon->num;

-       if(fork() == 0) {
-               if(dpy)
+       if (fork() == 0) {
+               if (dpy)

                        close(ConnectionNumber(dpy));
                setsid();
                execvp(((char **)arg->v)[0], (char **)arg->v);
                        close(ConnectionNumber(dpy));
                setsid();
                execvp(((char **)arg->v)[0], (char **)arg->v);


@@ -1584,8 +1792,9 @@ spawn(const Arg *arg) {
 }
 
 void
 }
 
 void

-tag(const Arg *arg) {
-       if(selmon->sel && arg->ui & TAGMASK) {
+tag(const Arg *arg)
+{
+       if (selmon->sel && arg->ui & TAGMASK) {

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


@@ -1593,40 +1802,44 @@ tag(const Arg *arg) {
 }
 
 void
 }
 
 void

-tagmon(const Arg *arg) {
-       if(!selmon->sel || !mons->next)
+tagmon(const Arg *arg)
+{
+       if (!selmon->sel || !mons->next)

                return;
        sendmon(selmon->sel, dirtomon(arg->i));
 }
 
 void
                return;
        sendmon(selmon->sel, dirtomon(arg->i));
 }
 
 void

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

        unsigned int i, n, h, mw, my, ty;
        Client *c;
 
        unsigned int i, n, h, mw, my, ty;
        Client *c;
 

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

                return;
 
                return;
 

-       if(n > m->nmaster)
+       if (n > m->nmaster)

                mw = m->nmaster ? m->ww * m->mfact : 0;
        else
                mw = m->nmaster ? m->ww * m->mfact : 0;
        else

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

                }
 }
 
 void
                }
 }
 
 void

-togglebar(const Arg *arg) {
+togglebar(const Arg *arg)
+{

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


@@ -1634,26 +1847,35 @@ togglebar(const Arg *arg) {
 }
 
 void
 }
 
 void

-togglefloating(const Arg *arg) {
-       if(!selmon->sel)
+togglefloating(const Arg *arg)
+{
+       if (!selmon->sel)

                return;
                return;

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

                return;
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
                return;
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;

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

                resize(selmon->sel, selmon->sel->x, selmon->sel->y,
                resize(selmon->sel, selmon->sel->x, selmon->sel->y,

-                      selmon->sel->w, selmon->sel->h, False);
+                       selmon->sel->w, selmon->sel->h, 0);

        arrange(selmon);
 }
 
 void
        arrange(selmon);
 }
 
 void

-toggletag(const Arg *arg) {
+togglefullscr(const Arg *arg)
+{
+  if(selmon->sel)
+    setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
+}
+
+void
+toggletag(const Arg *arg)
+{

        unsigned int newtags;
 
        unsigned int newtags;
 

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

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

-       if(newtags) {
+       if (newtags) {

                selmon->sel->tags = newtags;
                focus(NULL);
                arrange(selmon);
                selmon->sel->tags = newtags;
                focus(NULL);
                arrange(selmon);


@@ -1661,10 +1883,11 @@ toggletag(const Arg *arg) {
 }
 
 void
 }
 
 void

-toggleview(const Arg *arg) {
+toggleview(const Arg *arg)
+{

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

-       if(newtagset) {
+       if (newtagset) {

                selmon->tagset[selmon->seltags] = newtagset;
                focus(NULL);
                arrange(selmon);
                selmon->tagset[selmon->seltags] = newtagset;
                focus(NULL);
                arrange(selmon);


@@ -1672,28 +1895,43 @@ toggleview(const Arg *arg) {
 }
 
 void
 }
 
 void

-unfocus(Client *c, Bool setfocus) {
-       if(!c)
+unfocus(Client *c, int setfocus)
+{
+       if (!c)

                return;
                return;

-       grabbuttons(c, False);
-       XSetWindowBorder(dpy, c->win, scheme[SchemeNorm].border->rgb);
-       if(setfocus) {
+       grabbuttons(c, 0);
+       XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
+       if (setfocus) {

                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
        }
 }
 
 void
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
        }
 }
 
 void

-unmanage(Client *c, Bool destroyed) {
+unmanage(Client *c, int destroyed)
+{

        Monitor *m = c->mon;
        XWindowChanges wc;
 
        Monitor *m = c->mon;
        XWindowChanges wc;
 

-       /* The server grab construct avoids race conditions. */
+       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(!destroyed) {
+       if (!destroyed) {

                wc.border_width = c->oldbw;
                wc.border_width = c->oldbw;

-               XGrabServer(dpy);
+               XGrabServer(dpy); /* avoid race conditions */

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


@@ -1703,104 +1941,114 @@ unmanage(Client *c, Bool destroyed) {
                XUngrabServer(dpy);
        }
        free(c);
                XUngrabServer(dpy);
        }
        free(c);

-       focus(NULL);
-       updateclientlist();
-       arrange(m);
+
+       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 = wintoclient(ev->window))) {
-               if(ev->send_event)
+       if ((c = wintoclient(ev->window))) {
+               if (ev->send_event)

                        setclientstate(c, WithdrawnState);
                else
                        setclientstate(c, WithdrawnState);
                else

-                       unmanage(c, False);
+                       unmanage(c, 0);

        }
 }
 
 void
        }
 }
 
 void

-updatebars(void) {
+updatebars(void)
+{

        Monitor *m;
        XSetWindowAttributes wa = {
                .override_redirect = True,
        Monitor *m;
        XSetWindowAttributes wa = {
                .override_redirect = True,

-               .background_pixmap = ParentRelative,
+               .background_pixel = 0,
+               .border_pixel = 0,
+               .colormap = cmap,

                .event_mask = ButtonPressMask|ExposureMask
        };
                .event_mask = ButtonPressMask|ExposureMask
        };

-       for(m = mons; m; m = m->next) {
+       XClassHint ch = {"dwm", "dwm"};
+       for (m = mons; m; m = m->next) {

                if (m->barwin)
                        continue;
                if (m->barwin)
                        continue;

-               m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-                                         CopyFromParent, DefaultVisual(dpy, screen),
-                                         CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+               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);
                XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
                XMapRaised(dpy, m->barwin);

+               XSetClassHint(dpy, m->barwin, &ch);

        }
 }
 
 void
        }
 }
 
 void

-updatebarpos(Monitor *m) {
+updatebarpos(Monitor *m)
+{

        m->wy = m->my;
        m->wh = m->mh;
        m->wy = m->my;
        m->wh = m->mh;

-       if(m->showbar) {
+       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;
                m->wh -= bh;
                m->by = m->topbar ? m->wy : m->wy + m->wh;
                m->wy = m->topbar ? m->wy + bh : m->wy;

-       }
-       else
+       } else

                m->by = -bh;
 }
 
 void
                m->by = -bh;
 }
 
 void

-updateclientlist() {
+updateclientlist()
+{

        Client *c;
        Monitor *m;
 
        XDeleteProperty(dpy, root, netatom[NetClientList]);
        Client *c;
        Monitor *m;
 
        XDeleteProperty(dpy, root, netatom[NetClientList]);

-       for(m = mons; m; m = m->next)
-               for(c = m->clients; c; c = c->next)
+       for (m = mons; m; m = m->next)
+               for (c = m->clients; c; c = c->next)

                        XChangeProperty(dpy, root, netatom[NetClientList],
                        XChangeProperty(dpy, root, netatom[NetClientList],

-                                       XA_WINDOW, 32, PropModeAppend,
-                                       (unsigned char *) &(c->win), 1);
+                               XA_WINDOW, 32, PropModeAppend,
+                               (unsigned char *) &(c->win), 1);

 }
 
 }
 

-Bool
-updategeom(void) {
-       Bool dirty = False;
+int
+updategeom(void)
+{
+       int dirty = 0;

 
 #ifdef XINERAMA
 
 #ifdef XINERAMA

-       if(XineramaIsActive(dpy)) {
+       if (XineramaIsActive(dpy)) {

                int i, j, n, nn;
                Client *c;
                Monitor *m;
                XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
                XineramaScreenInfo *unique = NULL;
 
                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++);
+               for (n = 0, m = mons; m; m = m->next, n++);

                /* only consider unique geometries as separate screens */
                /* only consider unique geometries as separate screens */

-               if(!(unique = (XineramaScreenInfo *)malloc(sizeof(XineramaScreenInfo) * nn)))
-                       die("fatal: could not malloc() %u bytes\n", sizeof(XineramaScreenInfo) * nn);
-               for(i = 0, j = 0; i < nn; i++)
-                       if(isuniquegeom(unique, j, &info[i]))
+               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;
                                memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
                XFree(info);
                nn = j;

-               if(n <= nn) {
-                       for(i = 0; i < (nn - n); i++) { /* new monitors available */
-                               for(m = mons; m && m->next; m = m->next);
-                               if(m)
+               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();
                        }
                                        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))
+                       for (i = 0, m = mons; i < nn && m; m = m->next, i++)
+                               if (i >= n
+                               || unique[i].x_org != m->mx || unique[i].y_org != m->my
+                               || unique[i].width != m->mw || unique[i].height != m->mh)

                                {
                                {

-                                       dirty = True;
+                                       dirty = 1;

                                        m->num = i;
                                        m->mx = m->wx = unique[i].x_org;
                                        m->my = m->wy = unique[i].y_org;
                                        m->num = i;
                                        m->mx = m->wx = unique[i].x_org;
                                        m->my = m->wy = unique[i].y_org;


@@ -1808,40 +2056,36 @@ updategeom(void) {
                                        m->mh = m->wh = unique[i].height;
                                        updatebarpos(m);
                                }
                                        m->mh = m->wh = unique[i].height;
                                        updatebarpos(m);
                                }

-               }
-               else { /* less monitors available nn < n */
-                       for(i = nn; i < n; i++) {
-                               for(m = mons; m && m->next; m = m->next);
-                               while(m->clients) {
-                                       dirty = True;
-                                       c = m->clients;
+               } 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);
                                }
                                        m->clients = c->next;
                                        detachstack(c);
                                        c->mon = mons;
                                        attach(c);
                                        attachstack(c);
                                }

-                               if(m == selmon)
+                               if (m == selmon)

                                        selmon = mons;
                                cleanupmon(m);
                        }
                }
                free(unique);
                                        selmon = mons;
                                cleanupmon(m);
                        }
                }
                free(unique);

-       }
-       else
+       } else

 #endif /* XINERAMA */
 #endif /* XINERAMA */

-       /* default monitor setup */
-       {
-               if(!mons)
+       { /* default monitor setup */
+               if (!mons)

                        mons = createmon();
                        mons = createmon();

-               if(mons->mw != sw || mons->mh != sh) {
-                       dirty = True;
+               if (mons->mw != sw || mons->mh != sh) {
+                       dirty = 1;

                        mons->mw = mons->ww = sw;
                        mons->mh = mons->wh = sh;
                        updatebarpos(mons);
                }
        }
                        mons->mw = mons->ww = sw;
                        mons->mh = mons->wh = sh;
                        updatebarpos(mons);
                }
        }

-       if(dirty) {
+       if (dirty) {

                selmon = mons;
                selmon = wintomon(root);
        }
                selmon = mons;
                selmon = wintomon(root);
        }


@@ -1849,160 +2093,291 @@ updategeom(void) {
 }
 
 void
 }
 
 void

-updatenumlockmask(void) {
+updatenumlockmask(void)
+{

        unsigned int i, j;
        XModifierKeymap *modmap;
 
        numlockmask = 0;
        modmap = XGetModifierMapping(dpy);
        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))
+       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
                                numlockmask = (1 << i);
        XFreeModifiermap(modmap);
 }
 
 void

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

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

-       if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+       if (!XGetWMNormalHints(dpy, c->win, &size, &msize))

                /* size is uninitialized, ensure that size.flags aren't used */
                size.flags = PSize;
                /* size is uninitialized, ensure that size.flags aren't used */
                size.flags = PSize;

-       if(size.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(size.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(size.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(size.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(size.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(size.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(size.flags & PAspect) {
+       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;
                c->mina = (float)size.min_aspect.y / size.min_aspect.x;
                c->maxa = (float)size.max_aspect.x / size.max_aspect.y;

-       }
-       else
+       } else

                c->maxa = c->mina = 0.0;
                c->maxa = c->mina = 0.0;

-       c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-                    && c->maxw == c->minw && c->maxh == c->minh);
+       c->isfixed = (c->maxw && c->maxh && 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, XA_WM_NAME, c->name, sizeof c->name);
-       if(c->name[0] == '\0') /* hack to mark broken clients */
-               strcpy(c->name, broken);
+updatestatus(void)
+{
+       if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+               strcpy(stext, "dwm-"VERSION);
+       drawbar(selmon);

 }
 
 void
 }
 
 void

-updatestatus(void) {
-       if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
-               strcpy(stext, "dwm-"VERSION);
-       drawbar(selmon);
+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
 }
 
 void

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

        Atom state = getatomprop(c, netatom[NetWMState]);
        Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
 
        Atom state = getatomprop(c, netatom[NetWMState]);
        Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
 

-       if(state == netatom[NetWMFullscreen])
-               setfullscreen(c, True);
-       if(wtype == netatom[NetWMWindowTypeDialog])
-               c->isfloating = True;
+       if (state == netatom[NetWMFullscreen])
+               setfullscreen(c, 1);
+       if (wtype == netatom[NetWMWindowTypeDialog])
+               c->isfloating = 1;

 }
 
 void
 }
 
 void

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

        XWMHints *wmh;
 
        XWMHints *wmh;
 

-       if((wmh = XGetWMHints(dpy, c->win))) {
-               if(c == selmon->sel && wmh->flags & XUrgencyHint) {
+       if ((wmh = XGetWMHints(dpy, c->win))) {
+               if (c == selmon->sel && wmh->flags & XUrgencyHint) {

                        wmh->flags &= ~XUrgencyHint;
                        XSetWMHints(dpy, c->win, wmh);
                        wmh->flags &= ~XUrgencyHint;
                        XSetWMHints(dpy, c->win, wmh);

-               }
-               else
-                       c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
-               if(wmh->flags & InputHint)
+               } else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
+               if (wmh->flags & InputHint)

                        c->neverfocus = !wmh->input;
                else
                        c->neverfocus = !wmh->input;
                else

-                       c->neverfocus = False;
+                       c->neverfocus = 0;

                XFree(wmh);
        }
 }
 
 void
                XFree(wmh);
        }
 }
 
 void

-view(const Arg *arg) {
-       if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+view(const Arg *arg)
+{
+       if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])

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

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

                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
        focus(NULL);
        arrange(selmon);
 }
 
                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 *
 Client *

-wintoclient(Window w) {
+termforwin(const Client *w)
+{

        Client *c;
        Monitor *m;
 
        Client *c;
        Monitor *m;
 

-       for(m = mons; m; m = m->next)
-               for(c = m->clients; c; c = c->next)
-                       if(c->win == w)
+       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 *
                                return c;
        return NULL;
 }
 
 Monitor *

-wintomon(Window w) {
+wintomon(Window w)
+{

        int x, y;
        Client *c;
        Monitor *m;
 
        int x, y;
        Client *c;
        Monitor *m;
 

-       if(w == root && getrootptr(&x, &y))
+       if (w == root && getrootptr(&x, &y))

                return recttomon(x, y, 1, 1);
                return recttomon(x, y, 1, 1);

-       for(m = mons; m; m = m->next)
-               if(w == m->barwin)
+       for (m = mons; m; m = m->next)
+               if (w == m->barwin)

                        return m;
                        return m;

-       if((c = wintoclient(w)))
+       if ((c = wintoclient(w)))

                return c->mon;
        return selmon;
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are
                return c->mon;
        return selmon;
 }
 
 /* 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_SetInputFocus && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)


@@ -2013,50 +2388,154 @@ xerror(Display *dpy, XErrorEvent *ee) {
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",

-                       ee->request_code, ee->error_code);
+               ee->request_code, ee->error_code);

        return xerrorxlib(dpy, ee); /* may call exit */
 }
 
 int
        return xerrorxlib(dpy, ee); /* may call exit */
 }
 
 int

-xerrordummy(Display *dpy, 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 *dpy, XErrorEvent *ee) {
-       die("dwm: another window manager is already running\n");
+xerrorstart(Display *dpy, XErrorEvent *ee)
+{
+       die("dwm: another window manager is already running");

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

-zoom(const Arg *arg) {
+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);
+
+       if (! visual) {
+               visual = DefaultVisual(dpy, screen);
+               depth = DefaultDepth(dpy, screen);
+               cmap = DefaultColormap(dpy, screen);
+       }
+}
+
+void
+zoom(const Arg *arg)
+{

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

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

        || (selmon->sel && selmon->sel->isfloating))
                return;
        || (selmon->sel && selmon->sel->isfloating))
                return;

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

                        return;
        pop(c);
 }
 
                        return;
        pop(c);
 }
 

+void
+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;
+               }
+       }
+}
+
+void
+load_xresources(void)
+{
+       Display *display;
+       char *resm;
+       XrmDatabase db;
+       ResourcePref *p;
+
+       display = XOpenDisplay(NULL);
+       resm = XResourceManagerString(display);
+       if (!resm)
+               return;
+
+       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]))
-               die("dwm-"VERSION", © 2006-2014 dwm engineers, see LICENSE for details\n");
-       else if(argc != 1)
-               die("usage: dwm [-v]\n");
-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+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);
                fputs("warning: no locale support\n", stderr);

-       if(!(dpy = XOpenDisplay(NULL)))
-               die("dwm: cannot open display\n");
+       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();

+#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();
        XCloseDisplay(dpy);
        return EXIT_SUCCESS;
        cleanup();
        XCloseDisplay(dpy);
        return EXIT_SUCCESS;