[wiki] [sites] dwm: update swallow patch || FRIGN

From: <git_AT_suckless.org>
Date: Fri, 15 Jul 2016 13:59:03 +0200

commit 17f3730a7be21391787379229f0a1e99c4aebf5c
Author: FRIGN <dev_AT_frign.de>
Date: Fri Jul 15 13:58:27 2016 +0200

    dwm: update swallow patch

diff --git a/dwm.suckless.org/patches/dwm-6.1-swallowing.diff b/dwm.suckless.org/patches/dwm-6.1-swallowing.diff
deleted file mode 100644
index c116080..0000000
--- a/dwm.suckless.org/patches/dwm-6.1-swallowing.diff
+++ /dev/null
_AT_@ -1,377 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 7054c06..d1140ff 100644
---- a/config.def.h
-+++ b/config.def.h
-_AT_@ -24,9 +24,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 ff7e096..b50436a 100644
---- a/dwm.c
-+++ b/dwm.c
-_AT_@ -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"
-_AT_@ -92,9 +96,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;
- };
-_AT_@ -138,6 +144,8 @@ typedef struct {
- const char *title;
- unsigned int tags;
- int isfloating;
-+ int isterminal;
-+ int noswallow;
- int monitor;
- } Rule;
-
-_AT_@ -170,12 +178,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);
-_AT_@ -206,8 +216,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);
-_AT_@ -227,6 +239,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);
-_AT_@ -267,6 +280,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"
-
-_AT_@ -296,6 +313,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);
-_AT_@ -413,6 +431,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;
-_AT_@ -475,7 +533,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);
-_AT_@ -666,6 +724,9 @@ destroynotify(XEvent *e)
-
- if ((c = wintoclient(ev->window)))
- unmanage(c, 1);
-+
-+ else if ((c = swallowingclient(ev->window)))
-+ unmanage(c->swallowing, 1);
- }
-
- void
-_AT_@ -1037,12 +1098,13 @@ killclient(const Arg *arg)
- void
- manage(Window w, XWindowAttributes *wa)
- {
-- Client *c, *t = NULL;
-+ Client *c, *t, *term = NULL;
- Window trans = None;
- XWindowChanges wc;
-
- c = ecalloc(1, sizeof(Client));
- c->win = w;
-+ c->pid = winpid(w);
- updatetitle(c);
- if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
- c->mon = t->mon;
-_AT_@ -1050,7 +1112,9 @@ manage(Window w, XWindowAttributes *wa)
- } else {
- c->mon = selmon;
- applyrules(c);
-+ term = termforwin(c);
- }
-+
- /* geometry */
- c->x = c->oldx = wa->x;
- c->y = c->oldy = wa->y;
-_AT_@ -1092,6 +1156,8 @@ manage(Window w, XWindowAttributes *wa)
- c->mon->sel = c;
- arrange(c->mon);
- XMapWindow(dpy, c->win);
-+ if (term)
-+ swallow(term, c);
- focus(NULL);
- }
-
-_AT_@ -1763,6 +1829,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);
-_AT_@ -1778,9 +1858,12 @@ unmanage(Client *c, int destroyed)
- XUngrabServer(dpy);
- }
- free(c);
-- focus(NULL);
-- updateclientlist();
-- arrange(m);
-+
-+ if (!s) {
-+ arrange(m);
-+ focus(NULL);
-+ updateclientlist();
-+ }
- }
-
- void
-_AT_@ -2045,16 +2128,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;
- }
-
-_AT_@ -2136,6 +2321,10 @@ main(int argc, char *argv[])
- fputs("warning: no locale support
", stderr);
- if (!(dpy = XOpenDisplay(NULL)))
- die("dwm: cannot open display
");
-+#ifdef SWALLOWING
-+ if (!(xcon = XGetXCBConnection(dpy)))
-+ die("dwm: cannot get xcb connection
");
-+#endif
- checkotherwm();
- setup();
- scan();
diff --git a/dwm.suckless.org/patches/dwm-swallow-20160715-56a31dc.diff b/dwm.suckless.org/patches/dwm-swallow-20160715-56a31dc.diff
new file mode 100644
index 0000000..36fa090
--- /dev/null
+++ b/dwm.suckless.org/patches/dwm-swallow-20160715-56a31dc.diff
_AT_@ -0,0 +1,375 @@
+diff --git a/config.def.h b/config.def.h
+index fd77a07..e6b96c9 100644
+--- a/config.def.h
++++ b/config.def.h
+_AT_@ -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
+_AT_@ -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"
+_AT_@ -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;
+ };
+_AT_@ -139,6 +145,8 @@ typedef struct {
+ const char *title;
+ unsigned int tags;
+ int isfloating;
++ int isterminal;
++ int noswallow;
+ int monitor;
+ } Rule;
+
+_AT_@ -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);
+_AT_@ -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);
+_AT_@ -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);
+_AT_@ -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"
+
+_AT_@ -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);
+_AT_@ -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;
+_AT_@ -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);
+_AT_@ -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
+_AT_@ -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;
+_AT_@ -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)
+_AT_@ -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);
+ }
+
+_AT_@ -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);
+_AT_@ -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
+_AT_@ -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;
+ }
+
+_AT_@ -2130,6 +2314,10 @@ main(int argc, char *argv[])
+ fputs("warning: no locale support
", stderr);
+ if (!(dpy = XOpenDisplay(NULL)))
+ die("dwm: cannot open display
");
++#ifdef SWALLOWING
++ if (!(xcon = XGetXCBConnection(dpy)))
++ die("dwm: cannot get xcb connection
");
++#endif
+ 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
new file mode 100644
index 0000000..163d8b7
--- /dev/null
+++ b/dwm.suckless.org/patches/dwm-swallow-6.1.diff
_AT_@ -0,0 +1,377 @@
+diff --git a/config.def.h b/config.def.h
+index 7054c06..d1140ff 100644
+--- a/config.def.h
++++ b/config.def.h
+_AT_@ -24,9 +24,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 0362114..273cc32 100644
+--- a/dwm.c
++++ b/dwm.c
+_AT_@ -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"
+_AT_@ -92,9 +96,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;
+ };
+_AT_@ -138,6 +144,8 @@ typedef struct {
+ const char *title;
+ unsigned int tags;
+ int isfloating;
++ int isterminal;
++ int noswallow;
+ int monitor;
+ } Rule;
+
+_AT_@ -170,12 +178,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);
+_AT_@ -206,8 +216,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);
+_AT_@ -227,6 +239,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);
+_AT_@ -267,6 +280,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"
+
+_AT_@ -296,6 +313,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);
+_AT_@ -413,6 +431,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;
+_AT_@ -475,7 +533,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);
+_AT_@ -661,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
+_AT_@ -1032,12 +1093,13 @@ killclient(const Arg *arg)
+ void
+ manage(Window w, XWindowAttributes *wa)
+ {
+- Client *c, *t = NULL;
++ Client *c, *t, *term = NULL;
+ Window trans = None;
+ XWindowChanges wc;
+
+ c = ecalloc(1, sizeof(Client));
+ c->win = w;
++ c->pid = winpid(w);
+ updatetitle(c);
+ if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
+ c->mon = t->mon;
+_AT_@ -1045,7 +1107,9 @@ manage(Window w, XWindowAttributes *wa)
+ } else {
+ c->mon = selmon;
+ applyrules(c);
++ term = termforwin(c);
+ }
++
+ /* geometry */
+ c->x = c->oldx = wa->x;
+ c->y = c->oldy = wa->y;
+_AT_@ -1087,6 +1151,8 @@ manage(Window w, XWindowAttributes *wa)
+ c->mon->sel = c;
+ arrange(c->mon);
+ XMapWindow(dpy, c->win);
++ if (term)
++ swallow(term, c);
+ focus(NULL);
+ }
+
+_AT_@ -1758,6 +1824,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);
+_AT_@ -1773,9 +1853,12 @@ unmanage(Client *c, int destroyed)
+ XUngrabServer(dpy);
+ }
+ free(c);
+- focus(NULL);
+- updateclientlist();
+- arrange(m);
++
++ if (!s) {
++ arrange(m);
++ focus(NULL);
++ updateclientlist();
++ }
+ }
+
+ void
+_AT_@ -2040,16 +2123,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;
+ }
+
+_AT_@ -2131,6 +2316,10 @@ main(int argc, char *argv[])
+ fputs("warning: no locale support
", stderr);
+ if (!(dpy = XOpenDisplay(NULL)))
+ die("dwm: cannot open display
");
++#ifdef SWALLOWING
++ if (!(xcon = XGetXCBConnection(dpy)))
++ die("dwm: cannot get xcb connection
");
++#endif
+ checkotherwm();
+ setup();
+ scan();
diff --git a/dwm.suckless.org/patches/swallow.md b/dwm.suckless.org/patches/swallow.md
index fef41e3..ed64b86 100644
--- a/dwm.suckless.org/patches/swallow.md
+++ b/dwm.suckless.org/patches/swallow.md
_AT_@ -1,34 +1,53 @@
-# terminals swallow windows
+swallow
+=======
 
-## Description
+Description
+-----------
 
 This patch adds "window swallowing" to dwm, a la `rio` from Plan 9.
 
-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.
-Closing the `xclock` window restores the terminal window in the current position.
+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.
+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 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.
 
-(`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`.)
+(`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`.)
 
-## Download
-Please see [deadpixi-dwm](https://github.com/deadpixi/deadpixi-dwm) for the development site.
+Download
+--------
 
-Patches are also available here:
+ * [dwm-swallow-6.1.diff](dwm-swallow-6.1.diff)
+ * [dwm-swallow-20160715-56a31dc.diff](dwm-swallow-20160715-56a31dc.diff)
 
- * [dwm-6.1-swallowing.diff](dwm-6.1-swallowing.diff) (9319b) - 2016/1/27
+Notes
+-----
 
-## Note
-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_AT_deadpixi.com) if you would like to help expand the list of supported operating systems.
+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_AT_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.
+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.
 
-Only terminals created by local processes can swallow windows, and only windows created by local processes can be swallowed.
+Only terminals created by local processes can swallow windows, and only
+windows created by local processes can be swallowed.
 
-## Author
- * Rob King <jking_AT_deadpixi.com>
+Please see [deadpixi-dwm](https://github.com/deadpixi/deadpixi-dwm) for the
+development site.
+
+Authors
+-------
+
+ * Rob King - <jking_AT_deadpixi.com>
+ * Laslo Hunhold - <dev_AT_frign.de> (git port)
Received on Fri Jul 15 2016 - 13:59:03 CEST

This archive was generated by hypermail 2.3.0 : Fri Jul 15 2016 - 14:00:43 CEST