More patches. Things are broken. I do not care.

6 files changed, 416 insertions, 38 deletions

diff --git a/README b/README
index f4c1ef5..e27df24 100644
--- a/README
+++ b/README
@@ -13,7 +13,9 @@ This build of dwm has the following patches applied:
    8. Resizecorners: dwm.suckless.org/patches/resizecorners
       With a small modification to emulate the resizehere patch.
    9. Titlecolor: dwm.suckless.org/patches/titlecolor
-   10. Dragmact: dwm.suckless.org/patches/dragmfact
+   10. Dragmfact: dwm.suckless.org/patches/dragmfact
+   11. Swallow: dwm.suckless.org/patches/swallow
+   12. Centeredmaster: dwm.suckless.org/patches/centeredmaster
 
 dwm - dynamic window manager
 ============================
diff --git a/config.def.h b/config.def.h
index b8e7b17..c62e604 100644
--- a/config.def.h
+++ b/config.def.h
@@ -4,6 +4,7 @@
 static unsigned int borderpx  = 1;        /* border pixel of windows */
 static unsigned int gappx     = 5;        /* gaps between windows */
 static unsigned int snap      = 32;       /* snap pixel */
+static const int swallowfloating    = 0;        /* 1 means swallow floating windows by default */
 static int showbar            = 1;        /* 0 means no bar */
 static int topbar             = 1;        /* 0 means bottom bar */
 static char font[]            = "monospace 10";
@@ -28,9 +29,11 @@ static const Rule rules[] = {
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
+	/* class     instance  title           tags mask  isfloating  isterminal  noswallow  monitor */
+	{ "Gimp",    NULL,     NULL,           0,         1,          0,           0,        -1 },
+	{ "Firefox", NULL,     NULL,           1 << 8,    0,          0,          -1,        -1 },
+	{ "St",      NULL,     NULL,           0,         0,          1,           0,        -1 },
+	{ NULL,      NULL,     "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
 };
 
 /* layout(s) */
@@ -44,6 +47,8 @@ static const Layout layouts[] = {
 	{ "[]=",      tile },    /* first entry is default */
 	{ "><>",      NULL },    /* no layout function means floating behavior */
 	{ "[M]",      monocle },
+	{ "|M|",      centeredmaster },
+	{ ">M>",      centeredfloatingmaster },
 };
 
 /* key definitions */
@@ -103,6 +108,8 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
 	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+	{ MODKEY,                       XK_u,      setlayout,      {.v = &layouts[3]} },
+	{ MODKEY,                       XK_o,      setlayout,      {.v = &layouts[4]} },
 	{ MODKEY,                       XK_space,  setlayout,      {0} },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY,                       XK_g,      gesture,        {0} },
diff --git a/config.h b/config.h
index ea0b97a..08c8f92 100644
--- a/config.h
+++ b/config.h
@@ -2,9 +2,10 @@
 
 /* Appearance. */
 static unsigned int borderpx  = 5;        /* border pixel of windows */
-static unsigned int snap      = 32;       /* snap pixel */
+const static unsigned int snap= 48;       /* snap pixel */
 static unsigned int gappx     = 15;
 
+static const int swallowfloating = 1;     /* Swallow floating windows by default. */
 static const int showbar      = 1;        /* 0 means no bar */
 static const int topbar       = 1;        /* 0 means bottom bar */
 static int sidepad            = 15;
@@ -38,10 +39,12 @@ static const int resizehints     = 0;     /* 1 means respect size hints in tiled
 static const int lockfullscreen  = 1;     /* 1 will force focus on the fullscreen window */
 
 static const Layout layouts[] = {
-   /* Symbol,    layout. */
-   { "[]=",      tile },      /* First entry is default. */
-   { "><>",      NULL },      /* No layout function means floating behavior. */
-   { "[M]",      monocle },   /* Active window fills all available space. */  
+   /* Symbol,     layout. */
+   { "[]=",       tile },                    /* First entry is default. */
+   { "><>",       NULL },                    /* No layout function means floating behavior. */
+   { "[M]",       monocle },                 /* Active window fills all available space. */  
+   { "|M|",       centeredmaster },          /* Centered master window. */
+   { "-M-",       centeredfloatingmaster },  /* Floating centered master window. */
 };
 
 /* Xresources. */
@@ -55,7 +58,6 @@ ResourcePref resources[] = {
    {"bor_px",           INTEGER, &borderpx },
    {"sidepad",          INTEGER, &sidepad },
    {"vertpad",          INTEGER, &vertpad },
-   {"snap_px",          INTEGER, &snap },
    {"gap_px",           INTEGER, &gappx },
    {"mfact",            FLOAT,   &mfact },
    {"font",             STRING,  &font },
@@ -66,9 +68,15 @@ ResourcePref resources[] = {
 static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 static const Rule rules[] = {
-   /* Class      instance, title,   tags mask,  is floating,   monitor. */
-   { "Gimp",     NULL,     NULL,    0,          1,             -1 },
-   { "Firefox",  NULL,     NULL,    1 << 8,     0,             -1 },
+	/* xprop(1):
+	 *	WM_CLASS(STRING) = instance, class
+	 *	WM_NAME(STRING) = title
+	 */
+	/* class     instance  title           tags mask  isfloating  isterminal  noswallow  monitor */
+	{ "Gimp",    NULL,     NULL,           0,         1,          0,           0,        -1 },
+	{ "Firefox", NULL,     NULL,           1 << 8,    0,          0,          -1,        -1 },
+	{ "St",      NULL,     NULL,           0,         0,          1,           0,        -1 },
+	{ NULL,      NULL,     "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
 };
 
 /* Key definitions. */
@@ -114,16 +122,27 @@ static const Key keys[] = {
    { MODKEY,            XK_k,       focusstack,       {.i = -1 } },
    { MODKEY|ShiftMask,  XK_j,       movestack,        {.i = +1 } },
    { MODKEY|ShiftMask,  XK_k,       movestack,        {.i = -1 } },
-   { MODKEY,            XK_i,       incnmaster,       {.i = +1 } },     /* Increase the number of master windows.  */
-   { MODKEY,            XK_d,       incnmaster,       {.i = -1 } },     /* Decrease the number of master windows.  */
+   { MODKEY,            XK_x,       incnmaster,       {.i = +1 } },     /* Increase the number of master windows.  */
+   { MODKEY,            XK_z,       incnmaster,       {.i = -1 } },     /* Decrease the number of master windows.  */
    { MODKEY,            XK_h,       setmfact,         {.f = -0.05} },   /* Increase master/stack ratio. */
    { MODKEY,            XK_l,       setmfact,         {.f = +0.05} },   /* Decrease master/stack ratio. */
    { MODKEY,            XK_q,       killclient,       {0} },            /* Kill active window. */
 
+   { MODKEY,            XK_Down,    moveresize,       {.v = (int []){ 0, snap, 0, 0 }} },
+   { MODKEY,            XK_Up,      moveresize,       {.v = (int []){ 0, -snap, 0, 0 }} },
+   { MODKEY,            XK_Right,   moveresize,       {.v = (int []){ snap, 0, 0, 0 }} },
+   { MODKEY,            XK_Left,    moveresize,       {.v = (int []){ -snap, 0, 0, 0 }} },
+   { MODKEY|ShiftMask,  XK_Down,    moveresize,       {.v = (int []){ snap/2, snap/2, -snap, -snap }} },
+   { MODKEY|ShiftMask,  XK_Up,      moveresize,       {.v = (int []){ -snap/2, -snap/2, snap, snap }} },
+   { MODKEY|ShiftMask,  XK_Right,   moveresize,       {.v = (int []){ -snap/2, 0, snap, 0 }} },
+   { MODKEY|ShiftMask,  XK_Left,    moveresize,       {.v = (int []){ snap/2, 0, -snap, 0 }} },
+
    /* Layouts. */
    { MODKEY,            XK_t,       setlayout,        {.v = &layouts[0]} },   /* Default master/stack layout. */
    { MODKEY,            XK_y,       setlayout,        {.v = &layouts[1]} },   /* Floating layout. */
    { MODKEY,            XK_u,       setlayout,        {.v = &layouts[2]} },   /* Monocle layout. */
+   { MODKEY,            XK_i,       setlayout,        {.v = &layouts[3]} },   /* Centered master layout. */
+   { MODKEY|ShiftMask,  XK_i,       setlayout,        {.v = &layouts[4]} },   /* Floating centered master layout. */
    { MODKEY|ShiftMask,  XK_f,       togglefloating,   {0} },                  /* Toggle floating layout for a window. */
    { MODKEY,            XK_f,       togglefullscr,    {0} },                  /* Toggle fullscreen for a window. */
 
@@ -163,11 +182,11 @@ static const Key keys[] = {
 /* A click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin. */
 static const Button buttons[] = {
    /* Click,         mask,    button,  function,         argument. */
-   { ClkLtSymbol,    0,       Button1, setlayout,     	{0} },
-   { ClkLtSymbol,    0,       Button3, setlayout,     	{.v = &layouts[2]} },
-   { ClkWinTitle,    0,       Button2, zoom,          	{0} },
-   { ClkStatusText,  0,       Button2, spawn,         	{.v = termcmd } },
-   { ClkClientWin,   MODKEY,  Button1, movemouse,     	{0} },
+   { ClkLtSymbol,    0,       Button1, setlayout,     {0} },
+   { ClkLtSymbol,    0,       Button3, setlayout,     {.v = &layouts[2]} },
+   { ClkWinTitle,    0,       Button2, zoom,          {0} },
+   { ClkStatusText,  0,       Button2, spawn,         {.v = termcmd } },
+   { ClkClientWin,   MODKEY,  Button1, movemouse,     {0} },
    { ClkClientWin,   MODKEY,  Button2, togglefloating,   {0} },
    { ClkClientWin,   MODKEY,  Button3, resizemouse,      {0} },
    { ClkTagBar,      0,       Button1, view,             {0} },
diff --git a/config.mk b/config.mk
index 96c25af..b96e837 100644
--- a/config.mk
+++ b/config.mk
@@ -20,10 +20,11 @@ FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
 #FREETYPEINC = ${X11INC}/freetype2
 #MANPREFIX = ${PREFIX}/man
+#KVMLIB = -lkvm
 
 # includes and libs
 INCS = -I${X11INC} -I${FREETYPEINC} `pkg-config --cflags xft pango pangoxft`
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} `pkg-config --libs xft pango pangoxft`
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} `pkg-config --libs xft pango pangoxft` -lX11-xcb -lxcb -lxcb-res ${KVMLIB}
 
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
diff --git a/dwm b/dwm
index 4355046..6694324 100755
--- a/dwm
+++ b/dwm
diff --git a/dwm.c b/dwm.c
index 84fc3ea..5a66327 100644
--- a/dwm.c
+++ b/dwm.c
@@ -41,6 +41,12 @@
 #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 <pango/pango.h>
 
 #include "drw.h"
@@ -101,9 +107,11 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
 	int bw, oldbw;
 	unsigned int tags;
-	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
+	pid_t pid;
 	Client *next;
 	Client *snext;
+	Client *swallowing;
 	Monitor *mon;
 	Window win;
 };
@@ -148,6 +156,8 @@ typedef struct {
 	const char *title;
 	unsigned int tags;
 	int isfloating;
+	int isterminal;
+	int noswallow;
 	int monitor;
 } Rule;
 
@@ -207,6 +217,7 @@ static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);
+static void moveresize(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void pop(Client *c);
 static void propertynotify(XEvent *e);
@@ -259,9 +270,17 @@ static int xerror(Display *dpy, XErrorEvent *ee);
 static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
+static void centeredmaster(Monitor *m);
+static void centeredfloatingmaster(Monitor *m);
 static void load_xresources(void);
 static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst);
 
+static pid_t getparentprocess(pid_t p);
+static int isdescprocess(pid_t p, pid_t c);
+static Client *swallowingclient(Window w);
+static Client *termforwin(const Client *c);
+static pid_t winpid(Window w);
+
 /* variables */
 static const char broken[] = "broken";
 static char stext[512];
@@ -298,9 +317,31 @@ static Drw *drw;
 static Monitor *mons, *selmon;
 static Window root, wmcheckwin;
 
+static xcb_connection_t *xcon;
+
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
+static void
+moveresize(const Arg *arg)
+{
+	XEvent ev;
+	Monitor *m = selmon;
+
+	if(!(m->sel && arg && arg->v && m->sel->isfloating))
+		return;
+
+	resize(m->sel, 
+      m->sel->x + ((int *)arg->v)[0],
+		m->sel->y + ((int *)arg->v)[1],
+		m->sel->w + ((int *)arg->v)[2],
+		m->sel->h + ((int *)arg->v)[3],
+		False);
+
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+
 /* compile-time check if all tags fit into an unsigned int bit array. */
 struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
 
@@ -327,6 +368,8 @@ applyrules(Client *c)
 		&& (!r->class || strstr(class, r->class))
 		&& (!r->instance || strstr(instance, r->instance)))
 		{
+			c->isterminal = r->isterminal;
+			c->noswallow  = r->noswallow;
 			c->isfloating = r->isfloating;
 			c->tags |= r->tags;
 			for (m = mons; m && m->num != r->monitor; m = m->next);
@@ -446,6 +489,53 @@ attachstack(Client *c)
 }
 
 void
+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;
@@ -692,6 +782,9 @@ destroynotify(XEvent *e)
 
 	if ((c = wintoclient(ev->window)))
 		unmanage(c, 1);
+
+	else if ((c = swallowingclient(ev->window)))
+		unmanage(c->swallowing, 1);
 }
 
 void
@@ -1067,12 +1160,13 @@ killclient(const Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
-	Client *c, *t = NULL;
+	Client *c, *t = NULL, *term = NULL;
 	Window trans = None;
 	XWindowChanges wc;
 
 	c = ecalloc(1, sizeof(Client));
 	c->win = w;
+	c->pid = winpid(w);
 	/* geometry */
 	c->x = c->oldx = wa->x;
 	c->y = c->oldy = wa->y;
@@ -1087,6 +1181,7 @@ manage(Window w, XWindowAttributes *wa)
 	} else {
 		c->mon = selmon;
 		applyrules(c);
+		term = termforwin(c);
 	}
 
 	if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
@@ -1121,6 +1216,8 @@ manage(Window w, XWindowAttributes *wa)
 	c->mon->sel = c;
 	arrange(c->mon);
 	XMapWindow(dpy, c->win);
+	if (term)
+		swallow(term, c);
 	focus(NULL);
 }
 
@@ -1158,7 +1255,7 @@ monocle(Monitor *m)
 	if (n > 0) /* override layout symbol */
 		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
 	for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
-		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
+		resize(c, m->wx+m->gappx, m->wy+m->gappx, m->ww - 2 * c->bw - 2*m->gappx, m->wh - 2 * c->bw - 2*m->gappx, 0);
 }
 
 void
@@ -1766,16 +1863,16 @@ tile(Monitor *m)
 		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;
-		}
+            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
@@ -1854,6 +1951,20 @@ unmanage(Client *c, int destroyed)
 	Monitor *m = c->mon;
 	XWindowChanges wc;
 
+	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);
 	if (!destroyed) {
@@ -1869,9 +1980,12 @@ unmanage(Client *c, int destroyed)
 		XUngrabServer(dpy);
 	}
 	free(c);
-	focus(NULL);
-	updateclientlist();
-	arrange(m);
+
+	if (!s) {
+		arrange(m);
+		focus(NULL);
+		updateclientlist();
+	}
 }
 
 void
@@ -2135,6 +2249,136 @@ view(const Arg *arg)
 	arrange(selmon);
 }
 
+pid_t
+winpid(Window w)
+{
+
+	pid_t result = 0;
+
+#ifdef __linux__
+	xcb_res_client_id_spec_t spec = {0};
+	spec.client = w;
+	spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
+
+	xcb_generic_error_t *e = NULL;
+	xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec);
+	xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e);
+
+	if (!r)
+		return (pid_t)0;
+
+	xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r);
+	for (; i.rem; xcb_res_client_id_value_next(&i)) {
+		spec = i.data->spec;
+		if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) {
+			uint32_t *t = xcb_res_client_id_value_value(i.data);
+			result = *t;
+			break;
+		}
+	}
+
+	free(r);
+
+	if (result == (pid_t)-1)
+		result = 0;
+
+#endif /* __linux__ */
+
+#ifdef __OpenBSD__
+        Atom type;
+        int format;
+        unsigned long len, bytes;
+        unsigned char *prop;
+        pid_t ret;
+
+        if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop)
+               return 0;
+
+        ret = *(pid_t*)prop;
+        XFree(prop);
+        result = ret;
+
+#endif /* __OpenBSD__ */
+	return result;
+}
+
+pid_t
+getparentprocess(pid_t p)
+{
+	unsigned int v = 0;
+
+#ifdef __linux__
+	FILE *f;
+	char buf[256];
+	snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
+
+	if (!(f = fopen(buf, "r")))
+		return 0;
+
+	fscanf(f, "%*u %*s %*c %u", &v);
+	fclose(f);
+#endif /* __linux__*/
+
+#ifdef __OpenBSD__
+	int n;
+	kvm_t *kd;
+	struct kinfo_proc *kp;
+
+	kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL);
+	if (!kd)
+		return 0;
+
+	kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n);
+	v = kp->p_ppid;
+#endif /* __OpenBSD__ */
+
+	return (pid_t)v;
+}
+
+int
+isdescprocess(pid_t p, pid_t c)
+{
+	while (p != c && c != 0)
+		c = getparentprocess(c);
+
+	return (int)c;
+}
+
+Client *
+termforwin(const Client *w)
+{
+	Client *c;
+	Monitor *m;
+
+	if (!w->pid || w->isterminal)
+		return NULL;
+
+	for (m = mons; m; m = m->next) {
+		for (c = m->clients; c; c = c->next) {
+			if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
+				return c;
+		}
+	}
+
+	return NULL;
+}
+
+Client *
+swallowingclient(Window w)
+{
+	Client *c;
+	Monitor *m;
+
+	for (m = mons; m; m = m->next) {
+		for (c = m->clients; c; c = c->next) {
+			if (c->swallowing && c->swallowing->win == w)
+				return c;
+		}
+	}
+
+	return NULL;
+}
+
 Client *
 wintoclient(Window w)
 {
@@ -2278,12 +2522,14 @@ main(int argc, char *argv[])
 		fputs("warning: no locale support\n", stderr);
 	if (!(dpy = XOpenDisplay(NULL)))
 		die("dwm: cannot open display");
+	if (!(xcon = XGetXCBConnection(dpy)))
+		die("dwm: cannot get xcb connection\n");
 	checkotherwm();
 	XrmInitialize();
 	load_xresources();
 	setup();
 #ifdef __OpenBSD__
-	if (pledge("stdio rpath proc exec", NULL) == -1)
++	if (pledge("stdio rpath proc exec ps", NULL) == -1)
 		die("pledge");
 #endif /* __OpenBSD__ */
 	scan();
@@ -2292,3 +2538,106 @@ main(int argc, char *argv[])
 	XCloseDisplay(dpy);
 	return EXIT_SUCCESS;
 }
+
+void
+centeredmaster(Monitor *m)
+{
+	unsigned int i, n, h, mw, mx, my, oty, ety, tw;
+	Client *c;
+
+	/* count number of clients in the selected monitor */
+	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+	if (n == 0)
+		return;
+
+	/* initialize areas */
+	mw = m->ww;
+	mx = 0;
+	my = 0;
+	tw = mw;
+
+	if (n > m->nmaster) {
+		/* go mfact box in the center if more than nmaster clients */
+		mw = m->nmaster ? m->ww * m->mfact : 0;
+		tw = m->ww - mw;
+
+		if (n - m->nmaster > 1) {
+			/* only one client */
+			mx = (m->ww - mw) / 2;
+			tw = (m->ww - mw) / 2;
+		}
+	}
+
+	oty = 0;
+	ety = 0;
+	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+	if (i < m->nmaster) {
+		/* nmaster clients are stacked vertically, in the center
+		 * of the screen */
+		h = (m->wh - my) / (MIN(n, m->nmaster) - i);
+		resize(c, m->wx + mx, m->wy + my + m->gappx, mw - (2*c->bw),
+		       h - (2*c->bw) - 2*m->gappx, 0);
+		my += HEIGHT(c);
+	} else {
+		/* stack clients are stacked vertically */
+		if ((i - m->nmaster) % 2 ) {
+			h = (m->wh - ety) / ( (1 + n - i) / 2);
+			resize(c, m->wx + m->gappx, m->wy + ety + m->gappx, tw - (2*c->bw) - 2*m->gappx,
+			       h - (2*c->bw) - 2*m->gappx, 0);
+			ety += HEIGHT(c);
+		} else {
+			h = (m->wh - oty) / ((1 + n - i) / 2);
+			resize(c, m->wx + mx + mw + m->gappx, m->wy + oty + m->gappx,
+			       tw - (2*c->bw) - 2*m->gappx, h - (2*c->bw) - 2*m->gappx, 0);
+			oty += HEIGHT(c);
+		}
+	}
+}
+
+void
+centeredfloatingmaster(Monitor *m)
+{
+	unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
+	Client *c;
+
+	/* count number of clients in the selected monitor */
+	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+	if (n == 0)
+		return;
+
+	/* initialize nmaster area */
+	if (n > m->nmaster) {
+		/* go mfact box in the center if more than nmaster clients */
+		if (m->ww > m->wh) {
+			mw = m->nmaster ? m->ww * m->mfact : 0;
+			mh = m->nmaster ? m->wh * 0.9 : 0;
+		} else {
+			mh = m->nmaster ? m->wh * m->mfact : 0;
+			mw = m->nmaster ? m->ww * 0.9 : 0;
+		}
+		mx = mxo = (m->ww - mw) / 2;
+		my = myo = (m->wh - mh) / 2;
+	} else {
+		/* go fullscreen if all clients are in the master area */
+		mh = m->wh;
+		mw = m->ww;
+		mx = mxo = 0;
+		my = myo = 0;
+	}
+
+	for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+	if (i < m->nmaster) {
+		/* nmaster clients are stacked horizontally, in the center
+		 * of the screen */
+		w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
+		resize(c, m->wx + mx + m->gappx, m->wy + my + m->gappx, w - (2*c->bw) - 2*m->gappx,
+		       mh - (2*c->bw) - 2*m->gappx, 0);
+		mx += WIDTH(c);
+	} else {
+		/* stack clients are stacked horizontally */
+		w = (m->ww - tx) / (n - i);
+		resize(c, m->wx + tx + m->gappx, m->wy + m->gappx, w - (2*c->bw) - 2*m->gappx,
+		       m->wh - (2*c->bw) - 2*m->gappx, 0);
+		tx += WIDTH(c);
+	}
+}