commit 5d8aeb88d856895b94da8cc93fd11622915e2015
parent 2d36db9d3469f744e46d82ee55714fe5e6bbd030
Author: Rob King <jking@deadpixi.com>
Date: Wed, 27 Jan 2016 00:12:43 -0600
Added the window swallowing patch.
Diffstat:
2 files changed, 435 insertions(+), 0 deletions(-)
diff --git a/dwm.suckless.org/patches/dwm-6.1-swallowing.diff b/dwm.suckless.org/patches/dwm-6.1-swallowing.diff
@@ -0,0 +1,401 @@
+diff --git a/config.def.h b/config.def.h
+index 7054c06..d1140ff 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -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..260a50d 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"
+@@ -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;
+ };
+@@ -138,6 +144,8 @@ typedef struct {
+ const char *title;
+ unsigned int tags;
+ int isfloating;
++ int isterminal;
++ int noswallow;
+ int monitor;
+ } Rule;
+
+@@ -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);
+@@ -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);
+@@ -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);
+@@ -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"
+
+@@ -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);
+@@ -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;
+@@ -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);
+@@ -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
+@@ -890,6 +951,23 @@ getatomprop(Client *c, Atom prop)
+ }
+
+ int
++getcardprop(Client *c, Atom prop)
++{
++ int di;
++ unsigned long dl;
++ unsigned char *p = NULL;
++ Atom da = None;
++ int v = 0;
++
++ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof(int), False, XA_CARDINAL,
++ &da, &di, &dl, &dl, &p) == Success && p) {
++ v = *(int *)p;
++ XFree(p);
++ }
++ return v;
++}
++
++int
+ getrootptr(int *x, int *y)
+ {
+ int di;
+@@ -1037,12 +1115,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;
+@@ -1050,7 +1129,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;
+@@ -1092,6 +1173,8 @@ manage(Window w, XWindowAttributes *wa)
+ c->mon->sel = c;
+ arrange(c->mon);
+ XMapWindow(dpy, c->win);
++ if (term)
++ swallow(term, c);
+ focus(NULL);
+ }
+
+@@ -1763,6 +1846,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);
+@@ -1778,9 +1875,12 @@ unmanage(Client *c, int destroyed)
+ XUngrabServer(dpy);
+ }
+ free(c);
+- focus(NULL);
+- updateclientlist();
+- arrange(m);
++
++ if (!s) {
++ arrange(m);
++ focus(NULL);
++ updateclientlist();
++ }
+ }
+
+ void
+@@ -2045,16 +2145,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;
+ }
+
+@@ -2136,6 +2338,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/swallow.md b/dwm.suckless.org/patches/swallow.md
@@ -0,0 +1,34 @@
+# terminals swallow windows
+
+## 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.
+
+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`.)
+
+## Download
+Please see [deadpixi-dwm](https://github.com/deadpixi/deadpixi-dwm) for the development site.
+
+Patches are also available here:
+
+ * [dwm-6.1-swallowing.diff](dwm-6.1-swallowing.diff) (9319b) - 2016/1/27
+
+## 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@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.
+
+Only terminals created by local processes can swallow windows, and only windows created by local processes can be swallowed.
+
+## Author
+ * Rob King <jking@deadpixi.com>
