added attachtop

attachtop.patch

@@ -0,0 +1,36 @@
+From 42a66d6e06c38e913766ce625f049fdbc3dd0d12 Mon Sep 17 00:00:00 2001
+From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
+Date: Sun, 7 Apr 2024 21:10:17 +0200
+Subject: [PATCH] New client are attached on top of the stack
+
+---
+ dwl.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/dwl.c b/dwl.c
+index bf763df..c0a3d74 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -1605,7 +1605,18 @@ mapnotify(struct wl_listener *listener, void *data)
+ 	c->geom.height += 2 * c->bw;
+ 
+ 	/* Insert this client into client lists. */
+-	wl_list_insert(&clients, &c->link);
++	i = 0;
++	wl_list_for_each(w, &clients, link) {
++		if (!VISIBLEON(w, selmon) || c->isfloating)
++			continue;
++		p = w;
++		if (++i >= selmon->nmaster)
++			break;
++	}
++	if (i > 0)
++		wl_list_insert(&p->link, &c->link);
++	else
++		wl_list_insert(&clients, &c->link);
+ 	wl_list_insert(&fstack, &c->flink);
+ 
+ 	/* Set initial monitor, tags, floating status, and focus:
+-- 
+2.44.0
+

client.h

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

dwl.c

@@ -131,7 +131,6 @@ 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;
@@ -443,7 +442,6 @@ 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};
@@ -1336,7 +1334,6 @@ 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
@@ -1778,6 +1775,17 @@ mapnotify(struct wl_listener *listener, void *data)
 	c->geom.height += 2 * c->bw;
 
 	/* Insert this client into client lists. */
+	i = 0;
+	wl_list_for_each(w, &clients, link) {
+		if (!VISIBLEON(w, selmon) || c->isfloating)
+			continue;
+		p = w;
+		if (++i >= selmon->nmaster)
+			break;
+	}
+	if (i > 0)
+		wl_list_insert(&p->link, &c->link);
+	else
 		wl_list_insert(&clients, &c->link);
 	wl_list_insert(&fstack, &c->flink);
 
@@ -3135,7 +3143,6 @@ 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);
@@ -3150,21 +3157,6 @@ 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

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