added missing file

Makefile

@@ -17,14 +17,12 @@ 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-ipc-unstable-v2-protocol.o
-	$(CC) dwl.o util.o dwl-ipc-unstable-v2-protocol.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
+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 \
-	dwl-ipc-unstable-v2-protocol.h
+	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h wlr-foreign-toplevel-management-unstable-v1-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
@@ -47,12 +45,9 @@ 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:
+wlr-foreign-toplevel-management-unstable-v1-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 $@
+		protocols/wlr-foreign-toplevel-management-unstable-v1.xml $@
 
 config.h:
 	cp config.def.h $@

dwl.c

@@ -24,6 +24,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>
@@ -68,7 +69,6 @@
 #include <xcb/xcb_icccm.h>
 #endif
 
-#include "dwl-ipc-unstable-v2-protocol.h"
 #include "util.h"
 
 /* macros */
@@ -129,6 +129,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;
 #ifdef XWAYLAND
 	struct wl_listener activate;
 	struct wl_listener associate;
@@ -142,12 +147,6 @@ 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;
@@ -192,7 +191,6 @@ 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 */
@@ -290,17 +288,6 @@ 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);
@@ -353,7 +340,6 @@ 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);
@@ -371,6 +357,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 pid_t child_pid = -1;
@@ -415,6 +406,8 @@ 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;
@@ -456,9 +449,6 @@ 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);
@@ -510,6 +500,11 @@ applyrules(Client *c)
 	appid = client_get_appid(c);
 	title = client_get_title(c);
 
+	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))) {
@@ -752,10 +747,6 @@ 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)
@@ -1076,8 +1067,6 @@ 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]);
 
@@ -1425,192 +1414,6 @@ 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)
 {
@@ -1665,6 +1468,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();
@@ -1683,6 +1488,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
@@ -1984,6 +1791,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;
@@ -2301,9 +2110,38 @@ void
 printstatus(void)
 {
 	Monitor *m = NULL;
+	Client *c;
+	uint32_t occ, urg, sel;
 
-	wl_list_for_each(m, &mons, link)
-		dwl_ipc_output_printstatus(m);
+	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);
 }
 
 void
@@ -2589,12 +2427,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);
 	}
@@ -2715,6 +2558,9 @@ 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);
@@ -2827,8 +2673,6 @@ 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 */
@@ -2926,13 +2770,6 @@ 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)
 {
@@ -3021,6 +2858,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);
@@ -3136,6 +2978,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();
 }
@@ -3265,6 +3113,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)

foreign-toplevel-management.patch

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

ipc.patch

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

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

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>