patched swallow

Makefile

@@ -21,7 +21,7 @@ dwl: dwl.o util.o
 	$(CC) dwl.o util.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-foreign-toplevel-management-unstable-v1-protocol.h
+	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
 util.o: util.c util.h
 
 # wayland-scanner is a tool which generates C headers and rigging for Wayland
@@ -45,9 +45,6 @@ wlr-output-power-management-unstable-v1-protocol.h:
 xdg-shell-protocol.h:
 	$(WAYLAND_SCANNER) server-header \
 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
-wlr-foreign-toplevel-management-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/wlr-foreign-toplevel-management-unstable-v1.xml $@
 
 config.h:
 	cp config.def.h $@

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 */
+	{ "foot",             NULL,       0,            0,           1,       1,          -1 },
-	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1 }, /* Start on ONLY tag "9" */
+	{ "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

@@ -24,7 +24,6 @@
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
-#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_idle_inhibit_v1.h>
@@ -75,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)
@@ -102,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* */
 
@@ -129,11 +129,6 @@ typedef struct {
 	struct wl_listener fullscreen;
 	struct wl_listener set_decoration_mode;
 	struct wl_listener destroy_decoration;
-	struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
-	struct wl_listener factivate;
-	struct wl_listener fclose;
-	struct wl_listener ffullscreen;
-	struct wl_listener fdestroy;
 #ifdef XWAYLAND
 	struct wl_listener activate;
 	struct wl_listener associate;
@@ -144,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;
@@ -233,6 +232,8 @@ typedef struct {
 	const char *title;
 	uint32_t tags;
 	int isfloating;
+	int isterm;
+	int noswallow;
 	int monitor;
 } Rule;
 
@@ -314,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);
@@ -337,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);
@@ -357,11 +363,6 @@ static Monitor *xytomon(double x, double y);
 static void xytonode(double x, double y, struct wlr_surface **psurface,
 		Client **pc, LayerSurface **pl, double *nx, double *ny);
 static void zoom(const Arg *arg);
-static void createforeigntoplevel(Client *c);
-static void factivatenotify(struct wl_listener *listener, void *data);
-static void fclosenotify(struct wl_listener *listener, void *data);
-static void fdestroynotify(struct wl_listener *listener, void *data);
-static void ffullscreennotify(struct wl_listener *listener, void *data);
 
 /* variables */
 static pid_t child_pid = -1;
@@ -406,8 +407,6 @@ static struct wlr_session_lock_manager_v1 *session_lock_mgr;
 static struct wlr_scene_rect *locked_bg;
 static struct wlr_session_lock_v1 *cur_lock;
 
-static struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_mgr;
-
 static struct wlr_seat *seat;
 static KeyboardGroup *kb_group;
 static unsigned int cursor_mode;
@@ -500,16 +499,15 @@ applyrules(Client *c)
 	appid = client_get_appid(c);
 	title = client_get_title(c);
 
-	if (c->foreign_toplevel) {
+	c->pid = client_get_pid(c);
-		wlr_foreign_toplevel_handle_v1_set_app_id(c->foreign_toplevel, appid);
-		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-	}
 
 	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++)
@@ -517,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);
 }
 
@@ -1468,8 +1472,6 @@ focusclient(Client *c, int lift)
 			client_set_border_color(old_c, bordercolor);
 
 			client_activate_surface(old, 0);
-			if (old_c->foreign_toplevel)
-				wlr_foreign_toplevel_handle_v1_set_activated(old_c->foreign_toplevel, 0);
 		}
 	}
 	printstatus();
@@ -1488,8 +1490,6 @@ focusclient(Client *c, int lift)
 
 	/* Activate the new client */
 	client_activate_surface(client_surface(c), 1);
-	if (c->foreign_toplevel)
-		wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, 1);
 }
 
 void
@@ -1791,8 +1791,6 @@ mapnotify(struct wl_listener *listener, void *data)
 		c->border[i]->node.data = c;
 	}
 
-	createforeigntoplevel(c);
-
 	/* Initialize client geometry with room for border */
 	client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
 	c->geom.width += 2 * c->bw;
@@ -2078,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)
@@ -2370,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]);
@@ -2427,21 +2439,19 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
 	c->prev = c->geom;
 
 	/* Scene graph sends surface leave/enter events on move and resize */
-	if (oldmon) {
+	if (oldmon)
-		if (c->foreign_toplevel)
-			wlr_foreign_toplevel_handle_v1_output_leave(c->foreign_toplevel, oldmon->wlr_output);
 		arrange(oldmon);
-	}
 	if (m) {
 		/* Make sure window actually overlaps with the monitor */
 		resize(c, c->geom, 0);
 		c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
-		if (c->foreign_toplevel)
-			wlr_foreign_toplevel_handle_v1_output_enter(c->foreign_toplevel, m->wlr_output);
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 		setfloating(c, c->isfloating);
 	}
 	focusclient(focustop(selmon), 1);
+
+	if (c->swallowing)
+		setmon(c->swallowing, m, newtags);
 }
 
 void
@@ -2558,9 +2568,6 @@ setup(void)
 	power_mgr = wlr_output_power_manager_v1_create(dpy);
 	wl_signal_add(&power_mgr->events.set_mode, &output_power_mgr_set_mode);
 
-	/* Initializes foreign toplevel management */
-	foreign_toplevel_mgr = wlr_foreign_toplevel_manager_v1_create(dpy);
-
 	/* Creates an output layout, which a wlroots utility for working with an
 	 * arrangement of screens in a physical layout. */
 	output_layout = wlr_output_layout_create(dpy);
@@ -2715,6 +2722,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)
 {
@@ -2736,6 +2781,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)
 {
@@ -2787,6 +2866,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)
 {
@@ -2847,6 +2952,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;
@@ -2858,11 +2969,6 @@ unmapnotify(struct wl_listener *listener, void *data)
 		wl_list_remove(&c->flink);
 	}
 
-	if (c->foreign_toplevel) {
-		wlr_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel);
-		c->foreign_toplevel = NULL;
-	}
-
 	wlr_scene_node_destroy(&c->scene->node);
 	printstatus();
 	motionnotify(0, NULL, 0, 0, 0, 0);
@@ -2978,12 +3084,6 @@ void
 updatetitle(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_title);
-	if (c->foreign_toplevel) {
-		const char *title;
-		if (!(title = client_get_title(c)))
-			title = broken;
-		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-	}
 	if (c == focustop(c->mon))
 		printstatus();
 }
@@ -3113,54 +3213,6 @@ zoom(const Arg *arg)
 	arrange(selmon);
 }
 
-void
-createforeigntoplevel(Client *c)
-{
-	c->foreign_toplevel = wlr_foreign_toplevel_handle_v1_create(foreign_toplevel_mgr);
-
-	LISTEN(&c->foreign_toplevel->events.request_activate, &c->factivate, factivatenotify);
-	LISTEN(&c->foreign_toplevel->events.request_close, &c->fclose, fclosenotify);
-	LISTEN(&c->foreign_toplevel->events.request_fullscreen, &c->ffullscreen, ffullscreennotify);
-	LISTEN(&c->foreign_toplevel->events.destroy, &c->fdestroy, fdestroynotify);
-}
-
-void
-factivatenotify(struct wl_listener *listener, void *data)
-{
-	Client *c = wl_container_of(listener, c, factivate);
-	if (c->mon == selmon) {
-		c->tags = c->mon->tagset[c->mon->seltags];
-	} else {
-		setmon(c, selmon, 0);
-	}
-	focusclient(c, 1);
-	arrange(c->mon);
-}
-
-void
-fclosenotify(struct wl_listener *listener, void *data)
-{
-	Client *c = wl_container_of(listener, c, fclose);
-	client_send_close(c);
-}
-
-void
-ffullscreennotify(struct wl_listener *listener, void *data) {
-	Client *c = wl_container_of(listener, c, ffullscreen);
-	struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
-	setfullscreen(c, event->fullscreen);
-}
-
-void
-fdestroynotify(struct wl_listener *listener, void *data)
-{
-	Client *c = wl_container_of(listener, c, fdestroy);
-	wl_list_remove(&c->factivate.link);
-	wl_list_remove(&c->fclose.link);
-	wl_list_remove(&c->ffullscreen.link);
-	wl_list_remove(&c->fdestroy.link);
-}
-
 #ifdef XWAYLAND
 void
 activatex11(struct wl_listener *listener, void *data)

foreign-toplevel-management.patch

@@ -1,507 +0,0 @@
-From dc63d64cd69f515013464b3feb8acb411f5a348f Mon Sep 17 00:00:00 2001
-From: wochap <gean.marroquin@gmail.com>
-Date: Thu, 2 May 2024 17:25:45 -0500
-Subject: [PATCH] implement foreign toplevel management
-
----
- Makefile                                      |   5 +-
- dwl.c                                         |  93 +++++-
- ...oreign-toplevel-management-unstable-v1.xml | 270 ++++++++++++++++++
- 3 files changed, 366 insertions(+), 2 deletions(-)
- create mode 100644 protocols/wlr-foreign-toplevel-management-unstable-v1.xml
-
-diff --git a/Makefile b/Makefile
-index a67fdd3..e0e1260 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,7 +16,7 @@ LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)
- all: dwl
- dwl: dwl.o util.o
- 	$(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
--dwl.o: dwl.c config.mk config.h client.h cursor-shape-v1-protocol.h pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h xdg-shell-protocol.h
-+dwl.o: dwl.c config.mk config.h client.h cursor-shape-v1-protocol.h pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h xdg-shell-protocol.h wlr-foreign-toplevel-management-unstable-v1-protocol.h
- util.o: util.c util.h
- 
- # wayland-scanner is a tool which generates C headers and rigging for Wayland
-@@ -37,6 +37,9 @@ wlr-layer-shell-unstable-v1-protocol.h:
- xdg-shell-protocol.h:
- 	$(WAYLAND_SCANNER) server-header \
- 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
-+wlr-foreign-toplevel-management-unstable-v1-protocol.h:
-+	$(WAYLAND_SCANNER) server-header \
-+		protocols/wlr-foreign-toplevel-management-unstable-v1.xml $@
- 
- config.h:
- 	cp config.def.h $@
-diff --git a/dwl.c b/dwl.c
-index bf763df..648616d 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -22,6 +22,7 @@
- #include <wlr/types/wlr_data_device.h>
- #include <wlr/types/wlr_drm.h>
- #include <wlr/types/wlr_export_dmabuf_v1.h>
-+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
- #include <wlr/types/wlr_fractional_scale_v1.h>
- #include <wlr/types/wlr_gamma_control_v1.h>
- #include <wlr/types/wlr_idle_inhibit_v1.h>
-@@ -126,6 +127,11 @@ typedef struct {
- 	struct wl_listener fullscreen;
- 	struct wl_listener set_decoration_mode;
- 	struct wl_listener destroy_decoration;
-+	struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
-+	struct wl_listener factivate;
-+	struct wl_listener fclose;
-+	struct wl_listener ffullscreen;
-+	struct wl_listener fdestroy;
- 	struct wlr_box prev; /* layout-relative, includes border */
- 	struct wlr_box bounds;
- #ifdef XWAYLAND
-@@ -347,6 +353,11 @@ static Monitor *xytomon(double x, double y);
- static void xytonode(double x, double y, struct wlr_surface **psurface,
- 		Client **pc, LayerSurface **pl, double *nx, double *ny);
- static void zoom(const Arg *arg);
-+static void createforeigntoplevel(Client *c);
-+static void factivatenotify(struct wl_listener *listener, void *data);
-+static void fclosenotify(struct wl_listener *listener, void *data);
-+static void fdestroynotify(struct wl_listener *listener, void *data);
-+static void ffullscreennotify(struct wl_listener *listener, void *data);
- 
- /* variables */
- static const char broken[] = "broken";
-@@ -392,6 +403,8 @@ static struct wlr_scene_rect *locked_bg;
- static struct wlr_session_lock_v1 *cur_lock;
- static struct wl_listener lock_listener = {.notify = locksession};
- 
-+static struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_mgr;
-+
- static struct wlr_seat *seat;
- static KeyboardGroup kb_group = {0};
- static KeyboardGroup vkb_group = {0};
-@@ -458,6 +471,11 @@ applyrules(Client *c)
- 	if (!(title = client_get_title(c)))
- 		title = broken;
- 
-+	if (c->foreign_toplevel) {
-+		wlr_foreign_toplevel_handle_v1_set_app_id(c->foreign_toplevel, appid);
-+		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-+	}
-+
- 	for (r = rules; r < END(rules); r++) {
- 		if ((!r->title || strstr(title, r->title))
- 				&& (!r->id || strstr(appid, r->id))) {
-@@ -1288,6 +1306,8 @@ focusclient(Client *c, int lift)
- 			client_set_border_color(old_c, bordercolor);
- 
- 			client_activate_surface(old, 0);
-+			if (old_c->foreign_toplevel)
-+				wlr_foreign_toplevel_handle_v1_set_activated(old_c->foreign_toplevel, 0);
- 		}
- 	}
- 	printstatus();
-@@ -1306,6 +1326,8 @@ focusclient(Client *c, int lift)
- 
- 	/* Activate the new client */
- 	client_activate_surface(client_surface(c), 1);
-+	if (c->foreign_toplevel)
-+		wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, 1);
- }
- 
- void
-@@ -1599,6 +1621,8 @@ mapnotify(struct wl_listener *listener, void *data)
- 		c->border[i]->node.data = c;
- 	}
- 
-+	createforeigntoplevel(c);
-+
- 	/* Initialize client geometry with room for border */
- 	client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
- 	c->geom.width += 2 * c->bw;
-@@ -2232,12 +2256,17 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
- 	c->prev = c->geom;
- 
- 	/* Scene graph sends surface leave/enter events on move and resize */
--	if (oldmon)
-+	if (oldmon) {
-+		if (c->foreign_toplevel)
-+			wlr_foreign_toplevel_handle_v1_output_leave(c->foreign_toplevel, oldmon->wlr_output);
- 		arrange(oldmon);
-+	}
- 	if (m) {
- 		/* Make sure window actually overlaps with the monitor */
- 		resize(c, c->geom, 0);
- 		c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
-+		if (c->foreign_toplevel)
-+			wlr_foreign_toplevel_handle_v1_output_enter(c->foreign_toplevel, m->wlr_output);
- 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
- 		setfloating(c, c->isfloating);
- 	}
-@@ -2351,6 +2380,9 @@ setup(void)
- 	gamma_control_mgr = wlr_gamma_control_manager_v1_create(dpy);
- 	LISTEN_STATIC(&gamma_control_mgr->events.set_gamma, setgamma);
- 
-+	/* Initializes foreign toplevel management */
-+	foreign_toplevel_mgr = wlr_foreign_toplevel_manager_v1_create(dpy);
-+
- 	/* Creates an output layout, which a wlroots utility for working with an
- 	 * arrangement of screens in a physical layout. */
- 	output_layout = wlr_output_layout_create();
-@@ -2691,6 +2723,11 @@ unmapnotify(struct wl_listener *listener, void *data)
- 		wl_list_remove(&c->flink);
- 	}
- 
-+	if (c->foreign_toplevel) {
-+		wlr_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel);
-+		c->foreign_toplevel = NULL;
-+	}
-+
- 	wlr_scene_node_destroy(&c->scene->node);
- 	printstatus();
- 	motionnotify(0, NULL, 0, 0, 0, 0);
-@@ -2802,6 +2839,12 @@ void
- updatetitle(struct wl_listener *listener, void *data)
- {
- 	Client *c = wl_container_of(listener, c, set_title);
-+	if (c->foreign_toplevel) {
-+		const char *title;
-+		if (!(title = client_get_title(c)))
-+			title = broken;
-+		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-+	}
- 	if (c == focustop(c->mon))
- 		printstatus();
- }
-@@ -2929,6 +2972,54 @@ zoom(const Arg *arg)
- 	arrange(selmon);
- }
- 
-+void
-+createforeigntoplevel(Client *c)
-+{
-+	c->foreign_toplevel = wlr_foreign_toplevel_handle_v1_create(foreign_toplevel_mgr);
-+
-+	LISTEN(&c->foreign_toplevel->events.request_activate, &c->factivate, factivatenotify);
-+	LISTEN(&c->foreign_toplevel->events.request_close, &c->fclose, fclosenotify);
-+	LISTEN(&c->foreign_toplevel->events.request_fullscreen, &c->ffullscreen, ffullscreennotify);
-+	LISTEN(&c->foreign_toplevel->events.destroy, &c->fdestroy, fdestroynotify);
-+}
-+
-+void
-+factivatenotify(struct wl_listener *listener, void *data)
-+{
-+	Client *c = wl_container_of(listener, c, factivate);
-+	if (c->mon == selmon) {
-+		c->tags = c->mon->tagset[c->mon->seltags];
-+	} else {
-+		setmon(c, selmon, 0);
-+	}
-+	focusclient(c, 1);
-+	arrange(c->mon);
-+}
-+
-+void
-+fclosenotify(struct wl_listener *listener, void *data)
-+{
-+	Client *c = wl_container_of(listener, c, fclose);
-+	client_send_close(c);
-+}
-+
-+void
-+ffullscreennotify(struct wl_listener *listener, void *data) {
-+	Client *c = wl_container_of(listener, c, ffullscreen);
-+	struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
-+	setfullscreen(c, event->fullscreen);
-+}
-+
-+void
-+fdestroynotify(struct wl_listener *listener, void *data)
-+{
-+	Client *c = wl_container_of(listener, c, fdestroy);
-+	wl_list_remove(&c->factivate.link);
-+	wl_list_remove(&c->fclose.link);
-+	wl_list_remove(&c->ffullscreen.link);
-+	wl_list_remove(&c->fdestroy.link);
-+}
-+
- #ifdef XWAYLAND
- void
- activatex11(struct wl_listener *listener, void *data)
-diff --git a/protocols/wlr-foreign-toplevel-management-unstable-v1.xml b/protocols/wlr-foreign-toplevel-management-unstable-v1.xml
-new file mode 100644
-index 0000000..44505bb
---- /dev/null
-+++ b/protocols/wlr-foreign-toplevel-management-unstable-v1.xml
-@@ -0,0 +1,270 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<protocol name="wlr_foreign_toplevel_management_unstable_v1">
-+  <copyright>
-+    Copyright © 2018 Ilia Bozhinov
-+
-+    Permission to use, copy, modify, distribute, and sell this
-+    software and its documentation for any purpose is hereby granted
-+    without fee, provided that the above copyright notice appear in
-+    all copies and that both that copyright notice and this permission
-+    notice appear in supporting documentation, and that the name of
-+    the copyright holders not be used in advertising or publicity
-+    pertaining to distribution of the software without specific,
-+    written prior permission.  The copyright holders make no
-+    representations about the suitability of this software for any
-+    purpose.  It is provided "as is" without express or implied
-+    warranty.
-+
-+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-+    THIS SOFTWARE.
-+  </copyright>
-+
-+  <interface name="zwlr_foreign_toplevel_manager_v1" version="3">
-+    <description summary="list and control opened apps">
-+      The purpose of this protocol is to enable the creation of taskbars
-+      and docks by providing them with a list of opened applications and
-+      letting them request certain actions on them, like maximizing, etc.
-+
-+      After a client binds the zwlr_foreign_toplevel_manager_v1, each opened
-+      toplevel window will be sent via the toplevel event
-+    </description>
-+
-+    <event name="toplevel">
-+      <description summary="a toplevel has been created">
-+        This event is emitted whenever a new toplevel window is created. It
-+        is emitted for all toplevels, regardless of the app that has created
-+        them.
-+
-+        All initial details of the toplevel(title, app_id, states, etc.) will
-+        be sent immediately after this event via the corresponding events in
-+        zwlr_foreign_toplevel_handle_v1.
-+      </description>
-+      <arg name="toplevel" type="new_id" interface="zwlr_foreign_toplevel_handle_v1"/>
-+    </event>
-+
-+    <request name="stop">
-+      <description summary="stop sending events">
-+        Indicates the client no longer wishes to receive events for new toplevels.
-+        However the compositor may emit further toplevel_created events, until
-+        the finished event is emitted.
-+
-+        The client must not send any more requests after this one.
-+      </description>
-+    </request>
-+
-+    <event name="finished" type="destructor">
-+      <description summary="the compositor has finished with the toplevel manager">
-+        This event indicates that the compositor is done sending events to the
-+        zwlr_foreign_toplevel_manager_v1. The server will destroy the object
-+        immediately after sending this request, so it will become invalid and
-+        the client should free any resources associated with it.
-+      </description>
-+    </event>
-+  </interface>
-+
-+  <interface name="zwlr_foreign_toplevel_handle_v1" version="3">
-+    <description summary="an opened toplevel">
-+      A zwlr_foreign_toplevel_handle_v1 object represents an opened toplevel
-+      window. Each app may have multiple opened toplevels.
-+
-+      Each toplevel has a list of outputs it is visible on, conveyed to the
-+      client with the output_enter and output_leave events.
-+    </description>
-+
-+    <event name="title">
-+      <description summary="title change">
-+        This event is emitted whenever the title of the toplevel changes.
-+      </description>
-+      <arg name="title" type="string"/>
-+    </event>
-+
-+    <event name="app_id">
-+      <description summary="app-id change">
-+        This event is emitted whenever the app-id of the toplevel changes.
-+      </description>
-+      <arg name="app_id" type="string"/>
-+    </event>
-+
-+    <event name="output_enter">
-+      <description summary="toplevel entered an output">
-+        This event is emitted whenever the toplevel becomes visible on
-+        the given output. A toplevel may be visible on multiple outputs.
-+      </description>
-+      <arg name="output" type="object" interface="wl_output"/>
-+    </event>
-+
-+    <event name="output_leave">
-+      <description summary="toplevel left an output">
-+        This event is emitted whenever the toplevel stops being visible on
-+        the given output. It is guaranteed that an entered-output event
-+        with the same output has been emitted before this event.
-+      </description>
-+      <arg name="output" type="object" interface="wl_output"/>
-+    </event>
-+
-+    <request name="set_maximized">
-+      <description summary="requests that the toplevel be maximized">
-+        Requests that the toplevel be maximized. If the maximized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="unset_maximized">
-+      <description summary="requests that the toplevel be unmaximized">
-+        Requests that the toplevel be unmaximized. If the maximized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="set_minimized">
-+      <description summary="requests that the toplevel be minimized">
-+        Requests that the toplevel be minimized. If the minimized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="unset_minimized">
-+      <description summary="requests that the toplevel be unminimized">
-+        Requests that the toplevel be unminimized. If the minimized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="activate">
-+      <description summary="activate the toplevel">
-+        Request that this toplevel be activated on the given seat.
-+        There is no guarantee the toplevel will be actually activated.
-+      </description>
-+      <arg name="seat" type="object" interface="wl_seat"/>
-+    </request>
-+
-+    <enum name="state">
-+      <description summary="types of states on the toplevel">
-+        The different states that a toplevel can have. These have the same meaning
-+        as the states with the same names defined in xdg-toplevel
-+      </description>
-+
-+      <entry name="maximized"  value="0" summary="the toplevel is maximized"/>
-+      <entry name="minimized"  value="1" summary="the toplevel is minimized"/>
-+      <entry name="activated"  value="2" summary="the toplevel is active"/>
-+      <entry name="fullscreen" value="3" summary="the toplevel is fullscreen" since="2"/>
-+    </enum>
-+
-+    <event name="state">
-+      <description summary="the toplevel state changed">
-+        This event is emitted immediately after the zlw_foreign_toplevel_handle_v1
-+        is created and each time the toplevel state changes, either because of a
-+        compositor action or because of a request in this protocol.
-+      </description>
-+
-+      <arg name="state" type="array"/>
-+    </event>
-+
-+    <event name="done">
-+      <description summary="all information about the toplevel has been sent">
-+        This event is sent after all changes in the toplevel state have been
-+        sent.
-+
-+        This allows changes to the zwlr_foreign_toplevel_handle_v1 properties
-+        to be seen as atomic, even if they happen via multiple events.
-+      </description>
-+    </event>
-+
-+    <request name="close">
-+      <description summary="request that the toplevel be closed">
-+        Send a request to the toplevel to close itself. The compositor would
-+        typically use a shell-specific method to carry out this request, for
-+        example by sending the xdg_toplevel.close event. However, this gives
-+        no guarantees the toplevel will actually be destroyed. If and when
-+        this happens, the zwlr_foreign_toplevel_handle_v1.closed event will
-+        be emitted.
-+      </description>
-+    </request>
-+
-+    <request name="set_rectangle">
-+      <description summary="the rectangle which represents the toplevel">
-+        The rectangle of the surface specified in this request corresponds to
-+        the place where the app using this protocol represents the given toplevel.
-+        It can be used by the compositor as a hint for some operations, e.g
-+        minimizing. The client is however not required to set this, in which
-+        case the compositor is free to decide some default value.
-+
-+        If the client specifies more than one rectangle, only the last one is
-+        considered.
-+
-+        The dimensions are given in surface-local coordinates.
-+        Setting width=height=0 removes the already-set rectangle.
-+      </description>
-+
-+      <arg name="surface" type="object" interface="wl_surface"/>
-+      <arg name="x" type="int"/>
-+      <arg name="y" type="int"/>
-+      <arg name="width" type="int"/>
-+      <arg name="height" type="int"/>
-+    </request>
-+
-+    <enum name="error">
-+      <entry name="invalid_rectangle" value="0"
-+        summary="the provided rectangle is invalid"/>
-+    </enum>
-+
-+    <event name="closed">
-+      <description summary="this toplevel has been destroyed">
-+        This event means the toplevel has been destroyed. It is guaranteed there
-+        won't be any more events for this zwlr_foreign_toplevel_handle_v1. The
-+        toplevel itself becomes inert so any requests will be ignored except the
-+        destroy request.
-+      </description>
-+    </event>
-+
-+    <request name="destroy" type="destructor">
-+      <description summary="destroy the zwlr_foreign_toplevel_handle_v1 object">
-+        Destroys the zwlr_foreign_toplevel_handle_v1 object.
-+
-+        This request should be called either when the client does not want to
-+        use the toplevel anymore or after the closed event to finalize the
-+        destruction of the object.
-+      </description>
-+    </request>
-+
-+    <!-- Version 2 additions -->
-+
-+    <request name="set_fullscreen" since="2">
-+      <description summary="request that the toplevel be fullscreened">
-+        Requests that the toplevel be fullscreened on the given output. If the
-+        fullscreen state and/or the outputs the toplevel is visible on actually
-+        change, this will be indicated by the state and output_enter/leave
-+        events.
-+
-+        The output parameter is only a hint to the compositor. Also, if output
-+        is NULL, the compositor should decide which output the toplevel will be
-+        fullscreened on, if at all.
-+      </description>
-+      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
-+    </request>
-+
-+    <request name="unset_fullscreen" since="2">
-+      <description summary="request that the toplevel be unfullscreened">
-+        Requests that the toplevel be unfullscreened. If the fullscreen state
-+        actually changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <!-- Version 3 additions -->
-+
-+    <event name="parent" since="3">
-+      <description summary="parent change">
-+        This event is emitted whenever the parent of the toplevel changes.
-+
-+        No event is emitted when the parent handle is destroyed by the client.
-+      </description>
-+      <arg name="parent" type="object" interface="zwlr_foreign_toplevel_handle_v1" allow-null="true"/>
-+    </event>
-+  </interface>
-+</protocol>
--- 
-2.43.2
-

protocols/wlr-foreign-toplevel-management-unstable-v1.xml

@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_foreign_toplevel_management_unstable_v1">
-  <copyright>
-    Copyright © 2018 Ilia Bozhinov
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <interface name="zwlr_foreign_toplevel_manager_v1" version="3">
-    <description summary="list and control opened apps">
-      The purpose of this protocol is to enable the creation of taskbars
-      and docks by providing them with a list of opened applications and
-      letting them request certain actions on them, like maximizing, etc.
-
-      After a client binds the zwlr_foreign_toplevel_manager_v1, each opened
-      toplevel window will be sent via the toplevel event
-    </description>
-
-    <event name="toplevel">
-      <description summary="a toplevel has been created">
-        This event is emitted whenever a new toplevel window is created. It
-        is emitted for all toplevels, regardless of the app that has created
-        them.
-
-        All initial details of the toplevel(title, app_id, states, etc.) will
-        be sent immediately after this event via the corresponding events in
-        zwlr_foreign_toplevel_handle_v1.
-      </description>
-      <arg name="toplevel" type="new_id" interface="zwlr_foreign_toplevel_handle_v1"/>
-    </event>
-
-    <request name="stop">
-      <description summary="stop sending events">
-        Indicates the client no longer wishes to receive events for new toplevels.
-        However the compositor may emit further toplevel_created events, until
-        the finished event is emitted.
-
-        The client must not send any more requests after this one.
-      </description>
-    </request>
-
-    <event name="finished" type="destructor">
-      <description summary="the compositor has finished with the toplevel manager">
-        This event indicates that the compositor is done sending events to the
-        zwlr_foreign_toplevel_manager_v1. The server will destroy the object
-        immediately after sending this request, so it will become invalid and
-        the client should free any resources associated with it.
-      </description>
-    </event>
-  </interface>
-
-  <interface name="zwlr_foreign_toplevel_handle_v1" version="3">
-    <description summary="an opened toplevel">
-      A zwlr_foreign_toplevel_handle_v1 object represents an opened toplevel
-      window. Each app may have multiple opened toplevels.
-
-      Each toplevel has a list of outputs it is visible on, conveyed to the
-      client with the output_enter and output_leave events.
-    </description>
-
-    <event name="title">
-      <description summary="title change">
-        This event is emitted whenever the title of the toplevel changes.
-      </description>
-      <arg name="title" type="string"/>
-    </event>
-
-    <event name="app_id">
-      <description summary="app-id change">
-        This event is emitted whenever the app-id of the toplevel changes.
-      </description>
-      <arg name="app_id" type="string"/>
-    </event>
-
-    <event name="output_enter">
-      <description summary="toplevel entered an output">
-        This event is emitted whenever the toplevel becomes visible on
-        the given output. A toplevel may be visible on multiple outputs.
-      </description>
-      <arg name="output" type="object" interface="wl_output"/>
-    </event>
-
-    <event name="output_leave">
-      <description summary="toplevel left an output">
-        This event is emitted whenever the toplevel stops being visible on
-        the given output. It is guaranteed that an entered-output event
-        with the same output has been emitted before this event.
-      </description>
-      <arg name="output" type="object" interface="wl_output"/>
-    </event>
-
-    <request name="set_maximized">
-      <description summary="requests that the toplevel be maximized">
-        Requests that the toplevel be maximized. If the maximized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="unset_maximized">
-      <description summary="requests that the toplevel be unmaximized">
-        Requests that the toplevel be unmaximized. If the maximized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="set_minimized">
-      <description summary="requests that the toplevel be minimized">
-        Requests that the toplevel be minimized. If the minimized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="unset_minimized">
-      <description summary="requests that the toplevel be unminimized">
-        Requests that the toplevel be unminimized. If the minimized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="activate">
-      <description summary="activate the toplevel">
-        Request that this toplevel be activated on the given seat.
-        There is no guarantee the toplevel will be actually activated.
-      </description>
-      <arg name="seat" type="object" interface="wl_seat"/>
-    </request>
-
-    <enum name="state">
-      <description summary="types of states on the toplevel">
-        The different states that a toplevel can have. These have the same meaning
-        as the states with the same names defined in xdg-toplevel
-      </description>
-
-      <entry name="maximized"  value="0" summary="the toplevel is maximized"/>
-      <entry name="minimized"  value="1" summary="the toplevel is minimized"/>
-      <entry name="activated"  value="2" summary="the toplevel is active"/>
-      <entry name="fullscreen" value="3" summary="the toplevel is fullscreen" since="2"/>
-    </enum>
-
-    <event name="state">
-      <description summary="the toplevel state changed">
-        This event is emitted immediately after the zlw_foreign_toplevel_handle_v1
-        is created and each time the toplevel state changes, either because of a
-        compositor action or because of a request in this protocol.
-      </description>
-
-      <arg name="state" type="array"/>
-    </event>
-
-    <event name="done">
-      <description summary="all information about the toplevel has been sent">
-        This event is sent after all changes in the toplevel state have been
-        sent.
-
-        This allows changes to the zwlr_foreign_toplevel_handle_v1 properties
-        to be seen as atomic, even if they happen via multiple events.
-      </description>
-    </event>
-
-    <request name="close">
-      <description summary="request that the toplevel be closed">
-        Send a request to the toplevel to close itself. The compositor would
-        typically use a shell-specific method to carry out this request, for
-        example by sending the xdg_toplevel.close event. However, this gives
-        no guarantees the toplevel will actually be destroyed. If and when
-        this happens, the zwlr_foreign_toplevel_handle_v1.closed event will
-        be emitted.
-      </description>
-    </request>
-
-    <request name="set_rectangle">
-      <description summary="the rectangle which represents the toplevel">
-        The rectangle of the surface specified in this request corresponds to
-        the place where the app using this protocol represents the given toplevel.
-        It can be used by the compositor as a hint for some operations, e.g
-        minimizing. The client is however not required to set this, in which
-        case the compositor is free to decide some default value.
-
-        If the client specifies more than one rectangle, only the last one is
-        considered.
-
-        The dimensions are given in surface-local coordinates.
-        Setting width=height=0 removes the already-set rectangle.
-      </description>
-
-      <arg name="surface" type="object" interface="wl_surface"/>
-      <arg name="x" type="int"/>
-      <arg name="y" type="int"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
-    </request>
-
-    <enum name="error">
-      <entry name="invalid_rectangle" value="0"
-        summary="the provided rectangle is invalid"/>
-    </enum>
-
-    <event name="closed">
-      <description summary="this toplevel has been destroyed">
-        This event means the toplevel has been destroyed. It is guaranteed there
-        won't be any more events for this zwlr_foreign_toplevel_handle_v1. The
-        toplevel itself becomes inert so any requests will be ignored except the
-        destroy request.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the zwlr_foreign_toplevel_handle_v1 object">
-        Destroys the zwlr_foreign_toplevel_handle_v1 object.
-
-        This request should be called either when the client does not want to
-        use the toplevel anymore or after the closed event to finalize the
-        destruction of the object.
-      </description>
-    </request>
-
-    <!-- Version 2 additions -->
-
-    <request name="set_fullscreen" since="2">
-      <description summary="request that the toplevel be fullscreened">
-        Requests that the toplevel be fullscreened on the given output. If the
-        fullscreen state and/or the outputs the toplevel is visible on actually
-        change, this will be indicated by the state and output_enter/leave
-        events.
-
-        The output parameter is only a hint to the compositor. Also, if output
-        is NULL, the compositor should decide which output the toplevel will be
-        fullscreened on, if at all.
-      </description>
-      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
-    </request>
-
-    <request name="unset_fullscreen" since="2">
-      <description summary="request that the toplevel be unfullscreened">
-        Requests that the toplevel be unfullscreened. If the fullscreen state
-        actually changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <!-- Version 3 additions -->
-
-    <event name="parent" since="3">
-      <description summary="parent change">
-        This event is emitted whenever the parent of the toplevel changes.
-
-        No event is emitted when the parent handle is destroyed by the client.
-      </description>
-      <arg name="parent" type="object" interface="zwlr_foreign_toplevel_handle_v1" allow-null="true"/>
-    </event>
-  </interface>
-</protocol>

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
+