commit 559e242fda4b85bed19540c39d533905bd34ef0d
parent 788106a7c07bbce2da27e12da503160bbbd12a0e
Author: Britton Leo Kerin <britton.kerin@gmail.com>
Date: Sun, 17 Jul 2016 12:21:48 -0800
Merge branch 'master' of git://git.suckless.org/sites
Diffstat:
4 files changed, 435 insertions(+), 427 deletions(-)
diff --git a/dwm.suckless.org/patches/dwm-swallow-20160715-56a31dc.diff b/dwm.suckless.org/patches/dwm-swallow-20160715-56a31dc.diff
@@ -1,375 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index fd77a07..e6b96c9 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -26,9 +26,10 @@ 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, 0, -1 },
-+ { "st-", NULL, NULL, 0, 0, 1, 1, -1 },
- };
-
- /* layout(s) */
-diff --git a/dwm.c b/dwm.c
-index b2bc9bd..730061a 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -40,6 +40,10 @@
- #include <X11/extensions/Xinerama.h>
- #endif /* XINERAMA */
- #include <X11/Xft/Xft.h>
-+#ifdef SWALLOWING
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/res.h>
-+#endif
-
- #include "drw.h"
- #include "util.h"
-@@ -93,9 +97,11 @@ struct Client {
- int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- 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;
- };
-@@ -139,6 +145,8 @@ typedef struct {
- const char *title;
- unsigned int tags;
- int isfloating;
-+ int isterminal;
-+ int noswallow;
- int monitor;
- } Rule;
-
-@@ -171,12 +179,14 @@ static void focus(Client *c);
- static void focusin(XEvent *e);
- static void focusmon(const Arg *arg);
- static void focusstack(const Arg *arg);
-+static pid_t getparentprocess(pid_t p);
- static int getrootptr(int *x, int *y);
- static long getstate(Window w);
- static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void grabbuttons(Client *c, int focused);
- static void grabkeys(void);
- static void incnmaster(const Arg *arg);
-+static int isdescprocess(pid_t p, pid_t c);
- static void keypress(XEvent *e);
- static void killclient(const Arg *arg);
- static void manage(Window w, XWindowAttributes *wa);
-@@ -207,8 +217,10 @@ static void setup(void);
- static void showhide(Client *c);
- static void sigchld(int unused);
- static void spawn(const Arg *arg);
-+static Client *swallowingclient(Window w);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
-+static Client *termforwin(const Client *c);
- static void tile(Monitor *);
- static void togglebar(const Arg *arg);
- static void togglefloating(const Arg *arg);
-@@ -228,6 +240,7 @@ static void updatewindowtype(Client *c);
- static void updatetitle(Client *c);
- static void updatewmhints(Client *c);
- static void view(const Arg *arg);
-+static pid_t winpid(Window w);
- static Client *wintoclient(Window w);
- static Monitor *wintomon(Window w);
- static int xerror(Display *dpy, XErrorEvent *ee);
-@@ -269,6 +282,10 @@ static Drw *drw;
- static Monitor *mons, *selmon;
- static Window root;
-
-+#ifdef SWALLOWING
-+static xcb_connection_t *xcon;
-+#endif /* SWALLOWING */
-+
- /* configuration, allows nested code to access above variables */
- #include "config.h"
-
-@@ -298,6 +315,7 @@ applyrules(Client *c)
- && (!r->class || strstr(class, r->class))
- && (!r->instance || strstr(instance, r->instance)))
- {
-+ c->isterminal = r->isterminal;
- c->isfloating = r->isfloating;
- c->tags |= r->tags;
- for (m = mons; m && m->num != r->monitor; m = m->next);
-@@ -415,6 +433,46 @@ attachstack(Client *c)
- }
-
- void
-+swallow(Client *p, Client *c)
-+{
-+ if (c->noswallow || c->isterminal)
-+ 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);
-+ arrange(p->mon);
-+ configure(p);
-+ updateclientlist();
-+}
-+
-+void
-+unswallow(Client *c)
-+{
-+ c->win = c->swallowing->win;
-+
-+ free(c->swallowing);
-+ c->swallowing = NULL;
-+
-+ updatetitle(c);
-+ arrange(c->mon);
-+ XMapWindow(dpy, c->win);
-+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-+ configure(c);
-+ setclientstate(c, NormalState);
-+}
-+
-+void
- buttonpress(XEvent *e)
- {
- unsigned int i, x, click;
-@@ -477,7 +535,7 @@ cleanup(void)
- selmon->lt[selmon->sellt] = &foo;
- for (m = mons; m; m = m->next)
- while (m->stack)
-- unmanage(m->stack, 0);
-+ unmanage(m->stack, 0); // XXX - unmanage swallowing windows too
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- while (mons)
- cleanupmon(mons);
-@@ -665,6 +723,9 @@ destroynotify(XEvent *e)
-
- if ((c = wintoclient(ev->window)))
- unmanage(c, 1);
-+
-+ else if ((c = swallowingclient(ev->window)))
-+ unmanage(c->swallowing, 1);
- }
-
- void
-@@ -1034,12 +1095,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;
-@@ -1054,6 +1116,7 @@ manage(Window w, XWindowAttributes *wa)
- } else {
- c->mon = selmon;
- applyrules(c);
-+ term = termforwin(c);
- }
-
- if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
-@@ -1090,6 +1153,8 @@ manage(Window w, XWindowAttributes *wa)
- c->mon->sel = c;
- arrange(c->mon);
- XMapWindow(dpy, c->win);
-+ if (term)
-+ swallow(term, c);
- focus(NULL);
- }
-
-@@ -1757,6 +1822,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;
-+ }
-+
- /* The server grab construct avoids race conditions. */
- detach(c);
- detachstack(c);
-@@ -1772,9 +1851,12 @@ unmanage(Client *c, int destroyed)
- XUngrabServer(dpy);
- }
- free(c);
-- focus(NULL);
-- updateclientlist();
-- arrange(m);
-+
-+ if (!s) {
-+ arrange(m);
-+ focus(NULL);
-+ updateclientlist();
-+ }
- }
-
- void
-@@ -2039,16 +2121,118 @@ view(const Arg *arg)
- arrange(selmon);
- }
-
-+pid_t
-+winpid(Window w)
-+{
-+ pid_t result = 0;
-+
-+#ifdef SWALLOWING
-+ 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);
-+#endif /* SWALLOWING */
-+
-+ if (result == (pid_t)-1)
-+ result = 0;
-+ 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__ */
-+
-+ return (pid_t)v;
-+}
-+
-+int
-+isdescprocess(pid_t p, pid_t c)
-+{
-+ while (p != c && c != 0)
-+ c = getparentprocess(c);
-+
-+ return (int)c;
-+}
-+
-+Client *
-+termforwin(const Client *w)
-+{
-+ Client *c;
-+ Monitor *m;
-+
-+ if (!w->pid || w->isterminal)
-+ return NULL;
-+
-+ for (m = mons; m; m = m->next) {
-+ for (c = m->clients; c; c = c->next) {
-+ if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
-+ return c;
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
-+Client *
-+swallowingclient(Window w)
-+{
-+ Client *c;
-+ Monitor *m;
-+
-+ for (m = mons; m; m = m->next) {
-+ for (c = m->clients; c; c = c->next) {
-+ if (c->swallowing && c->swallowing->win == w)
-+ return c;
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
- Client *
- wintoclient(Window w)
- {
- Client *c;
- Monitor *m;
-
-- for (m = mons; m; m = m->next)
-- for (c = m->clients; c; c = c->next)
-+ for (m = mons; m; m = m->next) {
-+ for (c = m->clients; c; c = c->next) {
- if (c->win == w)
- return c;
-+ }
-+ }
-+
- return NULL;
- }
-
-@@ -2130,6 +2314,10 @@ main(int argc, char *argv[])
- fputs("warning: no locale support\n", stderr);
- if (!(dpy = XOpenDisplay(NULL)))
- die("dwm: cannot open display\n");
-+#ifdef SWALLOWING
-+ if (!(xcon = XGetXCBConnection(dpy)))
-+ die("dwm: cannot get xcb connection\n");
-+#endif
- checkotherwm();
- setup();
- scan();
diff --git a/dwm.suckless.org/patches/dwm-swallow-20160717-56a31dc.diff b/dwm.suckless.org/patches/dwm-swallow-20160717-56a31dc.diff
@@ -0,0 +1,380 @@
+diff --git a/config.def.h b/config.def.h
+index fd77a07..69976b3 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -26,9 +26,10 @@ 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, 0, -1 },
++ { "st", NULL, NULL, 0, 0, 1, 1, -1 },
+ };
+
+ /* layout(s) */
+diff --git a/config.mk b/config.mk
+index 80dc936..5ed14e3 100644
+--- a/config.mk
++++ b/config.mk
+@@ -22,7 +22,7 @@ FREETYPEINC = /usr/include/freetype2
+
+ # includes and libs
+ INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res
+
+ # flags
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+diff --git a/dwm.c b/dwm.c
+index b2bc9bd..528df2f 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -40,6 +40,8 @@
+ #include <X11/extensions/Xinerama.h>
+ #endif /* XINERAMA */
+ #include <X11/Xft/Xft.h>
++#include <X11/Xlib-xcb.h>
++#include <xcb/res.h>
+
+ #include "drw.h"
+ #include "util.h"
+@@ -93,9 +95,11 @@ struct Client {
+ int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+ 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;
+ };
+@@ -139,6 +143,8 @@ typedef struct {
+ const char *title;
+ unsigned int tags;
+ int isfloating;
++ int isterminal;
++ int noswallow;
+ int monitor;
+ } Rule;
+
+@@ -171,12 +177,14 @@ static void focus(Client *c);
+ static void focusin(XEvent *e);
+ static void focusmon(const Arg *arg);
+ static void focusstack(const Arg *arg);
++static pid_t getparentprocess(pid_t p);
+ static int getrootptr(int *x, int *y);
+ static long getstate(Window w);
+ static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
+ static void grabbuttons(Client *c, int focused);
+ static void grabkeys(void);
+ static void incnmaster(const Arg *arg);
++static int isdescprocess(pid_t p, pid_t c);
+ static void keypress(XEvent *e);
+ static void killclient(const Arg *arg);
+ static void manage(Window w, XWindowAttributes *wa);
+@@ -207,8 +215,10 @@ static void setup(void);
+ static void showhide(Client *c);
+ static void sigchld(int unused);
+ static void spawn(const Arg *arg);
++static Client *swallowingclient(Window w);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
++static Client *termforwin(const Client *c);
+ static void tile(Monitor *);
+ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
+@@ -228,6 +238,7 @@ static void updatewindowtype(Client *c);
+ static void updatetitle(Client *c);
+ static void updatewmhints(Client *c);
+ static void view(const Arg *arg);
++static pid_t winpid(Window w);
+ static Client *wintoclient(Window w);
+ static Monitor *wintomon(Window w);
+ static int xerror(Display *dpy, XErrorEvent *ee);
+@@ -269,6 +280,8 @@ static Drw *drw;
+ static Monitor *mons, *selmon;
+ static Window root;
+
++static xcb_connection_t *xcon;
++
+ /* configuration, allows nested code to access above variables */
+ #include "config.h"
+
+@@ -298,6 +311,7 @@ applyrules(Client *c)
+ && (!r->class || strstr(class, r->class))
+ && (!r->instance || strstr(instance, r->instance)))
+ {
++ c->isterminal = r->isterminal;
+ c->isfloating = r->isfloating;
+ c->tags |= r->tags;
+ for (m = mons; m && m->num != r->monitor; m = m->next);
+@@ -415,6 +429,46 @@ attachstack(Client *c)
+ }
+
+ void
++swallow(Client *p, Client *c)
++{
++ if (c->noswallow || c->isterminal)
++ 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);
++ arrange(p->mon);
++ configure(p);
++ updateclientlist();
++}
++
++void
++unswallow(Client *c)
++{
++ c->win = c->swallowing->win;
++
++ free(c->swallowing);
++ c->swallowing = NULL;
++
++ updatetitle(c);
++ arrange(c->mon);
++ XMapWindow(dpy, c->win);
++ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
++ configure(c);
++ setclientstate(c, NormalState);
++}
++
++void
+ buttonpress(XEvent *e)
+ {
+ unsigned int i, x, click;
+@@ -477,7 +531,7 @@ cleanup(void)
+ selmon->lt[selmon->sellt] = &foo;
+ for (m = mons; m; m = m->next)
+ while (m->stack)
+- unmanage(m->stack, 0);
++ unmanage(m->stack, 0); // XXX - unmanage swallowing windows too
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ while (mons)
+ cleanupmon(mons);
+@@ -665,6 +719,9 @@ destroynotify(XEvent *e)
+
+ if ((c = wintoclient(ev->window)))
+ unmanage(c, 1);
++
++ else if ((c = swallowingclient(ev->window)))
++ unmanage(c->swallowing, 1);
+ }
+
+ void
+@@ -1034,12 +1091,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;
+@@ -1054,6 +1112,7 @@ manage(Window w, XWindowAttributes *wa)
+ } else {
+ c->mon = selmon;
+ applyrules(c);
++ term = termforwin(c);
+ }
+
+ if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+@@ -1090,6 +1149,8 @@ manage(Window w, XWindowAttributes *wa)
+ c->mon->sel = c;
+ arrange(c->mon);
+ XMapWindow(dpy, c->win);
++ if (term)
++ swallow(term, c);
+ focus(NULL);
+ }
+
+@@ -1757,6 +1818,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;
++ }
++
+ /* The server grab construct avoids race conditions. */
+ detach(c);
+ detachstack(c);
+@@ -1772,9 +1847,12 @@ unmanage(Client *c, int destroyed)
+ XUngrabServer(dpy);
+ }
+ free(c);
+- focus(NULL);
+- updateclientlist();
+- arrange(m);
++
++ if (!s) {
++ arrange(m);
++ focus(NULL);
++ updateclientlist();
++ }
+ }
+
+ void
+@@ -2039,16 +2117,116 @@ view(const Arg *arg)
+ arrange(selmon);
+ }
+
++pid_t
++winpid(Window w)
++{
++ pid_t result = 0;
++
++ 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;
++ 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__ */
++
++ return (pid_t)v;
++}
++
++int
++isdescprocess(pid_t p, pid_t c)
++{
++ while (p != c && c != 0)
++ c = getparentprocess(c);
++
++ return (int)c;
++}
++
++Client *
++termforwin(const Client *w)
++{
++ Client *c;
++ Monitor *m;
++
++ if (!w->pid || w->isterminal)
++ return NULL;
++
++ for (m = mons; m; m = m->next) {
++ for (c = m->clients; c; c = c->next) {
++ if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
++ return c;
++ }
++ }
++
++ return NULL;
++}
++
++Client *
++swallowingclient(Window w)
++{
++ Client *c;
++ Monitor *m;
++
++ for (m = mons; m; m = m->next) {
++ for (c = m->clients; c; c = c->next) {
++ if (c->swallowing && c->swallowing->win == w)
++ return c;
++ }
++ }
++
++ return NULL;
++}
++
+ Client *
+ wintoclient(Window w)
+ {
+ Client *c;
+ Monitor *m;
+
+- for (m = mons; m; m = m->next)
+- for (c = m->clients; c; c = c->next)
++ for (m = mons; m; m = m->next) {
++ for (c = m->clients; c; c = c->next) {
+ if (c->win == w)
+ return c;
++ }
++ }
++
+ return NULL;
+ }
+
+@@ -2130,6 +2308,8 @@ main(int argc, char *argv[])
+ fputs("warning: no locale support\n", stderr);
+ if (!(dpy = XOpenDisplay(NULL)))
+ die("dwm: cannot open display\n");
++ if (!(xcon = XGetXCBConnection(dpy)))
++ die("dwm: cannot get xcb connection\n");
+ checkotherwm();
+ setup();
+ scan();
diff --git a/dwm.suckless.org/patches/dwm-swallow-6.1.diff b/dwm.suckless.org/patches/dwm-swallow-6.1.diff
@@ -1,5 +1,5 @@
diff --git a/config.def.h b/config.def.h
-index 7054c06..d1140ff 100644
+index 7054c06..2bfd607 100644
--- a/config.def.h
+++ b/config.def.h
@@ -24,9 +24,10 @@ static const Rule rules[] = {
@@ -12,26 +12,37 @@ index 7054c06..d1140ff 100644
+ /* class instance title tags mask isfloating isterminal noswallow monitor */
+ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
+ { "Firefox", NULL, NULL, 1 << 8, 0, 0, 0, -1 },
-+ { "st-", NULL, NULL, 0, 0, 1, 1, -1 },
++ { "st", NULL, NULL, 0, 0, 1, 1, -1 },
};
/* layout(s) */
+diff --git a/config.mk b/config.mk
+index 4eefb71..34ea872 100644
+--- a/config.mk
++++ b/config.mk
+@@ -22,7 +22,7 @@ FREETYPEINC = /usr/include/freetype2
+
+ # includes and libs
+ INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res
+
+ # flags
+ CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
diff --git a/dwm.c b/dwm.c
-index 0362114..273cc32 100644
+index 0362114..566491a 100644
--- a/dwm.c
+++ b/dwm.c
-@@ -40,6 +40,10 @@
+@@ -40,6 +40,8 @@
#include <X11/extensions/Xinerama.h>
#endif /* XINERAMA */
#include <X11/Xft/Xft.h>
-+#ifdef SWALLOWING
+#include <X11/Xlib-xcb.h>
+#include <xcb/res.h>
-+#endif
#include "drw.h"
#include "util.h"
-@@ -92,9 +96,11 @@ struct Client {
+@@ -92,9 +94,11 @@ struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int bw, oldbw;
unsigned int tags;
@@ -44,7 +55,7 @@ index 0362114..273cc32 100644
Monitor *mon;
Window win;
};
-@@ -138,6 +144,8 @@ typedef struct {
+@@ -138,6 +142,8 @@ typedef struct {
const char *title;
unsigned int tags;
int isfloating;
@@ -53,7 +64,7 @@ index 0362114..273cc32 100644
int monitor;
} Rule;
-@@ -170,12 +178,14 @@ static void focus(Client *c);
+@@ -170,12 +176,14 @@ static void focus(Client *c);
static void focusin(XEvent *e);
static void focusmon(const Arg *arg);
static void focusstack(const Arg *arg);
@@ -68,7 +79,7 @@ index 0362114..273cc32 100644
static void keypress(XEvent *e);
static void killclient(const Arg *arg);
static void manage(Window w, XWindowAttributes *wa);
-@@ -206,8 +216,10 @@ static void setup(void);
+@@ -206,8 +214,10 @@ static void setup(void);
static void showhide(Client *c);
static void sigchld(int unused);
static void spawn(const Arg *arg);
@@ -79,7 +90,7 @@ index 0362114..273cc32 100644
static void tile(Monitor *);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
-@@ -227,6 +239,7 @@ static void updatewindowtype(Client *c);
+@@ -227,6 +237,7 @@ static void updatewindowtype(Client *c);
static void updatetitle(Client *c);
static void updatewmhints(Client *c);
static void view(const Arg *arg);
@@ -87,18 +98,16 @@ index 0362114..273cc32 100644
static Client *wintoclient(Window w);
static Monitor *wintomon(Window w);
static int xerror(Display *dpy, XErrorEvent *ee);
-@@ -267,6 +280,10 @@ static Drw *drw;
+@@ -267,6 +278,8 @@ static Drw *drw;
static Monitor *mons, *selmon;
static Window root;
-+#ifdef SWALLOWING
+static xcb_connection_t *xcon;
-+#endif /* SWALLOWING */
+
/* configuration, allows nested code to access above variables */
#include "config.h"
-@@ -296,6 +313,7 @@ applyrules(Client *c)
+@@ -296,6 +309,7 @@ applyrules(Client *c)
&& (!r->class || strstr(class, r->class))
&& (!r->instance || strstr(instance, r->instance)))
{
@@ -106,7 +115,7 @@ index 0362114..273cc32 100644
c->isfloating = r->isfloating;
c->tags |= r->tags;
for (m = mons; m && m->num != r->monitor; m = m->next);
-@@ -413,6 +431,46 @@ attachstack(Client *c)
+@@ -413,6 +427,46 @@ attachstack(Client *c)
}
void
@@ -153,7 +162,7 @@ index 0362114..273cc32 100644
buttonpress(XEvent *e)
{
unsigned int i, x, click;
-@@ -475,7 +533,7 @@ cleanup(void)
+@@ -475,7 +529,7 @@ cleanup(void)
selmon->lt[selmon->sellt] = &foo;
for (m = mons; m; m = m->next)
while (m->stack)
@@ -162,7 +171,7 @@ index 0362114..273cc32 100644
XUngrabKey(dpy, AnyKey, AnyModifier, root);
while (mons)
cleanupmon(mons);
-@@ -661,6 +719,9 @@ destroynotify(XEvent *e)
+@@ -661,6 +715,9 @@ destroynotify(XEvent *e)
if ((c = wintoclient(ev->window)))
unmanage(c, 1);
@@ -172,7 +181,7 @@ index 0362114..273cc32 100644
}
void
-@@ -1032,12 +1093,13 @@ killclient(const Arg *arg)
+@@ -1032,12 +1089,13 @@ killclient(const Arg *arg)
void
manage(Window w, XWindowAttributes *wa)
{
@@ -187,7 +196,7 @@ index 0362114..273cc32 100644
updatetitle(c);
if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
c->mon = t->mon;
-@@ -1045,7 +1107,9 @@ manage(Window w, XWindowAttributes *wa)
+@@ -1045,7 +1103,9 @@ manage(Window w, XWindowAttributes *wa)
} else {
c->mon = selmon;
applyrules(c);
@@ -197,7 +206,7 @@ index 0362114..273cc32 100644
/* geometry */
c->x = c->oldx = wa->x;
c->y = c->oldy = wa->y;
-@@ -1087,6 +1151,8 @@ manage(Window w, XWindowAttributes *wa)
+@@ -1087,6 +1147,8 @@ manage(Window w, XWindowAttributes *wa)
c->mon->sel = c;
arrange(c->mon);
XMapWindow(dpy, c->win);
@@ -206,7 +215,7 @@ index 0362114..273cc32 100644
focus(NULL);
}
-@@ -1758,6 +1824,20 @@ unmanage(Client *c, int destroyed)
+@@ -1758,6 +1820,20 @@ unmanage(Client *c, int destroyed)
Monitor *m = c->mon;
XWindowChanges wc;
@@ -227,7 +236,7 @@ index 0362114..273cc32 100644
/* The server grab construct avoids race conditions. */
detach(c);
detachstack(c);
-@@ -1773,9 +1853,12 @@ unmanage(Client *c, int destroyed)
+@@ -1773,9 +1849,12 @@ unmanage(Client *c, int destroyed)
XUngrabServer(dpy);
}
free(c);
@@ -243,7 +252,7 @@ index 0362114..273cc32 100644
}
void
-@@ -2040,16 +2123,118 @@ view(const Arg *arg)
+@@ -2040,16 +2119,116 @@ view(const Arg *arg)
arrange(selmon);
}
@@ -252,7 +261,6 @@ index 0362114..273cc32 100644
+{
+ pid_t result = 0;
+
-+#ifdef SWALLOWING
+ xcb_res_client_id_spec_t spec = {0};
+ spec.client = w;
+ spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
@@ -275,7 +283,6 @@ index 0362114..273cc32 100644
+ }
+
+ free(r);
-+#endif /* SWALLOWING */
+
+ if (result == (pid_t)-1)
+ result = 0;
@@ -364,14 +371,12 @@ index 0362114..273cc32 100644
return NULL;
}
-@@ -2131,6 +2316,10 @@ main(int argc, char *argv[])
+@@ -2131,6 +2310,8 @@ main(int argc, char *argv[])
fputs("warning: no locale support\n", stderr);
if (!(dpy = XOpenDisplay(NULL)))
die("dwm: cannot open display\n");
-+#ifdef SWALLOWING
+ if (!(xcon = XGetXCBConnection(dpy)))
+ die("dwm: cannot get xcb connection\n");
-+#endif
checkotherwm();
setup();
scan();
diff --git a/dwm.suckless.org/patches/swallow.md b/dwm.suckless.org/patches/swallow.md
@@ -4,50 +4,48 @@ swallow
Description
-----------
-This patch adds "window swallowing" to dwm, a la `rio` from Plan 9.
+This patch adds "window swallowing" to dwm as known from Plan 9's windowing
+system `rio`.
-Windows that are marked with the `isterminal` flag (settable using rules in
-`config.h`) will swallow a window opened by any descendant processes.
-For example, if you open a terminal and then in that terminal type `xclock`,
-the `xclock` window takes the place of that terminal window.
+Clients marked with `isterminal` in config.h swallow a window opened by
+any child process, e.g. running `xclock` in a terminal.
Closing the `xclock` window restores the terminal window in the current
position.
-This patch is useful for users who tend to do most or all of their work
-from the command line, but sometimes need to use a graphical program.
-This patch avoids cluttering the desktop with unused terminals.
+This patch helps users spawning a lot of graphical programs from their
+command line by avoiding cluttering the screen with many unusable terminals.
+Being deep down in a directory hierarchy just does not make the use of
+dmenu feasible.
-(`dmenu` could be used, but if you are deep in a directory hierarchy and
-want to, say, view a PDF, cutting and pasting the path to `dmenu` takes
-longer than just running `mupdf`.)
+Dependencies
+------------
+
+ * libxcb
+ * Xlib-libxcb
+ * xcb-res
+
+These dependencies are needed due to the use of the latest revision of the X
+Resource Extension which is unsupported in vanilla Xlib.
Download
--------
* [dwm-swallow-6.1.diff](dwm-swallow-6.1.diff)
- * [dwm-swallow-20160715-56a31dc.diff](dwm-swallow-20160715-56a31dc.diff)
+ * [dwm-swallow-20160717-56a31dc.diff](dwm-swallow-20160717-56a31dc.diff)
Notes
-----
The window swallowing functionality requires `dwm` to walk the process tree,
which is an inherently OS-specific task. Only Linux is supported at this time.
-Please contact the author (jking@deadpixi.com) if you would like to help
-expand the list of supported operating systems.
-
-Also please note that building with this patch requires `libxcb`,
-`Xlib-libxcb`, and `xcb-res`.
-This is due to the use of the latest revision of the X Resource Extension,
-which is unsupported in vanilla Xlib.
+Please contact one of the authors if you would like to help expand the list
+of supported operating systems.
Only terminals created by local processes can swallow windows, and only
windows created by local processes can be swallowed.
-Please see [deadpixi-dwm](https://github.com/deadpixi/deadpixi-dwm) for the
-development site.
-
Authors
-------
* Rob King - <jking@deadpixi.com>
- * Laslo Hunhold - <dev@frign.de> (git port)
+ * Laslo Hunhold - <dev@frign.de> (6.1, git port)
