patched swallow

client.h

@@ -131,6 +131,18 @@ client_get_appid(Client *c)
 	return c->surface.xdg->toplevel->app_id ? c->surface.xdg->toplevel->app_id : "broken";
 }
 
+static inline int
+client_get_pid(Client *c)
+{
+	pid_t pid;
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return c->surface.xwayland->pid;
+#endif
+	wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
+	return pid;
+}
+
 static inline void
 client_get_clip(Client *c, struct wlr_box *clip)
 {

config.def.h

@@ -13,6 +13,8 @@ static const float focuscolor[]            = COLOR(0x005577ff);
 static const float urgentcolor[]           = COLOR(0xff0000ff);
 /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
 static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
+static int enableautoswallow = 1; /* enables autoswallowing newly spawned clients */
+static float swallowborder = 1.0f; /* add this multiplied by borderpx to border when a client is swallowed */
 
 /* tagging - TAGCOUNT must be no greater than 31 */
 #define TAGCOUNT (9)
@@ -22,10 +24,11 @@ static int log_level = WLR_ERROR;
 
 /* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
 static const Rule rules[] = {
-	/* app_id             title       tags mask     isfloating   monitor */
+	/* app_id             title       tags mask     isfloating   isterm   noswallow   monitor */
 	/* examples: */
-	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1 }, /* Start on currently visible tags floating, not tiled */
-	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1 }, /* Start on ONLY tag "9" */
+	{ "foot",             NULL,       0,            0,           1,       1,          -1 },
+	{ "Gimp_EXAMPLE",     NULL,       0,            1,           0,       0,          -1 }, /* Start on currently visible tags floating, not tiled */
+	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           0,       0,          -1 }, /* Start on ONLY tag "9" */
 };
 
 /* layout(s) */
@@ -142,6 +145,8 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
+	{ MODKEY,                    XKB_KEY_a,          toggleswallow,  {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          toggleautoswallow,{0} },
 	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
 	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },

dwl.c

@@ -74,7 +74,7 @@
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))
 #define MIN(A, B)               ((A) < (B) ? (A) : (B))
 #define CLEANMASK(mask)         (mask & ~WLR_MODIFIER_CAPS)
-#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]))
+#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]) && !(C)->swallowedby)
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define END(A)                  ((A) + LENGTH(A))
 #define TAGMASK                 ((1u << TAGCOUNT) - 1)
@@ -101,7 +101,8 @@ typedef struct {
 } Button;
 
 typedef struct Monitor Monitor;
-typedef struct {
+typedef struct Client Client;
+struct Client {
 	/* Must keep this field first */
 	unsigned int type; /* XDGShell or X11* */
 
@@ -138,8 +139,12 @@ typedef struct {
 	unsigned int bw;
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
+	int isterm, noswallow;
 	uint32_t resize; /* configure serial of a pending resize */
-} Client;
+	pid_t pid;
+	Client *swallowing;  /* client being hidden */
+	Client *swallowedby;
+};
 
 typedef struct {
 	uint32_t mod;
@@ -227,6 +232,8 @@ typedef struct {
 	const char *title;
 	uint32_t tags;
 	int isfloating;
+	int isterm;
+	int noswallow;
 	int monitor;
 } Rule;
 
@@ -285,11 +292,10 @@ static Monitor *dirtomon(enum wlr_direction dir);
 static void focusclient(Client *c, int lift);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
-static Client *focustop(Monitor *m, int onlytiled);
+static Client *focustop(Monitor *m);
 static void fullscreennotify(struct wl_listener *listener, void *data);
 static void gpureset(struct wl_listener *listener, void *data);
 static void handlesig(int signo);
-static void hidebehindmonocle(Monitor *m);
 static void incnmaster(const Arg *arg);
 static void inputdevice(struct wl_listener *listener, void *data);
 static int keybinding(uint32_t mods, xkb_keysym_t sym);
@@ -309,6 +315,7 @@ static void moveresize(const Arg *arg);
 static void outputmgrapply(struct wl_listener *listener, void *data);
 static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
 static void outputmgrtest(struct wl_listener *listener, void *data);
+static pid_t parentpid(pid_t pid);
 static void pointerfocus(Client *c, struct wlr_surface *surface,
 		double sx, double sy, uint32_t time);
 static void printstatus(void);
@@ -332,11 +339,15 @@ static void setsel(struct wl_listener *listener, void *data);
 static void setup(void);
 static void spawn(const Arg *arg);
 static void startdrag(struct wl_listener *listener, void *data);
+static void swallow(Client *c, Client *toswallow);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
+static Client *termforwin(Client *c);
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
+static void toggleswallow(const Arg *arg);
+static void toggleautoswallow(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unlocksession(struct wl_listener *listener, void *data);
@@ -488,11 +499,15 @@ applyrules(Client *c)
 	appid = client_get_appid(c);
 	title = client_get_title(c);
 
+	c->pid = client_get_pid(c);
+
 	for (r = rules; r < END(rules); r++) {
 		if ((!r->title || strstr(title, r->title))
 				&& (!r->id || strstr(appid, r->id))) {
 			c->isfloating = r->isfloating;
 			newtags |= r->tags;
+			c->isterm = r->isterm;
+			c->noswallow = r->noswallow;
 			i = 0;
 			wl_list_for_each(m, &mons, link) {
 				if (r->monitor == i++)
@@ -500,6 +515,12 @@ applyrules(Client *c)
 			}
 		}
 	}
+	if (enableautoswallow && !c->noswallow && !c->isfloating &&
+			!c->surface.xdg->initial_commit) {
+		Client *p = termforwin(c);
+		if (p)
+			swallow(c, p);
+	}
 	setmon(c, mon, newtags);
 }
 
@@ -519,7 +540,7 @@ arrange(Monitor *m)
 	}
 
 	wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
-			(c = focustop(m, 0)) && c->isfullscreen);
+			(c = focustop(m)) && c->isfullscreen);
 
 	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol));
 
@@ -811,7 +832,7 @@ closemon(Monitor *m)
 		if (c->mon == m)
 			setmon(c, selmon, c->tags);
 	}
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	printstatus();
 }
 
@@ -1248,7 +1269,7 @@ void
 destroydragicon(struct wl_listener *listener, void *data)
 {
 	/* Focus enter isn't sent during drag, so refocus the focused node. */
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 	wl_list_remove(&listener->link);
 	free(listener);
@@ -1287,7 +1308,7 @@ destroylock(SessionLock *lock, int unlock)
 
 	wlr_scene_node_set_enabled(&locked_bg->node, 0);
 
-	focusclient(focustop(selmon, 0), 0);
+	focusclient(focustop(selmon), 0);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 
 destroy:
@@ -1316,7 +1337,7 @@ destroylocksurface(struct wl_listener *listener, void *data)
 		surface = wl_container_of(cur_lock->surfaces.next, surface, link);
 		client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
 	} else if (!locked) {
-		focusclient(focustop(selmon, 0), 1);
+		focusclient(focustop(selmon), 1);
 	} else {
 		wlr_seat_keyboard_clear_focus(seat);
 	}
@@ -1427,7 +1448,6 @@ focusclient(Client *c, int lift)
 		wl_list_insert(&fstack, &c->flink);
 		selmon = c->mon;
 		c->isurgent = 0;
-		hidebehindmonocle(c->mon);
 
 		/* Don't change border color if there is an exclusive focus or we are
 		 * handling a drag operation */
@@ -1481,14 +1501,14 @@ focusmon(const Arg *arg)
 			selmon = dirtomon(arg->i);
 		while (!selmon->wlr_output->enabled && i++ < nmons);
 	}
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 }
 
 void
 focusstack(const Arg *arg)
 {
 	/* Focus the next or previous client (in tiling order) on selmon */
-	Client *c, *sel = focustop(selmon, 0);
+	Client *c, *sel = focustop(selmon);
 	if (!sel || (sel->isfullscreen && !client_has_children(sel)))
 		return;
 	if (arg->i > 0) {
@@ -1514,15 +1534,12 @@ focusstack(const Arg *arg)
  * will focus the topmost client of this mon, when actually will
  * only return that client */
 Client *
-focustop(Monitor *m, int onlytiled)
+focustop(Monitor *m)
 {
 	Client *c;
 	wl_list_for_each(c, &fstack, flink) {
-		if (VISIBLEON(c, m)) {
-			if (onlytiled && c->isfloating)
-				continue;
+		if (VISIBLEON(c, m))
 			return c;
-		}
 	}
 	return NULL;
 }
@@ -1568,25 +1585,6 @@ handlesig(int signo)
 		quit(NULL);
 }
 
-void
-hidebehindmonocle(Monitor *m)
-{
-	Client *c;
-	if (m && m->lt[m->sellt]->arrange == monocle) {
-		wl_list_for_each(c, &clients, link) {
-			if (c->mon != m)
-				continue;
-			wlr_scene_node_set_enabled(&c->scene->node, VISIBLEON(c, m) && c->isfloating);
-		}
-
-		c = NULL;
-
-		/* Enable top tiled client, fullscreen is considered tiled */
-		if ((c = focustop(m, 1)))
-			wlr_scene_node_set_enabled(&c->scene->node, 1);
-	}
-}
-
 void
 incnmaster(const Arg *arg)
 {
@@ -1725,7 +1723,7 @@ keyrepeat(void *data)
 void
 killclient(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (sel)
 		client_send_close(sel);
 }
@@ -1854,7 +1852,8 @@ monocle(Monitor *m)
 	}
 	if (n)
 		snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
-	hidebehindmonocle(m);
+	if ((c = focustop(m)))
+		wlr_scene_node_raise_to_top(&c->scene->node);
 }
 
 void
@@ -2077,6 +2076,20 @@ outputmgrtest(struct wl_listener *listener, void *data)
 	outputmgrapplyortest(config, 1);
 }
 
+pid_t
+parentpid(pid_t pid)
+{
+	unsigned int v = 0;
+	FILE *f;
+	char buf[256];
+	snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)pid);
+	if (!(f = fopen(buf, "r")))
+		return 0;
+	fscanf(f, "%*u %*s %*c %u", &v);
+	fclose(f);
+	return (pid_t)v;
+}
+
 void
 pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
 		uint32_t time)
@@ -2121,7 +2134,7 @@ printstatus(void)
 			if (c->isurgent)
 				urg |= c->tags;
 		}
-		if ((c = focustop(m, 0))) {
+		if ((c = focustop(m))) {
 			printf("%s title %s\n", m->wlr_output->name, client_get_title(c));
 			printf("%s appid %s\n", m->wlr_output->name, client_get_appid(c));
 			printf("%s fullscreen %d\n", m->wlr_output->name, c->isfullscreen);
@@ -2369,7 +2382,7 @@ setfullscreen(Client *c, int fullscreen)
 	c->isfullscreen = fullscreen;
 	if (!c->mon || !client_surface(c)->mapped)
 		return;
-	c->bw = fullscreen ? 0 : borderpx;
+	c->bw = fullscreen ? 0 : BORDERPX(c);
 	client_set_fullscreen(c, fullscreen);
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
 			? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
@@ -2435,7 +2448,10 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 		setfloating(c, c->isfloating);
 	}
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
+
+	if (c->swallowing)
+		setmon(c->swallowing, m, newtags);
 }
 
 void
@@ -2706,15 +2722,53 @@ startdrag(struct wl_listener *listener, void *data)
 	LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
 }
 
+void
+swallow(Client *c, Client *toswallow)
+{
+	/* Do not allow a client to swallow itself */
+	if (c == toswallow)
+		return;
+
+	/* Swallow */
+	if (toswallow && !c->swallowing) {
+		c->swallowing = toswallow;
+		toswallow->swallowedby = c;
+		toswallow->mon = c->mon;
+		toswallow->mon = c->mon;
+		wl_list_remove(&c->link);
+		wl_list_insert(&c->swallowing->link, &c->link);
+		wl_list_remove(&c->flink);
+		wl_list_insert(&c->swallowing->flink, &c->flink);
+		c->bw = BORDERPX(c);
+		c->tags = toswallow->tags;
+		c->isfloating = toswallow->isfloating;
+		c->geom = toswallow->geom;
+		setfullscreen(toswallow, 0);
+	}
+
+	/* Unswallow */
+	else if (c->swallowing) {
+		wl_list_remove(&c->swallowing->link);
+		wl_list_insert(&c->link, &c->swallowing->link);
+		wl_list_remove(&c->swallowing->flink);
+		wl_list_insert(&c->flink, &c->swallowing->flink);
+		c->swallowing->tags = c->tags;
+		c->swallowing->swallowedby = NULL;
+		c->swallowing = NULL;
+		c->bw = BORDERPX(c);
+		setfullscreen(c, 0);
+	}
+}
+
 void
 tag(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (!sel || (arg->ui & TAGMASK) == 0)
 		return;
 
 	sel->tags = arg->ui & TAGMASK;
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2722,11 +2776,45 @@ tag(const Arg *arg)
 void
 tagmon(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (sel)
 		setmon(sel, dirtomon(arg->i), 0);
 }
 
+Client *
+termforwin(Client *c)
+{
+	Client *p;
+	pid_t pid;
+	pid_t pids[32];
+	size_t i, pids_len;
+
+	if (!c->pid || c->isterm)
+		return NULL;
+
+	/* Get all parent pids */
+	pids_len = 0;
+	pid = c->pid;
+	while (pids_len < LENGTH(pids)) {
+		pid = parentpid(pid);
+		if (!pid)
+			break;
+		pids[pids_len++] = pid;
+	}
+
+	/* Find closest parent */
+	for (i = 0; i < pids_len; i++) {
+		wl_list_for_each(p, &clients, link) {
+			if (!p->pid || !p->isterm || p->swallowedby)
+				continue;
+			if (pids[i] == p->pid)
+				return p;
+		}
+	}
+
+	return NULL;
+}
+
 void
 tile(Monitor *m)
 {
@@ -2764,7 +2852,7 @@ tile(Monitor *m)
 void
 togglefloating(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	/* return if fullscreen */
 	if (sel && !sel->isfullscreen)
 		setfloating(sel, !sel->isfloating);
@@ -2773,21 +2861,47 @@ togglefloating(const Arg *arg)
 void
 togglefullscreen(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (sel)
 		setfullscreen(sel, !sel->isfullscreen);
 }
 
+void
+toggleswallow(const Arg *arg)
+{
+	Client *c, *sel = focustop(selmon);
+	if (!sel)
+		return;
+
+	if (sel->swallowing) {
+		swallow(sel, NULL);
+	} else {
+		wl_list_for_each(c, &sel->flink, flink) {
+			if (&c->flink == &fstack)
+				continue; /* wrap past the sentinel node */
+			if (VISIBLEON(c, selmon))
+				break; /* found it */
+		}
+		swallow(sel, c);
+	}
+}
+
+void
+toggleautoswallow(const Arg *arg)
+{
+	enableautoswallow = !enableautoswallow;
+}
+
 void
 toggletag(const Arg *arg)
 {
 	uint32_t newtags;
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (!sel || !(newtags = sel->tags ^ (arg->ui & TAGMASK)))
 		return;
 
 	sel->tags = newtags;
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2800,7 +2914,7 @@ toggleview(const Arg *arg)
 		return;
 
 	selmon->tagset[selmon->seltags] = newtagset;
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2824,7 +2938,7 @@ unmaplayersurfacenotify(struct wl_listener *listener, void *data)
 	if (l->layer_surface->output && (l->mon = l->layer_surface->output->data))
 		arrangelayers(l->mon);
 	if (l->layer_surface->surface == seat->keyboard_state.focused_surface)
-		focusclient(focustop(selmon, 0), 1);
+		focusclient(focustop(selmon), 1);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 }
 
@@ -2838,10 +2952,16 @@ unmapnotify(struct wl_listener *listener, void *data)
 		grabc = NULL;
 	}
 
+	if (c->swallowing) {
+		swallow(c, NULL);
+	} else if (c->swallowedby) {
+		swallow(c->swallowedby, NULL);
+	}
+
 	if (client_is_unmanaged(c)) {
 		if (c == exclusive_focus) {
 			exclusive_focus = NULL;
-			focusclient(focustop(selmon, 0), 1);
+			focusclient(focustop(selmon), 1);
 		}
 	} else {
 		wl_list_remove(&c->link);
@@ -2922,7 +3042,7 @@ updatemons(struct wl_listener *listener, void *data)
 		/* Don't move clients to the left output when plugging monitors */
 		arrange(m);
 		/* make sure fullscreen clients have the right size */
-		if ((c = focustop(m, 0)) && c->isfullscreen)
+		if ((c = focustop(m)) && c->isfullscreen)
 			resize(c, m->m, 0);
 
 		/* Try to re-set the gamma LUT when updating monitors,
@@ -2942,7 +3062,7 @@ updatemons(struct wl_listener *listener, void *data)
 			if (!c->mon && client_surface(c)->mapped)
 				setmon(c, selmon, c->tags);
 		}
-		focusclient(focustop(selmon, 0), 1);
+		focusclient(focustop(selmon), 1);
 		if (selmon->lock_surface) {
 			client_notify_enter(selmon->lock_surface->surface,
 					wlr_seat_get_keyboard(seat));
@@ -2964,7 +3084,7 @@ void
 updatetitle(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_title);
-	if (c == focustop(c->mon, 0))
+	if (c == focustop(c->mon))
 		printstatus();
 }
 
@@ -2974,7 +3094,7 @@ urgent(struct wl_listener *listener, void *data)
 	struct wlr_xdg_activation_v1_request_activate_event *event = data;
 	Client *c = NULL;
 	toplevel_from_wlr_surface(event->surface, &c, NULL);
-	if (!c || c == focustop(selmon, 0))
+	if (!c || c == focustop(selmon))
 		return;
 
 	c->isurgent = 1;
@@ -2992,7 +3112,7 @@ view(const Arg *arg)
 	selmon->seltags ^= 1; /* toggle sel tagset */
 	if (arg->ui & TAGMASK)
 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -3063,7 +3183,7 @@ xytonode(double x, double y, struct wlr_surface **psurface,
 void
 zoom(const Arg *arg)
 {
-	Client *c, *sel = focustop(selmon, 0);
+	Client *c, *sel = focustop(selmon);
 
 	if (!sel || !selmon || !selmon->lt[selmon->sellt]->arrange || sel->isfloating)
 		return;
@@ -3174,7 +3294,7 @@ sethints(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_hints);
 	struct wlr_surface *surface = client_surface(c);
-	if (c == focustop(selmon, 0) || !c->surface.xwayland->hints)
+	if (c == focustop(selmon) || !c->surface.xwayland->hints)
 		return;
 
 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);

hide-behind-monocle.patch

@@ -1,332 +0,0 @@
-From 8022376ee59d616831271dbc9f289a8bfd4fedda Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
- <leohdz172@proton.me>
-Date: Sat, 8 Jul 2023 17:25:16 -0600
-Subject: [PATCH] hide behind monocle
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
----
- dwl.c | 87 +++++++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 55 insertions(+), 32 deletions(-)
-
-diff --git a/dwl.c b/dwl.c
-index ad21e1ba..cad3b0b2 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -285,10 +285,11 @@ static Monitor *dirtomon(enum wlr_direction dir);
- static void focusclient(Client *c, int lift);
- static void focusmon(const Arg *arg);
- static void focusstack(const Arg *arg);
--static Client *focustop(Monitor *m);
-+static Client *focustop(Monitor *m, int onlytiled);
- static void fullscreennotify(struct wl_listener *listener, void *data);
- static void gpureset(struct wl_listener *listener, void *data);
- static void handlesig(int signo);
-+static void hidebehindmonocle(Monitor *m);
- static void incnmaster(const Arg *arg);
- static void inputdevice(struct wl_listener *listener, void *data);
- static int keybinding(uint32_t mods, xkb_keysym_t sym);
-@@ -518,7 +519,7 @@ arrange(Monitor *m)
- 	}
- 
- 	wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
--			(c = focustop(m)) && c->isfullscreen);
-+			(c = focustop(m, 0)) && c->isfullscreen);
- 
- 	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol));
- 
-@@ -807,7 +808,7 @@ closemon(Monitor *m)
- 		if (c->mon == m)
- 			setmon(c, selmon, c->tags);
- 	}
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- 	printstatus();
- }
- 
-@@ -1243,7 +1244,7 @@ void
- destroydragicon(struct wl_listener *listener, void *data)
- {
- 	/* Focus enter isn't sent during drag, so refocus the focused node. */
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- 	motionnotify(0, NULL, 0, 0, 0, 0);
- 	wl_list_remove(&listener->link);
- }
-@@ -1280,7 +1281,7 @@ destroylock(SessionLock *lock, int unlock)
- 
- 	wlr_scene_node_set_enabled(&locked_bg->node, 0);
- 
--	focusclient(focustop(selmon), 0);
-+	focusclient(focustop(selmon, 0), 0);
- 	motionnotify(0, NULL, 0, 0, 0, 0);
- 
- destroy:
-@@ -1309,7 +1310,7 @@ destroylocksurface(struct wl_listener *listener, void *data)
- 		surface = wl_container_of(cur_lock->surfaces.next, surface, link);
- 		client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
- 	} else if (!locked) {
--		focusclient(focustop(selmon), 1);
-+		focusclient(focustop(selmon, 0), 1);
- 	} else {
- 		wlr_seat_keyboard_clear_focus(seat);
- 	}
-@@ -1420,6 +1421,7 @@ focusclient(Client *c, int lift)
- 		wl_list_insert(&fstack, &c->flink);
- 		selmon = c->mon;
- 		c->isurgent = 0;
-+		hidebehindmonocle(c->mon);
- 
- 		/* Don't change border color if there is an exclusive focus or we are
- 		 * handling a drag operation */
-@@ -1473,14 +1475,14 @@ focusmon(const Arg *arg)
- 			selmon = dirtomon(arg->i);
- 		while (!selmon->wlr_output->enabled && i++ < nmons);
- 	}
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- }
- 
- void
- focusstack(const Arg *arg)
- {
- 	/* Focus the next or previous client (in tiling order) on selmon */
--	Client *c, *sel = focustop(selmon);
-+	Client *c, *sel = focustop(selmon, 0);
- 	if (!sel || (sel->isfullscreen && !client_has_children(sel)))
- 		return;
- 	if (arg->i > 0) {
-@@ -1506,12 +1508,15 @@ focusstack(const Arg *arg)
-  * will focus the topmost client of this mon, when actually will
-  * only return that client */
- Client *
--focustop(Monitor *m)
-+focustop(Monitor *m, int onlytiled)
- {
- 	Client *c;
- 	wl_list_for_each(c, &fstack, flink) {
--		if (VISIBLEON(c, m))
-+		if (VISIBLEON(c, m)) {
-+			if (onlytiled && c->isfloating)
-+				continue;
- 			return c;
-+		}
- 	}
- 	return NULL;
- }
-@@ -1557,6 +1562,25 @@ handlesig(int signo)
- 		quit(NULL);
- }
- 
-+void
-+hidebehindmonocle(Monitor *m)
-+{
-+	Client *c;
-+	if (m && m->lt[m->sellt]->arrange == monocle) {
-+		wl_list_for_each(c, &clients, link) {
-+			if (c->mon != m)
-+				continue;
-+			wlr_scene_node_set_enabled(&c->scene->node, VISIBLEON(c, m) && c->isfloating);
-+		}
-+
-+		c = NULL;
-+
-+		/* Enable top tiled client, fullscreen is considered tiled */
-+		if ((c = focustop(m, 1)))
-+			wlr_scene_node_set_enabled(&c->scene->node, 1);
-+	}
-+}
-+
- void
- incnmaster(const Arg *arg)
- {
-@@ -1695,7 +1719,7 @@ keyrepeat(void *data)
- void
- killclient(const Arg *arg)
- {
--	Client *sel = focustop(selmon);
-+	Client *sel = focustop(selmon, 0);
- 	if (sel)
- 		client_send_close(sel);
- }
-@@ -1824,8 +1848,7 @@ monocle(Monitor *m)
- 	}
- 	if (n)
- 		snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
--	if ((c = focustop(m)))
--		wlr_scene_node_raise_to_top(&c->scene->node);
-+	hidebehindmonocle(m);
- }
- 
- void
-@@ -2092,7 +2115,7 @@ printstatus(void)
- 			if (c->isurgent)
- 				urg |= c->tags;
- 		}
--		if ((c = focustop(m))) {
-+		if ((c = focustop(m, 0))) {
- 			printf("%s title %s\n", m->wlr_output->name, client_get_title(c));
- 			printf("%s appid %s\n", m->wlr_output->name, client_get_appid(c));
- 			printf("%s fullscreen %d\n", m->wlr_output->name, c->isfullscreen);
-@@ -2406,7 +2429,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
- 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
- 		setfloating(c, c->isfloating);
- 	}
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- }
- 
- void
-@@ -2680,12 +2703,12 @@ startdrag(struct wl_listener *listener, void *data)
- void
- tag(const Arg *arg)
- {
--	Client *sel = focustop(selmon);
-+	Client *sel = focustop(selmon, 0);
- 	if (!sel || (arg->ui & TAGMASK) == 0)
- 		return;
- 
- 	sel->tags = arg->ui & TAGMASK;
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- 	arrange(selmon);
- 	printstatus();
- }
-@@ -2693,7 +2716,7 @@ tag(const Arg *arg)
- void
- tagmon(const Arg *arg)
- {
--	Client *sel = focustop(selmon);
-+	Client *sel = focustop(selmon, 0);
- 	if (sel)
- 		setmon(sel, dirtomon(arg->i), 0);
- }
-@@ -2735,7 +2758,7 @@ tile(Monitor *m)
- void
- togglefloating(const Arg *arg)
- {
--	Client *sel = focustop(selmon);
-+	Client *sel = focustop(selmon, 0);
- 	/* return if fullscreen */
- 	if (sel && !sel->isfullscreen)
- 		setfloating(sel, !sel->isfloating);
-@@ -2744,7 +2767,7 @@ togglefloating(const Arg *arg)
- void
- togglefullscreen(const Arg *arg)
- {
--	Client *sel = focustop(selmon);
-+	Client *sel = focustop(selmon, 0);
- 	if (sel)
- 		setfullscreen(sel, !sel->isfullscreen);
- }
-@@ -2753,12 +2776,12 @@ void
- toggletag(const Arg *arg)
- {
- 	uint32_t newtags;
--	Client *sel = focustop(selmon);
-+	Client *sel = focustop(selmon, 0);
- 	if (!sel || !(newtags = sel->tags ^ (arg->ui & TAGMASK)))
- 		return;
- 
- 	sel->tags = newtags;
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- 	arrange(selmon);
- 	printstatus();
- }
-@@ -2771,7 +2794,7 @@ toggleview(const Arg *arg)
- 		return;
- 
- 	selmon->tagset[selmon->seltags] = newtagset;
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- 	arrange(selmon);
- 	printstatus();
- }
-@@ -2795,7 +2818,7 @@ unmaplayersurfacenotify(struct wl_listener *listener, void *data)
- 	if (l->layer_surface->output && (l->mon = l->layer_surface->output->data))
- 		arrangelayers(l->mon);
- 	if (l->layer_surface->surface == seat->keyboard_state.focused_surface)
--		focusclient(focustop(selmon), 1);
-+		focusclient(focustop(selmon, 0), 1);
- 	motionnotify(0, NULL, 0, 0, 0, 0);
- }
- 
-@@ -2812,7 +2835,7 @@ unmapnotify(struct wl_listener *listener, void *data)
- 	if (client_is_unmanaged(c)) {
- 		if (c == exclusive_focus) {
- 			exclusive_focus = NULL;
--			focusclient(focustop(selmon), 1);
-+			focusclient(focustop(selmon, 0), 1);
- 		}
- 	} else {
- 		wl_list_remove(&c->link);
-@@ -2893,7 +2916,7 @@ updatemons(struct wl_listener *listener, void *data)
- 		/* Don't move clients to the left output when plugging monitors */
- 		arrange(m);
- 		/* make sure fullscreen clients have the right size */
--		if ((c = focustop(m)) && c->isfullscreen)
-+		if ((c = focustop(m, 0)) && c->isfullscreen)
- 			resize(c, m->m, 0);
- 
- 		/* Try to re-set the gamma LUT when updating monitors,
-@@ -2913,7 +2936,7 @@ updatemons(struct wl_listener *listener, void *data)
- 			if (!c->mon && client_surface(c)->mapped)
- 				setmon(c, selmon, c->tags);
- 		}
--		focusclient(focustop(selmon), 1);
-+		focusclient(focustop(selmon, 0), 1);
- 		if (selmon->lock_surface) {
- 			client_notify_enter(selmon->lock_surface->surface,
- 					wlr_seat_get_keyboard(seat));
-@@ -2935,7 +2958,7 @@ void
- updatetitle(struct wl_listener *listener, void *data)
- {
- 	Client *c = wl_container_of(listener, c, set_title);
--	if (c == focustop(c->mon))
-+	if (c == focustop(c->mon, 0))
- 		printstatus();
- }
- 
-@@ -2945,7 +2968,7 @@ urgent(struct wl_listener *listener, void *data)
- 	struct wlr_xdg_activation_v1_request_activate_event *event = data;
- 	Client *c = NULL;
- 	toplevel_from_wlr_surface(event->surface, &c, NULL);
--	if (!c || c == focustop(selmon))
-+	if (!c || c == focustop(selmon, 0))
- 		return;
- 
- 	c->isurgent = 1;
-@@ -2963,7 +2986,7 @@ view(const Arg *arg)
- 	selmon->seltags ^= 1; /* toggle sel tagset */
- 	if (arg->ui & TAGMASK)
- 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
--	focusclient(focustop(selmon), 1);
-+	focusclient(focustop(selmon, 0), 1);
- 	arrange(selmon);
- 	printstatus();
- }
-@@ -3034,7 +3057,7 @@ xytonode(double x, double y, struct wlr_surface **psurface,
- void
- zoom(const Arg *arg)
- {
--	Client *c, *sel = focustop(selmon);
-+	Client *c, *sel = focustop(selmon, 0);
- 
- 	if (!sel || !selmon || !selmon->lt[selmon->sellt]->arrange || sel->isfloating)
- 		return;
-@@ -3145,7 +3168,7 @@ sethints(struct wl_listener *listener, void *data)
- {
- 	Client *c = wl_container_of(listener, c, set_hints);
- 	struct wlr_surface *surface = client_surface(c);
--	if (c == focustop(selmon))
-+	if (c == focustop(selmon, 0))
- 		return;
- 
- 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
--- 
-2.48.0
-

swallow.patch

@@ -0,0 +1,351 @@
+From a220e1ed4b04a66c837dfc8e3363d3e696cbf541 Mon Sep 17 00:00:00 2001
+From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
+Date: Wed, 5 Feb 2025 02:34:39 +0100
+Subject: [PATCH] Swallow: hide the terminal when it spawns a client
+
+---
+ client.h     |  12 ++++
+ config.def.h |  11 +++-
+ dwl.c        | 152 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 168 insertions(+), 7 deletions(-)
+
+diff --git a/client.h b/client.h
+index 42f225f..bc9cad2 100644
+--- a/client.h
++++ b/client.h
+@@ -131,6 +131,18 @@ client_get_appid(Client *c)
+ 	return c->surface.xdg->toplevel->app_id;
+ }
+ 
++static inline int
++client_get_pid(Client *c)
++{
++	pid_t pid;
++#ifdef XWAYLAND
++	if (client_is_x11(c))
++		return c->surface.xwayland->pid;
++#endif
++	wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
++	return pid;
++}
++
+ static inline void
+ client_get_clip(Client *c, struct wlr_box *clip)
+ {
+diff --git a/config.def.h b/config.def.h
+index 22d2171..42342f1 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -13,6 +13,8 @@ static const float focuscolor[]            = COLOR(0x005577ff);
+ static const float urgentcolor[]           = COLOR(0xff0000ff);
+ /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
+ static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
++static int enableautoswallow = 1; /* enables autoswallowing newly spawned clients */
++static float swallowborder = 1.0f; /* add this multiplied by borderpx to border when a client is swallowed */
+ 
+ /* tagging - TAGCOUNT must be no greater than 31 */
+ #define TAGCOUNT (9)
+@@ -22,10 +24,11 @@ static int log_level = WLR_ERROR;
+ 
+ /* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
+ static const Rule rules[] = {
+-	/* app_id             title       tags mask     isfloating   monitor */
++	/* app_id             title       tags mask     isfloating   isterm   noswallow   monitor */
+ 	/* examples: */
+-	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1 }, /* Start on currently visible tags floating, not tiled */
+-	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1 }, /* Start on ONLY tag "9" */
++	{ "foot",             NULL,       0,            0,           1,       1,          -1 },
++	{ "Gimp_EXAMPLE",     NULL,       0,            1,           0,       0,          -1 }, /* Start on currently visible tags floating, not tiled */
++	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           0,       0,          -1 }, /* Start on ONLY tag "9" */
+ };
+ 
+ /* layout(s) */
+@@ -142,6 +145,8 @@ static const Key keys[] = {
+ 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
+ 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
++	{ MODKEY,                    XKB_KEY_a,          toggleswallow,  {0} },
++	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          toggleautoswallow,{0} },
+ 	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
+ 	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
+diff --git a/dwl.c b/dwl.c
+index def2562..71d500a 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -73,12 +73,13 @@
+ #define MAX(A, B)               ((A) > (B) ? (A) : (B))
+ #define MIN(A, B)               ((A) < (B) ? (A) : (B))
+ #define CLEANMASK(mask)         (mask & ~WLR_MODIFIER_CAPS)
+-#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]))
++#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]) && !(C)->swallowedby)
+ #define LENGTH(X)               (sizeof X / sizeof X[0])
+ #define END(A)                  ((A) + LENGTH(A))
+ #define TAGMASK                 ((1u << TAGCOUNT) - 1)
+ #define LISTEN(E, L, H)         wl_signal_add((E), ((L)->notify = (H), (L)))
+ #define LISTEN_STATIC(E, H)     do { static struct wl_listener _l = {.notify = (H)}; wl_signal_add((E), &_l); } while (0)
++#define BORDERPX(C)             (borderpx + ((C)->swallowing ? (int)ceilf(swallowborder * (C)->swallowing->bw) : 0))
+ 
+ /* enums */
+ enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
+@@ -104,7 +105,8 @@ typedef struct {
+ } Button;
+ 
+ typedef struct Monitor Monitor;
+-typedef struct {
++typedef struct Client Client;
++struct Client {
+ 	/* Must keep these three elements in this order */
+ 	unsigned int type; /* XDGShell or X11* */
+ 	struct wlr_box geom; /* layout-relative, includes border */
+@@ -140,8 +142,12 @@ typedef struct {
+ 	unsigned int bw;
+ 	uint32_t tags;
+ 	int isfloating, isurgent, isfullscreen;
++	int isterm, noswallow;
+ 	uint32_t resize; /* configure serial of a pending resize */
+-} Client;
++	pid_t pid;
++	Client *swallowing;  /* client being hidden */
++	Client *swallowedby;
++};
+ 
+ typedef struct {
+ 	uint32_t mod;
+@@ -230,6 +236,8 @@ typedef struct {
+ 	const char *title;
+ 	uint32_t tags;
+ 	int isfloating;
++	int isterm;
++	int noswallow;
+ 	int monitor;
+ } Rule;
+ 
+@@ -311,6 +319,7 @@ static void moveresize(const Arg *arg);
+ static void outputmgrapply(struct wl_listener *listener, void *data);
+ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
+ static void outputmgrtest(struct wl_listener *listener, void *data);
++static pid_t parentpid(pid_t pid);
+ static void pointerfocus(Client *c, struct wlr_surface *surface,
+ 		double sx, double sy, uint32_t time);
+ static void printstatus(void);
+@@ -335,11 +344,15 @@ static void setsel(struct wl_listener *listener, void *data);
+ static void setup(void);
+ static void spawn(const Arg *arg);
+ static void startdrag(struct wl_listener *listener, void *data);
++static void swallow(Client *c, Client *toswallow);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
++static Client *termforwin(Client *c);
+ static void tile(Monitor *m);
+ static void togglefloating(const Arg *arg);
+ static void togglefullscreen(const Arg *arg);
++static void toggleswallow(const Arg *arg);
++static void toggleautoswallow(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
+ static void unlocksession(struct wl_listener *listener, void *data);
+@@ -466,11 +479,15 @@ applyrules(Client *c)
+ 	if (!(title = client_get_title(c)))
+ 		title = broken;
+ 
++	c->pid = client_get_pid(c);
++
+ 	for (r = rules; r < END(rules); r++) {
+ 		if ((!r->title || strstr(title, r->title))
+ 				&& (!r->id || strstr(appid, r->id))) {
+ 			c->isfloating = r->isfloating;
+ 			newtags |= r->tags;
++			c->isterm = r->isterm;
++			c->noswallow = r->noswallow;
+ 			i = 0;
+ 			wl_list_for_each(m, &mons, link) {
+ 				if (r->monitor == i++)
+@@ -478,6 +495,12 @@ applyrules(Client *c)
+ 			}
+ 		}
+ 	}
++	if (enableautoswallow && !c->noswallow && !c->isfloating &&
++			!c->surface.xdg->initial_commit) {
++		Client *p = termforwin(c);
++		if (p)
++			swallow(c, p);
++	}
+ 	setmon(c, mon, newtags);
+ }
+ 
+@@ -2006,6 +2029,20 @@ outputmgrtest(struct wl_listener *listener, void *data)
+ 	outputmgrapplyortest(config, 1);
+ }
+ 
++pid_t
++parentpid(pid_t pid)
++{
++	unsigned int v = 0;
++	FILE *f;
++	char buf[256];
++	snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)pid);
++	if (!(f = fopen(buf, "r")))
++		return 0;
++	fscanf(f, "%*u %*s %*c %u", &v);
++	fclose(f);
++	return (pid_t)v;
++}
++
+ void
+ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
+ 		uint32_t time)
+@@ -2326,7 +2363,7 @@ setfullscreen(Client *c, int fullscreen)
+ 	c->isfullscreen = fullscreen;
+ 	if (!c->mon || !client_surface(c)->mapped)
+ 		return;
+-	c->bw = fullscreen ? 0 : borderpx;
++	c->bw = fullscreen ? 0 : BORDERPX(c);
+ 	client_set_fullscreen(c, fullscreen);
+ 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
+ 			? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
+@@ -2404,6 +2441,9 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
+ 		setfloating(c, c->isfloating);
+ 	}
+ 	focusclient(focustop(selmon), 1);
++
++	if (c->swallowing)
++		setmon(c->swallowing, m, newtags);
+ }
+ 
+ void
+@@ -2669,6 +2709,44 @@ startdrag(struct wl_listener *listener, void *data)
+ 	LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
+ }
+ 
++void
++swallow(Client *c, Client *toswallow)
++{
++	/* Do not allow a client to swallow itself */
++	if (c == toswallow)
++		return;
++
++	/* Swallow */
++	if (toswallow && !c->swallowing) {
++		c->swallowing = toswallow;
++		toswallow->swallowedby = c;
++		toswallow->mon = c->mon;
++		toswallow->mon = c->mon;
++		wl_list_remove(&c->link);
++		wl_list_insert(&c->swallowing->link, &c->link);
++		wl_list_remove(&c->flink);
++		wl_list_insert(&c->swallowing->flink, &c->flink);
++		c->bw = BORDERPX(c);
++		c->tags = toswallow->tags;
++		c->isfloating = toswallow->isfloating;
++		c->geom = toswallow->geom;
++		setfullscreen(toswallow, 0);
++	}
++
++	/* Unswallow */
++	else if (c->swallowing) {
++		wl_list_remove(&c->swallowing->link);
++		wl_list_insert(&c->link, &c->swallowing->link);
++		wl_list_remove(&c->swallowing->flink);
++		wl_list_insert(&c->flink, &c->swallowing->flink);
++		c->swallowing->tags = c->tags;
++		c->swallowing->swallowedby = NULL;
++		c->swallowing = NULL;
++		c->bw = BORDERPX(c);
++		setfullscreen(c, 0);
++	}
++}
++
+ void
+ tag(const Arg *arg)
+ {
+@@ -2690,6 +2768,40 @@ tagmon(const Arg *arg)
+ 		setmon(sel, dirtomon(arg->i), 0);
+ }
+ 
++Client *
++termforwin(Client *c)
++{
++	Client *p;
++	pid_t pid;
++	pid_t pids[32];
++	size_t i, pids_len;
++
++	if (!c->pid || c->isterm)
++		return NULL;
++
++	/* Get all parent pids */
++	pids_len = 0;
++	pid = c->pid;
++	while (pids_len < LENGTH(pids)) {
++		pid = parentpid(pid);
++		if (!pid)
++			break;
++		pids[pids_len++] = pid;
++	}
++
++	/* Find closest parent */
++	for (i = 0; i < pids_len; i++) {
++		wl_list_for_each(p, &clients, link) {
++			if (!p->pid || !p->isterm || p->swallowedby)
++				continue;
++			if (pids[i] == p->pid)
++				return p;
++		}
++	}
++
++	return NULL;
++}
++
+ void
+ tile(Monitor *m)
+ {
+@@ -2741,6 +2853,32 @@ togglefullscreen(const Arg *arg)
+ 		setfullscreen(sel, !sel->isfullscreen);
+ }
+ 
++void
++toggleswallow(const Arg *arg)
++{
++	Client *c, *sel = focustop(selmon);
++	if (!sel)
++		return;
++
++	if (sel->swallowing) {
++		swallow(sel, NULL);
++	} else {
++		wl_list_for_each(c, &sel->flink, flink) {
++			if (&c->flink == &fstack)
++				continue; /* wrap past the sentinel node */
++			if (VISIBLEON(c, selmon))
++				break; /* found it */
++		}
++		swallow(sel, c);
++	}
++}
++
++void
++toggleautoswallow(const Arg *arg)
++{
++	enableautoswallow = !enableautoswallow;
++}
++
+ void
+ toggletag(const Arg *arg)
+ {
+@@ -2801,6 +2939,12 @@ unmapnotify(struct wl_listener *listener, void *data)
+ 		grabc = NULL;
+ 	}
+ 
++	if (c->swallowing) {
++		swallow(c, NULL);
++	} else if (c->swallowedby) {
++		swallow(c->swallowedby, NULL);
++	}
++
+ 	if (client_is_unmanaged(c)) {
+ 		if (c == exclusive_focus) {
+ 			exclusive_focus = NULL;
+-- 
+2.49.0
+