added ipc protocol

Makefile

@@ -17,12 +17,14 @@ DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEV
 LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS)
 
 all: dwl
-dwl: dwl.o util.o
+dwl: dwl.o util.o dwl-ipc-unstable-v2-protocol.o
-	$(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
+	$(CC) dwl.o util.o dwl-ipc-unstable-v2-protocol.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
 dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
 	pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
-	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
+	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h \
+	dwl-ipc-unstable-v2-protocol.h
 util.o: util.c util.h
+dwl-ipc-unstable-v2-protocol.o: dwl-ipc-unstable-v2-protocol.c dwl-ipc-unstable-v2-protocol.h
 
 # wayland-scanner is a tool which generates C headers and rigging for Wayland
 # protocols, which are specified in XML. wlroots requires you to rig these up
@@ -45,6 +47,12 @@ wlr-output-power-management-unstable-v1-protocol.h:
 xdg-shell-protocol.h:
 	$(WAYLAND_SCANNER) server-header \
 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
+dwl-ipc-unstable-v2-protocol.h:
+	$(WAYLAND_SCANNER) server-header \
+		protocols/dwl-ipc-unstable-v2.xml $@
+dwl-ipc-unstable-v2-protocol.c:
+	$(WAYLAND_SCANNER) private-code \
+		protocols/dwl-ipc-unstable-v2.xml $@
 
 config.h:
 	cp config.def.h $@

client.h

@@ -131,18 +131,6 @@ 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,8 +13,6 @@ 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)
@@ -24,11 +22,10 @@ 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   isterm   noswallow   monitor */
+	/* app_id             title       tags mask     isfloating   monitor */
 	/* examples: */
-	{ "foot",             NULL,       0,            0,           1,       1,          -1 },
+	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1 }, /* Start on currently visible tags floating, not tiled */
-	{ "Gimp_EXAMPLE",     NULL,       0,            1,           0,       0,          -1 }, /* Start on currently visible tags floating, not tiled */
+	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1 }, /* Start on ONLY tag "9" */
-	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           0,       0,          -1 }, /* Start on ONLY tag "9" */
 };
 
 /* layout(s) */
@@ -145,8 +142,6 @@ 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

@@ -68,13 +68,14 @@
 #include <xcb/xcb_icccm.h>
 #endif
 
+#include "dwl-ipc-unstable-v2-protocol.h"
 #include "util.h"
 
 /* macros */
 #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]) && !(C)->swallowedby)
+#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define END(A)                  ((A) + LENGTH(A))
 #define TAGMASK                 ((1u << TAGCOUNT) - 1)
@@ -101,8 +102,7 @@ typedef struct {
 } Button;
 
 typedef struct Monitor Monitor;
-typedef struct Client Client;
+typedef struct {
-struct Client {
 	/* Must keep this field first */
 	unsigned int type; /* XDGShell or X11* */
 
@@ -139,12 +139,14 @@ struct Client {
 	unsigned int bw;
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
-	int isterm, noswallow;
 	uint32_t resize; /* configure serial of a pending resize */
-	pid_t pid;
+} Client;
-	Client *swallowing;  /* client being hidden */
+
-	Client *swallowedby;
+typedef struct {
-};
+	struct wl_list link;
+	struct wl_resource *resource;
+	Monitor *mon;
+} DwlIpcOutput;
 
 typedef struct {
 	uint32_t mod;
@@ -190,6 +192,7 @@ typedef struct {
 
 struct Monitor {
 	struct wl_list link;
+	struct wl_list dwl_ipc_outputs;
 	struct wlr_output *wlr_output;
 	struct wlr_scene_output *scene_output;
 	struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */
@@ -232,8 +235,6 @@ typedef struct {
 	const char *title;
 	uint32_t tags;
 	int isfloating;
-	int isterm;
-	int noswallow;
 	int monitor;
 } Rule;
 
@@ -289,6 +290,17 @@ static void destroypointerconstraint(struct wl_listener *listener, void *data);
 static void destroysessionlock(struct wl_listener *listener, void *data);
 static void destroykeyboardgroup(struct wl_listener *listener, void *data);
 static Monitor *dirtomon(enum wlr_direction dir);
+static void dwl_ipc_manager_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id);
+static void dwl_ipc_manager_destroy(struct wl_resource *resource);
+static void dwl_ipc_manager_get_output(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *output);
+static void dwl_ipc_manager_release(struct wl_client *client, struct wl_resource *resource);
+static void dwl_ipc_output_destroy(struct wl_resource *resource);
+static void dwl_ipc_output_printstatus(Monitor *monitor);
+static void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output);
+static void dwl_ipc_output_set_client_tags(struct wl_client *client, struct wl_resource *resource, uint32_t and_tags, uint32_t xor_tags);
+static void dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource, uint32_t index);
+static void dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, uint32_t tagmask, uint32_t toggle_tagset);
+static void dwl_ipc_output_release(struct wl_client *client, struct wl_resource *resource);
 static void focusclient(Client *c, int lift);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
@@ -315,7 +327,6 @@ 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);
@@ -339,15 +350,12 @@ 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 togglebar(const Arg *arg);
 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);
@@ -448,6 +456,9 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
 static struct wl_listener start_drag = {.notify = startdrag};
 static struct wl_listener new_session_lock = {.notify = locksession};
 
+static struct zdwl_ipc_manager_v2_interface dwl_manager_implementation = {.release = dwl_ipc_manager_release, .get_output = dwl_ipc_manager_get_output};
+static struct zdwl_ipc_output_v2_interface dwl_output_implementation = {.release = dwl_ipc_output_release, .set_tags = dwl_ipc_output_set_tags, .set_layout = dwl_ipc_output_set_layout, .set_client_tags = dwl_ipc_output_set_client_tags};
+
 #ifdef XWAYLAND
 static void activatex11(struct wl_listener *listener, void *data);
 static void associatex11(struct wl_listener *listener, void *data);
@@ -499,15 +510,11 @@ 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++)
@@ -515,12 +522,6 @@ 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);
 }
 
@@ -751,6 +752,10 @@ cleanupmon(struct wl_listener *listener, void *data)
 	LayerSurface *l, *tmp;
 	size_t i;
 
+	DwlIpcOutput *ipc_output, *ipc_output_tmp;
+	wl_list_for_each_safe(ipc_output, ipc_output_tmp, &m->dwl_ipc_outputs, link)
+		wl_resource_destroy(ipc_output->resource);
+
 	/* m->layers[i] are intentionally not unlinked */
 	for (i = 0; i < LENGTH(m->layers); i++) {
 		wl_list_for_each_safe(l, tmp, &m->layers[i], link)
@@ -1071,6 +1076,8 @@ createmon(struct wl_listener *listener, void *data)
 	m = wlr_output->data = ecalloc(1, sizeof(*m));
 	m->wlr_output = wlr_output;
 
+	wl_list_init(&m->dwl_ipc_outputs);
+
 	for (i = 0; i < LENGTH(m->layers); i++)
 		wl_list_init(&m->layers[i]);
 
@@ -1418,6 +1425,192 @@ dirtomon(enum wlr_direction dir)
 	return selmon;
 }
 
+void
+dwl_ipc_manager_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id)
+{
+	struct wl_resource *manager_resource = wl_resource_create(client, &zdwl_ipc_manager_v2_interface, version, id);
+	if (!manager_resource) {
+		wl_client_post_no_memory(client);
+		return;
+	}
+	wl_resource_set_implementation(manager_resource, &dwl_manager_implementation, NULL, dwl_ipc_manager_destroy);
+
+	zdwl_ipc_manager_v2_send_tags(manager_resource, TAGCOUNT);
+
+	for (unsigned int i = 0; i < LENGTH(layouts); i++)
+		zdwl_ipc_manager_v2_send_layout(manager_resource, layouts[i].symbol);
+}
+
+void
+dwl_ipc_manager_destroy(struct wl_resource *resource)
+{
+	/* No state to destroy */
+}
+
+void
+dwl_ipc_manager_get_output(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *output)
+{
+	DwlIpcOutput *ipc_output;
+	Monitor *monitor = wlr_output_from_resource(output)->data;
+	struct wl_resource *output_resource = wl_resource_create(client, &zdwl_ipc_output_v2_interface, wl_resource_get_version(resource), id);
+	if (!output_resource)
+		return;
+
+	ipc_output = ecalloc(1, sizeof(*ipc_output));
+	ipc_output->resource = output_resource;
+	ipc_output->mon = monitor;
+	wl_resource_set_implementation(output_resource, &dwl_output_implementation, ipc_output, dwl_ipc_output_destroy);
+	wl_list_insert(&monitor->dwl_ipc_outputs, &ipc_output->link);
+	dwl_ipc_output_printstatus_to(ipc_output);
+}
+
+void
+dwl_ipc_manager_release(struct wl_client *client, struct wl_resource *resource)
+{
+	wl_resource_destroy(resource);
+}
+
+static void
+dwl_ipc_output_destroy(struct wl_resource *resource)
+{
+	DwlIpcOutput *ipc_output = wl_resource_get_user_data(resource);
+	wl_list_remove(&ipc_output->link);
+	free(ipc_output);
+}
+
+void
+dwl_ipc_output_printstatus(Monitor *monitor)
+{
+	DwlIpcOutput *ipc_output;
+	wl_list_for_each(ipc_output, &monitor->dwl_ipc_outputs, link)
+		dwl_ipc_output_printstatus_to(ipc_output);
+}
+
+void
+dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output)
+{
+	Monitor *monitor = ipc_output->mon;
+	Client *c, *focused;
+	int tagmask, state, numclients, focused_client, tag;
+	const char *title, *appid;
+	focused = focustop(monitor);
+	zdwl_ipc_output_v2_send_active(ipc_output->resource, monitor == selmon);
+
+	for (tag = 0 ; tag < TAGCOUNT; tag++) {
+		numclients = state = focused_client = 0;
+		tagmask = 1 << tag;
+		if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
+			state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
+
+		wl_list_for_each(c, &clients, link) {
+			if (c->mon != monitor)
+				continue;
+			if (!(c->tags & tagmask))
+				continue;
+			if (c == focused)
+				focused_client = 1;
+			if (c->isurgent)
+				state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
+
+			numclients++;
+		}
+		zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients, focused_client);
+	}
+	title = focused ? client_get_title(focused) : "";
+	appid = focused ? client_get_appid(focused) : "";
+
+	zdwl_ipc_output_v2_send_layout(ipc_output->resource, monitor->lt[monitor->sellt] - layouts);
+	zdwl_ipc_output_v2_send_title(ipc_output->resource, title);
+	zdwl_ipc_output_v2_send_appid(ipc_output->resource, appid);
+	zdwl_ipc_output_v2_send_layout_symbol(ipc_output->resource, monitor->ltsymbol);
+	if (wl_resource_get_version(ipc_output->resource) >= ZDWL_IPC_OUTPUT_V2_FULLSCREEN_SINCE_VERSION) {
+		zdwl_ipc_output_v2_send_fullscreen(ipc_output->resource, focused ? focused->isfullscreen : 0);
+	}
+	if (wl_resource_get_version(ipc_output->resource) >= ZDWL_IPC_OUTPUT_V2_FLOATING_SINCE_VERSION) {
+		zdwl_ipc_output_v2_send_floating(ipc_output->resource, focused ? focused->isfloating : 0);
+	}
+	zdwl_ipc_output_v2_send_frame(ipc_output->resource);
+}
+
+void
+dwl_ipc_output_set_client_tags(struct wl_client *client, struct wl_resource *resource, uint32_t and_tags, uint32_t xor_tags)
+{
+	DwlIpcOutput *ipc_output;
+	Monitor *monitor;
+	Client *selected_client;
+	unsigned int newtags = 0;
+
+	ipc_output = wl_resource_get_user_data(resource);
+	if (!ipc_output)
+		return;
+
+	monitor = ipc_output->mon;
+	selected_client = focustop(monitor);
+	if (!selected_client)
+		return;
+
+	newtags = (selected_client->tags & and_tags) ^ xor_tags;
+	if (!newtags)
+		return;
+
+	selected_client->tags = newtags;
+	if (selmon == monitor)
+		focusclient(focustop(monitor), 1);
+	arrange(selmon);
+	printstatus();
+}
+
+void
+dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource, uint32_t index)
+{
+	DwlIpcOutput *ipc_output;
+	Monitor *monitor;
+
+	ipc_output = wl_resource_get_user_data(resource);
+	if (!ipc_output)
+		return;
+
+	monitor = ipc_output->mon;
+	if (index >= LENGTH(layouts))
+		return;
+	if (index != monitor->lt[monitor->sellt] - layouts)
+		monitor->sellt ^= 1;
+
+	monitor->lt[monitor->sellt] = &layouts[index];
+	arrange(monitor);
+	printstatus();
+}
+
+void
+dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, uint32_t tagmask, uint32_t toggle_tagset)
+{
+	DwlIpcOutput *ipc_output;
+	Monitor *monitor;
+	unsigned int newtags = tagmask & TAGMASK;
+
+	ipc_output = wl_resource_get_user_data(resource);
+	if (!ipc_output)
+		return;
+	monitor = ipc_output->mon;
+
+	if (!newtags || newtags == monitor->tagset[monitor->seltags])
+		return;
+	if (toggle_tagset)
+		monitor->seltags ^= 1;
+
+	monitor->tagset[monitor->seltags] = newtags;
+	if (selmon == monitor)
+		focusclient(focustop(monitor), 1);
+	arrange(monitor);
+	printstatus();
+}
+
+void
+dwl_ipc_output_release(struct wl_client *client, struct wl_resource *resource)
+{
+	wl_resource_destroy(resource);
+}
+
 void
 focusclient(Client *c, int lift)
 {
@@ -2076,20 +2269,6 @@ 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)
@@ -2122,38 +2301,9 @@ void
 printstatus(void)
 {
 	Monitor *m = NULL;
-	Client *c;
-	uint32_t occ, urg, sel;
 
-	wl_list_for_each(m, &mons, link) {
+	wl_list_for_each(m, &mons, link)
-		occ = urg = 0;
+		dwl_ipc_output_printstatus(m);
-		wl_list_for_each(c, &clients, link) {
-			if (c->mon != m)
-				continue;
-			occ |= c->tags;
-			if (c->isurgent)
-				urg |= c->tags;
-		}
-		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);
-			printf("%s floating %d\n", m->wlr_output->name, c->isfloating);
-			sel = c->tags;
-		} else {
-			printf("%s title \n", m->wlr_output->name);
-			printf("%s appid \n", m->wlr_output->name);
-			printf("%s fullscreen \n", m->wlr_output->name);
-			printf("%s floating \n", m->wlr_output->name);
-			sel = 0;
-		}
-
-		printf("%s selmon %u\n", m->wlr_output->name, m == selmon);
-		printf("%s tags %"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"\n",
-			m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg);
-		printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol);
-	}
-	fflush(stdout);
 }
 
 void
@@ -2382,7 +2532,7 @@ setfullscreen(Client *c, int fullscreen)
 	c->isfullscreen = fullscreen;
 	if (!c->mon || !client_surface(c)->mapped)
 		return;
-	c->bw = fullscreen ? 0 : BORDERPX(c);
+	c->bw = fullscreen ? 0 : borderpx;
 	client_set_fullscreen(c, fullscreen);
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
 			? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
@@ -2449,9 +2599,6 @@ 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
@@ -2680,6 +2827,8 @@ setup(void)
 	wl_signal_add(&output_mgr->events.apply, &output_mgr_apply);
 	wl_signal_add(&output_mgr->events.test, &output_mgr_test);
 
+	wl_global_create(dpy, &zdwl_ipc_manager_v2_interface, 2, NULL, dwl_ipc_manager_bind);
+
 	/* Make sure XWayland clients don't connect to the parent X server,
 	 * e.g when running in the x11 backend or the wayland backend and the
 	 * compositor has Xwayland support */
@@ -2722,44 +2871,6 @@ 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)
 {
@@ -2781,40 +2892,6 @@ 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)
 {
@@ -2849,6 +2926,13 @@ tile(Monitor *m)
 	}
 }
 
+void
+togglebar(const Arg *arg) {
+	DwlIpcOutput *ipc_output;
+	wl_list_for_each(ipc_output, &selmon->dwl_ipc_outputs, link)
+		zdwl_ipc_output_v2_send_toggle_visibility(ipc_output->resource);
+}
+
 void
 togglefloating(const Arg *arg)
 {
@@ -2866,32 +2950,6 @@ 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)
 {
@@ -2952,12 +3010,6 @@ 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;

ipc.patch

@@ -0,0 +1,596 @@
+From 6c6d655b68770ce82a24fde9b58c4d97b672553a Mon Sep 17 00:00:00 2001
+From: choc <notchoc@proton.me>
+Date: Mon, 23 Oct 2023 10:35:17 +0800
+Subject: [PATCH] implement dwl-ipc-unstable-v2
+ https://codeberg.org/dwl/dwl-patches/wiki/ipc
+
+---
+ Makefile                          |  14 +-
+ config.def.h                      |   1 +
+ dwl.c                             | 257 ++++++++++++++++++++++++++----
+ protocols/dwl-ipc-unstable-v2.xml | 181 +++++++++++++++++++++
+ 4 files changed, 419 insertions(+), 34 deletions(-)
+ create mode 100644 protocols/dwl-ipc-unstable-v2.xml
+
+diff --git a/Makefile b/Makefile
+index 8db7409..a79a080 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,12 +17,14 @@ DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEV
+ LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS)
+
+ all: dwl
+-dwl: dwl.o util.o
+-	$(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
++dwl: dwl.o util.o dwl-ipc-unstable-v2-protocol.o
++	$(CC) dwl.o util.o dwl-ipc-unstable-v2-protocol.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
+ dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
+ 	pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
+-	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
++	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h \
++	dwl-ipc-unstable-v2-protocol.h
+ util.o: util.c util.h
++dwl-ipc-unstable-v2-protocol.o: dwl-ipc-unstable-v2-protocol.c dwl-ipc-unstable-v2-protocol.h
+
+ # wayland-scanner is a tool which generates C headers and rigging for Wayland
+ # protocols, which are specified in XML. wlroots requires you to rig these up
+@@ -45,6 +47,12 @@ wlr-output-power-management-unstable-v1-protocol.h:
+ xdg-shell-protocol.h:
+ 	$(WAYLAND_SCANNER) server-header \
+ 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
++dwl-ipc-unstable-v2-protocol.h:
++	$(WAYLAND_SCANNER) server-header \
++		protocols/dwl-ipc-unstable-v2.xml $@
++dwl-ipc-unstable-v2-protocol.c:
++	$(WAYLAND_SCANNER) private-code \
++		protocols/dwl-ipc-unstable-v2.xml $@
+
+ config.h:
+ 	cp config.def.h $@
+diff --git a/config.def.h b/config.def.h
+index 22d2171..1593033 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -127,6 +127,7 @@ static const Key keys[] = {
+ 	/* modifier                  key                 function        argument */
+ 	{ MODKEY,                    XKB_KEY_p,          spawn,          {.v = menucmd} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return,     spawn,          {.v = termcmd} },
++	{ MODKEY,                    XKB_KEY_b,          togglebar,      {0} },
+ 	{ MODKEY,                    XKB_KEY_j,          focusstack,     {.i = +1} },
+ 	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
+ 	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
+diff --git a/dwl.c b/dwl.c
+index 8a587d1..7a4949b 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -68,6 +68,7 @@
+ #include <xcb/xcb_icccm.h>
+ #endif
+
++#include "dwl-ipc-unstable-v2-protocol.h"
+ #include "util.h"
+
+ /* macros */
+@@ -144,6 +145,12 @@ typedef struct {
+ 	uint32_t resize; /* configure serial of a pending resize */
+ } Client;
+
++typedef struct {
++	struct wl_list link;
++	struct wl_resource *resource;
++	Monitor *mon;
++} DwlIpcOutput;
++
+ typedef struct {
+ 	uint32_t mod;
+ 	xkb_keysym_t keysym;
+@@ -189,6 +196,7 @@ typedef struct {
+
+ struct Monitor {
+ 	struct wl_list link;
++	struct wl_list dwl_ipc_outputs;
+ 	struct wlr_output *wlr_output;
+ 	struct wlr_scene_output *scene_output;
+ 	struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */
+@@ -286,6 +294,17 @@ static void destroysessionlock(struct wl_listener *listener, void *data);
+ static void destroysessionmgr(struct wl_listener *listener, void *data);
+ static void destroykeyboardgroup(struct wl_listener *listener, void *data);
+ static Monitor *dirtomon(enum wlr_direction dir);
++static void dwl_ipc_manager_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id);
++static void dwl_ipc_manager_destroy(struct wl_resource *resource);
++static void dwl_ipc_manager_get_output(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *output);
++static void dwl_ipc_manager_release(struct wl_client *client, struct wl_resource *resource);
++static void dwl_ipc_output_destroy(struct wl_resource *resource);
++static void dwl_ipc_output_printstatus(Monitor *monitor);
++static void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output);
++static void dwl_ipc_output_set_client_tags(struct wl_client *client, struct wl_resource *resource, uint32_t and_tags, uint32_t xor_tags);
++static void dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource, uint32_t index);
++static void dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, uint32_t tagmask, uint32_t toggle_tagset);
++static void dwl_ipc_output_release(struct wl_client *client, struct wl_resource *resource);
+ static void focusclient(Client *c, int lift);
+ static void focusmon(const Arg *arg);
+ static void focusstack(const Arg *arg);
+@@ -338,6 +357,7 @@ static void startdrag(struct wl_listener *listener, void *data);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+ static void tile(Monitor *m);
++static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
+ static void togglefullscreen(const Arg *arg);
+ static void toggletag(const Arg *arg);
+@@ -411,6 +431,9 @@ static struct wlr_box sgeom;
+ static struct wl_list mons;
+ static Monitor *selmon;
+
++static struct zdwl_ipc_manager_v2_interface dwl_manager_implementation = {.release = dwl_ipc_manager_release, .get_output = dwl_ipc_manager_get_output};
++static struct zdwl_ipc_output_v2_interface dwl_output_implementation = {.release = dwl_ipc_output_release, .set_tags = dwl_ipc_output_set_tags, .set_layout = dwl_ipc_output_set_layout, .set_client_tags = dwl_ipc_output_set_client_tags};
++
+ #ifdef XWAYLAND
+ static void activatex11(struct wl_listener *listener, void *data);
+ static void associatex11(struct wl_listener *listener, void *data);
+@@ -703,6 +726,10 @@ cleanupmon(struct wl_listener *listener, void *data)
+ 	LayerSurface *l, *tmp;
+ 	size_t i;
+
++	DwlIpcOutput *ipc_output, *ipc_output_tmp;
++	wl_list_for_each_safe(ipc_output, ipc_output_tmp, &m->dwl_ipc_outputs, link)
++		wl_resource_destroy(ipc_output->resource);
++
+ 	/* m->layers[i] are intentionally not unlinked */
+ 	for (i = 0; i < LENGTH(m->layers); i++) {
+ 		wl_list_for_each_safe(l, tmp, &m->layers[i], link)
+@@ -983,6 +1010,8 @@ createmon(struct wl_listener *listener, void *data)
+ 	m = wlr_output->data = ecalloc(1, sizeof(*m));
+ 	m->wlr_output = wlr_output;
+
++	wl_list_init(&m->dwl_ipc_outputs);
++
+ 	for (i = 0; i < LENGTH(m->layers); i++)
+ 		wl_list_init(&m->layers[i]);
+
+@@ -1334,6 +1363,192 @@ dirtomon(enum wlr_direction dir)
+ 	return selmon;
+ }
+
++void
++dwl_ipc_manager_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id)
++{
++	struct wl_resource *manager_resource = wl_resource_create(client, &zdwl_ipc_manager_v2_interface, version, id);
++	if (!manager_resource) {
++		wl_client_post_no_memory(client);
++		return;
++	}
++	wl_resource_set_implementation(manager_resource, &dwl_manager_implementation, NULL, dwl_ipc_manager_destroy);
++
++	zdwl_ipc_manager_v2_send_tags(manager_resource, TAGCOUNT);
++
++	for (unsigned int i = 0; i < LENGTH(layouts); i++)
++		zdwl_ipc_manager_v2_send_layout(manager_resource, layouts[i].symbol);
++}
++
++void
++dwl_ipc_manager_destroy(struct wl_resource *resource)
++{
++	/* No state to destroy */
++}
++
++void
++dwl_ipc_manager_get_output(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *output)
++{
++	DwlIpcOutput *ipc_output;
++	Monitor *monitor = wlr_output_from_resource(output)->data;
++	struct wl_resource *output_resource = wl_resource_create(client, &zdwl_ipc_output_v2_interface, wl_resource_get_version(resource), id);
++	if (!output_resource)
++		return;
++
++	ipc_output = ecalloc(1, sizeof(*ipc_output));
++	ipc_output->resource = output_resource;
++	ipc_output->mon = monitor;
++	wl_resource_set_implementation(output_resource, &dwl_output_implementation, ipc_output, dwl_ipc_output_destroy);
++	wl_list_insert(&monitor->dwl_ipc_outputs, &ipc_output->link);
++	dwl_ipc_output_printstatus_to(ipc_output);
++}
++
++void
++dwl_ipc_manager_release(struct wl_client *client, struct wl_resource *resource)
++{
++	wl_resource_destroy(resource);
++}
++
++static void
++dwl_ipc_output_destroy(struct wl_resource *resource)
++{
++	DwlIpcOutput *ipc_output = wl_resource_get_user_data(resource);
++	wl_list_remove(&ipc_output->link);
++	free(ipc_output);
++}
++
++void
++dwl_ipc_output_printstatus(Monitor *monitor)
++{
++	DwlIpcOutput *ipc_output;
++	wl_list_for_each(ipc_output, &monitor->dwl_ipc_outputs, link)
++		dwl_ipc_output_printstatus_to(ipc_output);
++}
++
++void
++dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output)
++{
++	Monitor *monitor = ipc_output->mon;
++	Client *c, *focused;
++	int tagmask, state, numclients, focused_client, tag;
++	const char *title, *appid;
++	focused = focustop(monitor);
++	zdwl_ipc_output_v2_send_active(ipc_output->resource, monitor == selmon);
++
++	for (tag = 0 ; tag < TAGCOUNT; tag++) {
++		numclients = state = focused_client = 0;
++		tagmask = 1 << tag;
++		if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
++			state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
++
++		wl_list_for_each(c, &clients, link) {
++			if (c->mon != monitor)
++				continue;
++			if (!(c->tags & tagmask))
++				continue;
++			if (c == focused)
++				focused_client = 1;
++			if (c->isurgent)
++				state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
++
++			numclients++;
++		}
++		zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients, focused_client);
++	}
++	title = focused ? client_get_title(focused) : "";
++	appid = focused ? client_get_appid(focused) : "";
++
++	zdwl_ipc_output_v2_send_layout(ipc_output->resource, monitor->lt[monitor->sellt] - layouts);
++	zdwl_ipc_output_v2_send_title(ipc_output->resource, title);
++	zdwl_ipc_output_v2_send_appid(ipc_output->resource, appid);
++	zdwl_ipc_output_v2_send_layout_symbol(ipc_output->resource, monitor->ltsymbol);
++	if (wl_resource_get_version(ipc_output->resource) >= ZDWL_IPC_OUTPUT_V2_FULLSCREEN_SINCE_VERSION) {
++		zdwl_ipc_output_v2_send_fullscreen(ipc_output->resource, focused ? focused->isfullscreen : 0);
++	}
++	if (wl_resource_get_version(ipc_output->resource) >= ZDWL_IPC_OUTPUT_V2_FLOATING_SINCE_VERSION) {
++		zdwl_ipc_output_v2_send_floating(ipc_output->resource, focused ? focused->isfloating : 0);
++	}
++	zdwl_ipc_output_v2_send_frame(ipc_output->resource);
++}
++
++void
++dwl_ipc_output_set_client_tags(struct wl_client *client, struct wl_resource *resource, uint32_t and_tags, uint32_t xor_tags)
++{
++	DwlIpcOutput *ipc_output;
++	Monitor *monitor;
++	Client *selected_client;
++	unsigned int newtags = 0;
++
++	ipc_output = wl_resource_get_user_data(resource);
++	if (!ipc_output)
++		return;
++
++	monitor = ipc_output->mon;
++	selected_client = focustop(monitor);
++	if (!selected_client)
++		return;
++
++	newtags = (selected_client->tags & and_tags) ^ xor_tags;
++	if (!newtags)
++		return;
++
++	selected_client->tags = newtags;
++	if (selmon == monitor)
++		focusclient(focustop(monitor), 1);
++	arrange(selmon);
++	printstatus();
++}
++
++void
++dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource, uint32_t index)
++{
++	DwlIpcOutput *ipc_output;
++	Monitor *monitor;
++
++	ipc_output = wl_resource_get_user_data(resource);
++	if (!ipc_output)
++		return;
++
++	monitor = ipc_output->mon;
++	if (index >= LENGTH(layouts))
++		return;
++	if (index != monitor->lt[monitor->sellt] - layouts)
++		monitor->sellt ^= 1;
++
++	monitor->lt[monitor->sellt] = &layouts[index];
++	arrange(monitor);
++	printstatus();
++}
++
++void
++dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, uint32_t tagmask, uint32_t toggle_tagset)
++{
++	DwlIpcOutput *ipc_output;
++	Monitor *monitor;
++	unsigned int newtags = tagmask & TAGMASK;
++
++	ipc_output = wl_resource_get_user_data(resource);
++	if (!ipc_output)
++		return;
++	monitor = ipc_output->mon;
++
++	if (!newtags || newtags == monitor->tagset[monitor->seltags])
++		return;
++	if (toggle_tagset)
++		monitor->seltags ^= 1;
++
++	monitor->tagset[monitor->seltags] = newtags;
++	if (selmon == monitor)
++		focusclient(focustop(monitor), 1);
++	arrange(monitor);
++	printstatus();
++}
++
++void
++dwl_ipc_output_release(struct wl_client *client, struct wl_resource *resource)
++{
++	wl_resource_destroy(resource);
++}
++
+ void
+ focusclient(Client *c, int lift)
+ {
+@@ -2033,38 +2248,9 @@ void
+ printstatus(void)
+ {
+ 	Monitor *m = NULL;
+-	Client *c;
+-	uint32_t occ, urg, sel;
+
+-	wl_list_for_each(m, &mons, link) {
+-		occ = urg = 0;
+-		wl_list_for_each(c, &clients, link) {
+-			if (c->mon != m)
+-				continue;
+-			occ |= c->tags;
+-			if (c->isurgent)
+-				urg |= c->tags;
+-		}
+-		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);
+-			printf("%s floating %d\n", m->wlr_output->name, c->isfloating);
+-			sel = c->tags;
+-		} else {
+-			printf("%s title \n", m->wlr_output->name);
+-			printf("%s appid \n", m->wlr_output->name);
+-			printf("%s fullscreen \n", m->wlr_output->name);
+-			printf("%s floating \n", m->wlr_output->name);
+-			sel = 0;
+-		}
+-
+-		printf("%s selmon %u\n", m->wlr_output->name, m == selmon);
+-		printf("%s tags %"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"\n",
+-			m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg);
+-		printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol);
+-	}
+-	fflush(stdout);
++	wl_list_for_each(m, &mons, link)
++		dwl_ipc_output_printstatus(m);
+ }
+
+ void
+@@ -2584,6 +2770,8 @@ setup(void)
+ 	LISTEN_STATIC(&output_mgr->events.apply, outputmgrapply);
+ 	LISTEN_STATIC(&output_mgr->events.test, outputmgrtest);
+
++	wl_global_create(dpy, &zdwl_ipc_manager_v2_interface, 2, NULL, dwl_ipc_manager_bind);
++
+ 	/* Make sure XWayland clients don't connect to the parent X server,
+ 	 * e.g when running in the x11 backend or the wayland backend and the
+ 	 * compositor has Xwayland support */
+@@ -2681,6 +2869,13 @@ tile(Monitor *m)
+ 	}
+ }
+
++void
++togglebar(const Arg *arg) {
++	DwlIpcOutput *ipc_output;
++	wl_list_for_each(ipc_output, &selmon->dwl_ipc_outputs, link)
++		zdwl_ipc_output_v2_send_toggle_visibility(ipc_output->resource);
++}
++
+ void
+ togglefloating(const Arg *arg)
+ {
+diff --git a/protocols/dwl-ipc-unstable-v2.xml b/protocols/dwl-ipc-unstable-v2.xml
+new file mode 100644
+index 0000000..0a6e7e5
+--- /dev/null
++++ b/protocols/dwl-ipc-unstable-v2.xml
+@@ -0,0 +1,181 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++This is largely ripped from somebar's ipc patchset; just with some personal modifications.
++I would probably just submit raphi's patchset but I don't think that would be polite.
++-->
++<protocol name="dwl_ipc_unstable_v2">
++  <description summary="inter-proccess-communication about dwl's state">
++      This protocol allows clients to update and get updates from dwl.
++
++      Warning! The protocol described in this file is experimental and
++      backward incompatible changes may be made. Backward compatible
++      changes may be added together with the corresponding interface
++      version bump.
++      Backward incompatible changes are done by bumping the version
++      number in the protocol and interface names and resetting the
++      interface version. Once the protocol is to be declared stable,
++      the 'z' prefix and the version number in the protocol and
++      interface names are removed and the interface version number is
++      reset.
++  </description>
++
++  <interface name="zdwl_ipc_manager_v2" version="2">
++    <description summary="manage dwl state">
++      This interface is exposed as a global in wl_registry.
++
++      Clients can use this interface to get a dwl_ipc_output.
++      After binding the client will recieve the dwl_ipc_manager.tags and dwl_ipc_manager.layout events.
++      The dwl_ipc_manager.tags and dwl_ipc_manager.layout events expose tags and layouts to the client.
++    </description>
++
++    <request name="release" type="destructor">
++      <description summary="release dwl_ipc_manager">
++        Indicates that the client will not the dwl_ipc_manager object anymore.
++        Objects created through this instance are not affected.
++      </description>
++    </request>
++
++    <request name="get_output">
++      <description summary="get a dwl_ipc_outout for a wl_output">
++        Get a dwl_ipc_outout for the specified wl_output.
++      </description>
++      <arg name="id" type="new_id" interface="zdwl_ipc_output_v2"/>
++      <arg name="output" type="object" interface="wl_output"/>
++    </request>
++
++    <event name="tags">
++      <description summary="Announces tag amount">
++        This event is sent after binding.
++        A roundtrip after binding guarantees the client recieved all tags.
++      </description>
++      <arg name="amount" type="uint"/>
++    </event>
++
++    <event name="layout">
++      <description summary="Announces a layout">
++        This event is sent after binding.
++        A roundtrip after binding guarantees the client recieved all layouts.
++      </description>
++      <arg name="name" type="string"/>
++    </event>
++  </interface>
++
++  <interface name="zdwl_ipc_output_v2" version="2">
++    <description summary="control dwl output">
++      Observe and control a dwl output.
++
++      Events are double-buffered:
++      Clients should cache events and redraw when a dwl_ipc_output.frame event is sent.
++
++      Request are not double-buffered:
++      The compositor will update immediately upon request.
++    </description>
++
++    <enum name="tag_state">
++      <entry name="none" value="0" summary="no state"/>
++      <entry name="active" value="1" summary="tag is active"/>
++      <entry name="urgent" value="2" summary="tag has at least one urgent client"/>
++    </enum>
++
++    <request name="release" type="destructor">
++      <description summary="release dwl_ipc_outout">
++        Indicates to that the client no longer needs this dwl_ipc_output.
++      </description>
++    </request>
++
++    <event name="toggle_visibility">
++      <description summary="Toggle client visibilty">
++        Indicates the client should hide or show themselves.
++        If the client is visible then hide, if hidden then show.
++      </description>
++    </event>
++
++    <event name="active">
++      <description summary="Update the selected output.">
++        Indicates if the output is active. Zero is invalid, nonzero is valid.
++      </description>
++      <arg name="active" type="uint"/>
++    </event>
++
++    <event name="tag">
++      <description summary="Update the state of a tag.">
++        Indicates that a tag has been updated.
++      </description>
++      <arg name="tag" type="uint" summary="Index of the tag"/>
++      <arg name="state" type="uint" enum="tag_state" summary="The state of the tag."/>
++      <arg name="clients" type="uint" summary="The number of clients in the tag."/>
++      <arg name="focused" type="uint" summary="If there is a focused client. Nonzero being valid, zero being invalid."/>
++    </event>
++
++    <event name="layout">
++      <description summary="Update the layout.">
++        Indicates a new layout is selected.
++      </description>
++      <arg name="layout" type="uint" summary="Index of the layout."/>
++    </event>
++
++    <event name="title">
++      <description summary="Update the title.">
++        Indicates the title has changed.
++      </description>
++      <arg name="title" type="string" summary="The new title name."/>
++    </event>
++
++    <event name="appid" since="1">
++      <description summary="Update the appid.">
++        Indicates the appid has changed.
++      </description>
++      <arg name="appid" type="string" summary="The new appid."/>
++    </event>
++
++    <event name="layout_symbol" since="1">
++      <description summary="Update the current layout symbol">
++          Indicates the layout has changed. Since layout symbols are dynamic.
++          As opposed to the zdwl_ipc_manager.layout event, this should take precendence when displaying.
++          You can ignore the zdwl_ipc_output.layout event.
++      </description>
++      <arg name="layout" type="string" summary="The new layout"/>
++    </event>
++
++    <event name="frame">
++      <description summary="The update sequence is done.">
++        Indicates that a sequence of status updates have finished and the client should redraw.
++      </description>
++    </event>
++
++    <request name="set_tags">
++      <description summary="Set the active tags of this output"/>
++      <arg name="tagmask" type="uint" summary="bitmask of the tags that should be set."/>
++      <arg name="toggle_tagset" type="uint" summary="toggle the selected tagset, zero for invalid, nonzero for valid."/>
++    </request>
++
++    <request name="set_client_tags">
++      <description summary="Set the tags of the focused client.">
++        The tags are updated as follows:
++        new_tags = (current_tags AND and_tags) XOR xor_tags
++      </description>
++      <arg name="and_tags" type="uint"/>
++      <arg name="xor_tags" type="uint"/>
++    </request>
++
++    <request name="set_layout">
++      <description summary="Set the layout of this output"/>
++      <arg name="index" type="uint" summary="index of a layout recieved by dwl_ipc_manager.layout"/>
++    </request>
++
++    <!-- Version 2 -->
++    <event name="fullscreen" since="2">
++      <description summary="Update fullscreen status">
++          Indicates if the selected client on this output is fullscreen.
++      </description>
++      <arg name="is_fullscreen" type="uint" summary="If the selected client is fullscreen. Nonzero is valid, zero invalid"/>
++    </event>
++
++    <event name="floating" since="2">
++      <description summary="Update the floating status">
++          Indicates if the selected client on this output is floating.
++      </description>
++      <arg name="is_floating" type="uint" summary="If the selected client is floating. Nonzero is valid, zero invalid"/>
++    </event>
++  </interface>
++</protocol>
+--
+2.43.0

protocols/dwl-ipc-unstable-v2.xml

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This is largely ripped from somebar's ipc patchset; just with some personal modifications.
+I would probably just submit raphi's patchset but I don't think that would be polite.
+-->
+<protocol name="dwl_ipc_unstable_v2">
+  <description summary="inter-proccess-communication about dwl's state">
+      This protocol allows clients to update and get updates from dwl.
+
+      Warning! The protocol described in this file is experimental and
+      backward incompatible changes may be made. Backward compatible
+      changes may be added together with the corresponding interface
+      version bump.
+      Backward incompatible changes are done by bumping the version
+      number in the protocol and interface names and resetting the
+      interface version. Once the protocol is to be declared stable,
+      the 'z' prefix and the version number in the protocol and
+      interface names are removed and the interface version number is
+      reset.
+  </description>
+
+  <interface name="zdwl_ipc_manager_v2" version="2">
+    <description summary="manage dwl state">
+      This interface is exposed as a global in wl_registry.
+
+      Clients can use this interface to get a dwl_ipc_output.
+      After binding the client will recieve the dwl_ipc_manager.tags and dwl_ipc_manager.layout events.
+      The dwl_ipc_manager.tags and dwl_ipc_manager.layout events expose tags and layouts to the client.
+    </description>
+
+    <request name="release" type="destructor">
+      <description summary="release dwl_ipc_manager">
+        Indicates that the client will not the dwl_ipc_manager object anymore.
+        Objects created through this instance are not affected.
+      </description>
+    </request>
+
+    <request name="get_output">
+      <description summary="get a dwl_ipc_outout for a wl_output">
+        Get a dwl_ipc_outout for the specified wl_output.
+      </description>
+      <arg name="id" type="new_id" interface="zdwl_ipc_output_v2"/>
+      <arg name="output" type="object" interface="wl_output"/>
+    </request>
+
+    <event name="tags">
+      <description summary="Announces tag amount">
+        This event is sent after binding.
+        A roundtrip after binding guarantees the client recieved all tags.
+      </description>
+      <arg name="amount" type="uint"/>
+    </event>
+
+    <event name="layout">
+      <description summary="Announces a layout">
+        This event is sent after binding.
+        A roundtrip after binding guarantees the client recieved all layouts.
+      </description>
+      <arg name="name" type="string"/>
+    </event>
+  </interface>
+
+  <interface name="zdwl_ipc_output_v2" version="2">
+    <description summary="control dwl output">
+      Observe and control a dwl output.
+
+      Events are double-buffered:
+      Clients should cache events and redraw when a dwl_ipc_output.frame event is sent.
+
+      Request are not double-buffered:
+      The compositor will update immediately upon request.
+    </description>
+
+    <enum name="tag_state">
+      <entry name="none" value="0" summary="no state"/>
+      <entry name="active" value="1" summary="tag is active"/>
+      <entry name="urgent" value="2" summary="tag has at least one urgent client"/>
+    </enum>
+
+    <request name="release" type="destructor">
+      <description summary="release dwl_ipc_outout">
+        Indicates to that the client no longer needs this dwl_ipc_output.
+      </description>
+    </request>
+
+    <event name="toggle_visibility">
+      <description summary="Toggle client visibilty">
+        Indicates the client should hide or show themselves.
+        If the client is visible then hide, if hidden then show.
+      </description>
+    </event>
+
+    <event name="active">
+      <description summary="Update the selected output.">
+        Indicates if the output is active. Zero is invalid, nonzero is valid.
+      </description>
+      <arg name="active" type="uint"/>
+    </event>
+
+    <event name="tag">
+      <description summary="Update the state of a tag.">
+        Indicates that a tag has been updated.
+      </description>
+      <arg name="tag" type="uint" summary="Index of the tag"/>
+      <arg name="state" type="uint" enum="tag_state" summary="The state of the tag."/>
+      <arg name="clients" type="uint" summary="The number of clients in the tag."/>
+      <arg name="focused" type="uint" summary="If there is a focused client. Nonzero being valid, zero being invalid."/>
+    </event>
+
+    <event name="layout">
+      <description summary="Update the layout.">
+        Indicates a new layout is selected.
+      </description>
+      <arg name="layout" type="uint" summary="Index of the layout."/>
+    </event>
+
+    <event name="title">
+      <description summary="Update the title.">
+        Indicates the title has changed.
+      </description>
+      <arg name="title" type="string" summary="The new title name."/>
+    </event>
+
+    <event name="appid" since="1">
+      <description summary="Update the appid.">
+        Indicates the appid has changed.
+      </description>
+      <arg name="appid" type="string" summary="The new appid."/>
+    </event>
+
+    <event name="layout_symbol" since="1">
+      <description summary="Update the current layout symbol">
+          Indicates the layout has changed. Since layout symbols are dynamic.
+          As opposed to the zdwl_ipc_manager.layout event, this should take precendence when displaying.
+          You can ignore the zdwl_ipc_output.layout event.
+      </description>
+      <arg name="layout" type="string" summary="The new layout"/>
+    </event>
+
+    <event name="frame">
+      <description summary="The update sequence is done.">
+        Indicates that a sequence of status updates have finished and the client should redraw.
+      </description>
+    </event>
+
+    <request name="set_tags">
+      <description summary="Set the active tags of this output"/>
+      <arg name="tagmask" type="uint" summary="bitmask of the tags that should be set."/>
+      <arg name="toggle_tagset" type="uint" summary="toggle the selected tagset, zero for invalid, nonzero for valid."/>
+    </request>
+
+    <request name="set_client_tags">
+      <description summary="Set the tags of the focused client.">
+        The tags are updated as follows:
+        new_tags = (current_tags AND and_tags) XOR xor_tags
+      </description>
+      <arg name="and_tags" type="uint"/>
+      <arg name="xor_tags" type="uint"/>
+    </request>
+
+    <request name="set_layout">
+      <description summary="Set the layout of this output"/>
+      <arg name="index" type="uint" summary="index of a layout recieved by dwl_ipc_manager.layout"/>
+    </request>
+
+    <!-- Version 2 -->
+    <event name="fullscreen" since="2">
+      <description summary="Update fullscreen status">
+          Indicates if the selected client on this output is fullscreen.
+      </description>
+      <arg name="is_fullscreen" type="uint" summary="If the selected client is fullscreen. Nonzero is valid, zero invalid"/>
+    </event>
+
+    <event name="floating" since="2">
+      <description summary="Update the floating status">
+          Indicates if the selected client on this output is floating.
+      </description>
+      <arg name="is_floating" type="uint" summary="If the selected client is floating. Nonzero is valid, zero invalid"/>
+    </event>
+  </interface>
+</protocol>

swallow.patch

@@ -1,351 +0,0 @@
-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
-