patched xwayland-handle-minimize

client.h

@@ -94,9 +94,12 @@ client_activate_surface(struct wlr_surface *s, int activated)
 {
 	struct wlr_xdg_toplevel *toplevel;
 #ifdef XWAYLAND
-	struct wlr_xwayland_surface *xsurface;
+	struct wlr_xwayland_surface *surface;
-	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
+	if ((surface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
-		wlr_xwayland_surface_activate(xsurface, activated);
+		if (activated && surface->minimized)
+			wlr_xwayland_surface_set_minimized(surface, false);
+
+		wlr_xwayland_surface_activate(surface, activated);
 		return;
 	}
 #endif

config.def.h

@@ -34,7 +34,6 @@ static const Layout layouts[] = {
 	{ "[]=",      tile },
 	{ "><>",      NULL },    /* no layout function means floating behavior */
 	{ "[M]",      monocle },
-	{ "[D]",      deck },
 };
 
 /* monitors */
@@ -140,7 +139,6 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
 	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
-	{ MODKEY,                    XKB_KEY_r,          setlayout,      {.v = &layouts[3]} },
 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },

deck.patch

@@ -1,87 +0,0 @@
-From d56f732d3b5bba4ea0bdf56a91d0992b0cb25bfb Mon Sep 17 00:00:00 2001
-From: anabasis <anabasis@noreply.codeberg.org>
-Date: Fri, 10 May 2024 13:45:33 -0400
-Subject: [PATCH] add deck layout
-
----
- config.def.h |  2 ++
- dwl.c        | 36 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index 8f498d2..9238da0 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -33,6 +33,7 @@ static const Layout layouts[] = {
- 	{ "[]=",      tile },
- 	{ "><>",      NULL },    /* no layout function means floating behavior */
- 	{ "[M]",      monocle },
-+	{ "[D]",      deck },
- };
- 
- /* monitors */
-@@ -134,6 +135,7 @@ static const Key keys[] = {
- 	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
- 	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
- 	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
-+	{ MODKEY,                    XKB_KEY_r,          setlayout,      {.v = &layouts[3]} },
- 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
- 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
-diff --git a/dwl.c b/dwl.c
-index bf763df..1a7ce8e 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -267,6 +267,7 @@ static void createpointerconstraint(struct wl_listener *listener, void *data);
- static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
- static void cursorframe(struct wl_listener *listener, void *data);
- static void cursorwarptohint(void);
-+static void deck(Monitor *m);
- static void destroydecoration(struct wl_listener *listener, void *data);
- static void destroydragicon(struct wl_listener *listener, void *data);
- static void destroyidleinhibitor(struct wl_listener *listener, void *data);
-@@ -1080,6 +1081,41 @@ cursorwarptohint(void)
- 	}
- }
- 
-+void
-+deck(Monitor *m)
-+{
-+	unsigned int mw, my;
-+	int i, n = 0;
-+	Client *c;
-+
-+	wl_list_for_each(c, &clients, link)
-+		if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
-+			n++;
-+	if (n == 0)
-+		return;
-+
-+	if (n > m->nmaster)
-+		mw = m->nmaster ? ROUND(m->w.width * m->mfact) : 0;
-+	else
-+		mw = m->w.width;
-+	i = my = 0;
-+	wl_list_for_each(c, &clients, link) {
-+		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
-+			continue;
-+		if (i < m->nmaster) {
-+			resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
-+				.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
-+			my += c->geom.height;
-+		} else {
-+			resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y,
-+				.width = m->w.width - mw, .height = m->w.height}, 0);
-+			if (c == focustop(m))
-+				wlr_scene_node_raise_to_top(&c->scene->node);
-+		}
-+		i++;
-+	}
-+}
-+
- void
- destroydecoration(struct wl_listener *listener, void *data)
- {
--- 
-2.45.0
-

dwl.c

@@ -131,6 +131,7 @@ typedef struct {
 #ifdef XWAYLAND
 	struct wl_listener activate;
 	struct wl_listener associate;
+	struct wl_listener minimize;
 	struct wl_listener dissociate;
 	struct wl_listener configure;
 	struct wl_listener set_hints;
@@ -271,7 +272,6 @@ static void createpopup(struct wl_listener *listener, void *data);
 static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
 static void cursorframe(struct wl_listener *listener, void *data);
 static void cursorwarptohint(void);
-static void deck(Monitor *m);
 static void destroydecoration(struct wl_listener *listener, void *data);
 static void destroydragicon(struct wl_listener *listener, void *data);
 static void destroyidleinhibitor(struct wl_listener *listener, void *data);
@@ -443,6 +443,7 @@ static void associatex11(struct wl_listener *listener, void *data);
 static void configurex11(struct wl_listener *listener, void *data);
 static void createnotifyx11(struct wl_listener *listener, void *data);
 static void dissociatex11(struct wl_listener *listener, void *data);
+static void minimizenotify(struct wl_listener *listener, void *data);
 static void sethints(struct wl_listener *listener, void *data);
 static void xwaylandready(struct wl_listener *listener, void *data);
 static struct wl_listener new_xwayland_surface = {.notify = createnotifyx11};
@@ -1235,42 +1236,6 @@ cursorwarptohint(void)
 	}
 }
 
-void
-deck(Monitor *m)
-{
-	unsigned int mw, my;
-	int i, n = 0;
-	Client *c;
-
-	wl_list_for_each(c, &clients, link)
-		if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
-			n++;
-	if (n == 0)
-		return;
-
-	if (n > m->nmaster)
-		mw = m->nmaster ? round(m->w.width * m->mfact) : 0;
-	else
-		mw = m->w.width;
-	i = my = 0;
-	wl_list_for_each(c, &clients, link) {
-		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
-			continue;
-		if (i < m->nmaster) {
-			resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
-				.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
-			my += c->geom.height;
-		} else {
-			resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y,
-				.width = m->w.width - mw, .height = m->w.height}, 0);
-		        snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "%d", n-1);
-			if (c == focustop(m))
-				wlr_scene_node_raise_to_top(&c->scene->node);
-		}
-		i++;
-	}
-}
-
 void
 destroydecoration(struct wl_listener *listener, void *data)
 {
@@ -1371,6 +1336,7 @@ destroynotify(struct wl_listener *listener, void *data)
 		wl_list_remove(&c->activate.link);
 		wl_list_remove(&c->associate.link);
 		wl_list_remove(&c->configure.link);
+		wl_list_remove(&c->minimize.link);
 		wl_list_remove(&c->dissociate.link);
 		wl_list_remove(&c->set_hints.link);
 	} else
@@ -3169,6 +3135,7 @@ createnotifyx11(struct wl_listener *listener, void *data)
 	LISTEN(&xsurface->events.destroy, &c->destroy, destroynotify);
 	LISTEN(&xsurface->events.dissociate, &c->dissociate, dissociatex11);
 	LISTEN(&xsurface->events.request_activate, &c->activate, activatex11);
+	LISTEN(&xsurface->events.request_minimize, &c->minimize, minimizenotify);
 	LISTEN(&xsurface->events.request_configure, &c->configure, configurex11);
 	LISTEN(&xsurface->events.request_fullscreen, &c->fullscreen, fullscreennotify);
 	LISTEN(&xsurface->events.set_hints, &c->set_hints, sethints);
@@ -3183,6 +3150,21 @@ dissociatex11(struct wl_listener *listener, void *data)
 	wl_list_remove(&c->unmap.link);
 }
 
+void
+minimizenotify(struct wl_listener *listener, void *data)
+{
+	Client *c = wl_container_of(listener, c, minimize);
+	struct wlr_xwayland_surface *xsurface = c->surface.xwayland;
+	struct wlr_xwayland_minimize_event *e = data;
+	int focused;
+
+	if (xsurface->surface == NULL || !xsurface->surface->mapped)
+		return;
+
+	focused = seat->keyboard_state.focused_surface == xsurface->surface;
+	wlr_xwayland_surface_set_minimized(xsurface, !focused && e->minimize);
+}
+
 void
 sethints(struct wl_listener *listener, void *data)
 {

xwayland-handle-minimize.patch

@@ -0,0 +1,91 @@
+From 7277f668f19f5a7fcfbbc96e80cb2829487848ca Mon Sep 17 00:00:00 2001
+From: korei999 <ju7t1xe@gmail.com>
+Date: Mon, 1 Apr 2024 15:13:11 +0300
+Subject: [PATCH] handle minimize request for xwayland clients
+
+---
+ client.h |  9 ++++++---
+ dwl.c    | 19 +++++++++++++++++++
+ 2 files changed, 25 insertions(+), 3 deletions(-)
+
+diff --git a/client.h b/client.h
+index 800b867..c46cfb2 100644
+--- a/client.h
++++ b/client.h
+@@ -94,9 +94,12 @@ client_activate_surface(struct wlr_surface *s, int activated)
+ {
+ 	struct wlr_xdg_toplevel *toplevel;
+ #ifdef XWAYLAND
+-	struct wlr_xwayland_surface *xsurface;
+-	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
+-		wlr_xwayland_surface_activate(xsurface, activated);
++	struct wlr_xwayland_surface *surface;
++	if ((surface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
++		if (activated && surface->minimized)
++			wlr_xwayland_surface_set_minimized(surface, false);
++
++		wlr_xwayland_surface_activate(surface, activated);
+ 		return;
+ 	}
+ #endif
+diff --git a/dwl.c b/dwl.c
+index 39ce68c..b49f57b 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -131,6 +131,7 @@ typedef struct {
+ #ifdef XWAYLAND
+ 	struct wl_listener activate;
+ 	struct wl_listener associate;
++	struct wl_listener minimize;
+ 	struct wl_listener dissociate;
+ 	struct wl_listener configure;
+ 	struct wl_listener set_hints;
+@@ -412,6 +413,7 @@ static void configurex11(struct wl_listener *listener, void *data);
+ static void createnotifyx11(struct wl_listener *listener, void *data);
+ static void dissociatex11(struct wl_listener *listener, void *data);
+ static xcb_atom_t getatom(xcb_connection_t *xc, const char *name);
++static void minimizenotify(struct wl_listener *listener, void *data);
+ static void sethints(struct wl_listener *listener, void *data);
+ static void xwaylandready(struct wl_listener *listener, void *data);
+ static struct wlr_xwayland *xwayland;
+@@ -1177,6 +1179,7 @@ destroynotify(struct wl_listener *listener, void *data)
+ 		wl_list_remove(&c->activate.link);
+ 		wl_list_remove(&c->associate.link);
+ 		wl_list_remove(&c->configure.link);
++		wl_list_remove(&c->minimize.link);
+ 		wl_list_remove(&c->dissociate.link);
+ 		wl_list_remove(&c->set_hints.link);
+ 	} else
+@@ -2984,6 +2987,7 @@ createnotifyx11(struct wl_listener *listener, void *data)
+ 	LISTEN(&xsurface->events.destroy, &c->destroy, destroynotify);
+ 	LISTEN(&xsurface->events.dissociate, &c->dissociate, dissociatex11);
+ 	LISTEN(&xsurface->events.request_activate, &c->activate, activatex11);
++	LISTEN(&xsurface->events.request_minimize, &c->minimize, minimizenotify);
+ 	LISTEN(&xsurface->events.request_configure, &c->configure, configurex11);
+ 	LISTEN(&xsurface->events.request_fullscreen, &c->fullscreen, fullscreennotify);
+ 	LISTEN(&xsurface->events.set_hints, &c->set_hints, sethints);
+@@ -3011,6 +3015,21 @@ getatom(xcb_connection_t *xc, const char *name)
+ 	return atom;
+ }
+ 
++void
++minimizenotify(struct wl_listener *listener, void *data)
++{
++	Client *c = wl_container_of(listener, c, minimize);
++	struct wlr_xwayland_surface *xsurface = c->surface.xwayland;
++	struct wlr_xwayland_minimize_event *e = data;
++	int focused;
++
++	if (xsurface->surface == NULL || !xsurface->surface->mapped)
++		return;
++
++	focused = seat->keyboard_state.focused_surface == xsurface->surface;
++	wlr_xwayland_surface_set_minimized(xsurface, !focused && e->minimize);
++}
++
+ void
+ sethints(struct wl_listener *listener, void *data)
+ {
+-- 
+2.44.0
+