swallow

diff --git a/config.def.h b/config.def.h
index 1b850dbf344fc4fc5b8737f039b1f1d08e10e3ac..ab7d35143899bb303ec3acf9874aab50da60e47b 100644 (file)
--- 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.h b/config.h
index 4395dcac1bf4f9c0ecc2b9ff834cf516bdddc328..ab7d35143899bb303ec3acf9874aab50da60e47b 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const unsigned int borderpx  = 5;        /* border pixel of windows */
+static const unsigned int borderpx  = 1;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
@@ -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 982dc2179a8867815aac9f03c73bd80f845a5bbf..0ba7d43cbe613c9796197215859fcf294afd0952 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -23,7 +23,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_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}

diff --git a/dwm.c b/dwm.c
index 884b79e3e65ca8c32e6de109f0799544ac0f1019..39fed6394b8fcab157ee6ea72c4dd21a336411a3 100644 (file)
--- 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"
@@ -91,9 +93,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;
 };
@@ -137,6 +141,8 @@ typedef struct {
        const char *title;
        unsigned int tags;
        int isfloating;
+       int isterminal;
+       int noswallow;
        int monitor;
 } Rule;
 
@@ -169,12 +175,14 @@ static void focusin(XEvent *e);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
 static Atom getatomprop(Client *c, Atom prop);
+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 isdescproces(pid_t p, pid_t c);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);
 static void manage(Window w, XWindowAttributes *wa);
@@ -211,8 +219,10 @@ static void setup(void);
 static void seturgent(Client *c, int urg);
 static void showhide(Client *c);
 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 *m);
 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
@@ -232,6 +242,7 @@ static void updatetitle(Client *c);
 static void updatewindowtype(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);
@@ -277,6 +288,8 @@ static Window root, wmcheckwin;
 # define SCRATCHPAD_MASK (1u << sizeof tags / sizeof * tags)
 static Client * scratchpad_last_showed = NULL;
 
+static xcb_connection_t *xcon;
+
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
@@ -306,6 +319,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);
@@ -425,6 +439,47 @@ attachstack(Client *c)
        c->mon->stack = 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);
+       XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
+       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)
 {
@@ -490,7 +545,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 +720,9 @@ destroynotify(XEvent *e)
 
        if ((c = wintoclient(ev->window)))
                unmanage(c, 1);
+
+       else if ((c = swallowingclient(ev->window)))
+               unmanage(c->swallowing, 1);
 }
 
 void
@@ -1042,12 +1100,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;
@@ -1062,6 +1121,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)
@@ -1096,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);
 }
 
@@ -1884,6 +1946,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) {
@@ -1899,9 +1975,12 @@ unmanage(Client *c, int destroyed)
                XUngrabServer(dpy);
        }
        free(c);
-       focus(NULL);
-       updateclientlist();
-       arrange(m);
+
+       if (!s) {
+               arrange(m);
+               focus(NULL);
+               updateclientlist();
+       }
 }
 
 void
@@ -2165,16 +2244,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;
 }
 
@@ -2254,6 +2433,8 @@ 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();
        setup();
 #ifdef __OpenBSD__

diff --git a/flake.nix b/flake.nix
index 3e96594a73aa20a321c2bccda91eb329ac415099..2ce2adfe8f04fcfe9dc1ca5216df416d1a645d7b 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -19,10 +19,13 @@
         src = ./.;
 
         nativeBuildInputs = [ pkgs.pkg-config ];
-        buildInputs = [
-          pkgs.libX11
-          pkgs.libxinerama
-          pkgs.libxft
+        buildInputs = with pkgs; [
+          libX11
+          libxinerama
+          libxft
+          libxcb
+          libxres
+
         ];
 
         makeFlags = [