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

@@ -52,15 +52,12 @@ static const MonitorRule monrules[] = {
 };
 
 /* keyboard */
-static const struct xkb_rule_names xkb_rules[] = {
+static const struct xkb_rule_names xkb_rules = {
-	{
+	/* can specify fields: rules, model, layout, variant, options */
-		.layout = "us",
+	/* example:
-	},
+	.options = "ctrl:nocaps",
-	/*{
+	*/
-		.layout = "us",
+	.options = NULL,
-		.variant = "dvp",
-		.options = "compose:102,numpad:shift3,kpdl:semi,keypad:atm,caps:super"
-	}*/
 };
 
 static const int repeat_rate = 25;
@@ -151,8 +148,6 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          incxkbrules,    {.i = +1} },
-	/*{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E,          setxkbrules,    {.i = +1} },*/
 	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),

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;
@@ -246,7 +247,6 @@ static void arrange(Monitor *m);
 static void arrangelayer(Monitor *m, struct wl_list *list,
 		struct wlr_box *usable_area, int exclusive);
 static void arrangelayers(Monitor *m);
-static void assignkeymap(struct wlr_keyboard *keyboard);
 static void axisnotify(struct wl_listener *listener, void *data);
 static void buttonpress(struct wl_listener *listener, void *data);
 static void chvt(const Arg *arg);
@@ -291,7 +291,6 @@ static void fullscreennotify(struct wl_listener *listener, void *data);
 static void gpureset(struct wl_listener *listener, void *data);
 static void handlesig(int signo);
 static void incnmaster(const Arg *arg);
-static void incxkbrules(const Arg *arg);
 static void inputdevice(struct wl_listener *listener, void *data);
 static int keybinding(uint32_t mods, xkb_keysym_t sym);
 static void keypress(struct wl_listener *listener, void *data);
@@ -331,7 +330,6 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
 static void setpsel(struct wl_listener *listener, void *data);
 static void setsel(struct wl_listener *listener, void *data);
 static void setup(void);
-static void setxkbrules(const Arg *arg);
 static void spawn(const Arg *arg);
 static void startdrag(struct wl_listener *listener, void *data);
 static void tag(const Arg *arg);
@@ -400,7 +398,6 @@ static struct wlr_session_lock_v1 *cur_lock;
 
 static struct wlr_seat *seat;
 static KeyboardGroup *kb_group;
-static unsigned int kblayout = 0;
 static unsigned int cursor_mode;
 static Client *grabc;
 static int grabcx, grabcy; /* client-relative */
@@ -446,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};
@@ -606,20 +604,6 @@ arrangelayers(Monitor *m)
 	}
 }
 
-void
-assignkeymap(struct wlr_keyboard *keyboard) {
-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-	struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, &xkb_rules[kblayout],
-					XKB_KEYMAP_COMPILE_NO_FLAGS);
-
-	if (!keymap)
-		die("failed to compile keymap");
-
-	wlr_keyboard_set_keymap(keyboard, keymap);
-	xkb_keymap_unref(keymap);
-	xkb_context_unref(context);
-}
-
 void
 axisnotify(struct wl_listener *listener, void *data)
 {
@@ -966,11 +950,21 @@ KeyboardGroup *
 createkeyboardgroup(void)
 {
 	KeyboardGroup *group = ecalloc(1, sizeof(*group));
+	struct xkb_context *context;
+	struct xkb_keymap *keymap;
 
 	group->wlr_group = wlr_keyboard_group_create();
 	group->wlr_group->data = group;
 
-	assignkeymap(&group->wlr_group->keyboard);
+	/* Prepare an XKB keymap and assign it to the keyboard group. */
+	context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+	if (!(keymap = xkb_keymap_new_from_names(context, &xkb_rules,
+				XKB_KEYMAP_COMPILE_NO_FLAGS)))
+		die("failed to compile keymap");
+
+	wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap);
+	xkb_keymap_unref(keymap);
+	xkb_context_unref(context);
 
 	wlr_keyboard_set_repeat_info(&group->wlr_group->keyboard, repeat_rate, repeat_delay);
 
@@ -1342,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
@@ -1580,13 +1575,6 @@ incnmaster(const Arg *arg)
 	arrange(selmon);
 }
 
-void
-incxkbrules(const Arg *arg)
-{
-	kblayout = (kblayout + arg->i) % LENGTH(xkb_rules);
-	assignkeymap(&kb_group->wlr_group->keyboard);
-}
-
 void
 inputdevice(struct wl_listener *listener, void *data)
 {
@@ -2676,13 +2664,6 @@ setup(void)
 #endif
 }
 
-void
-setxkbrules(const Arg *arg)
-{
-	kblayout = arg->i;
-	assignkeymap(&kb_group->wlr_group->keyboard);
-}
-
 void
 spawn(const Arg *arg)
 {
@@ -3154,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);
@@ -3168,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)
 {

togglekblayoutandoptions.patch

@@ -1,160 +0,0 @@
-From 9ee76adc7c6567650e7b34273f953fed03191c05 Mon Sep 17 00:00:00 2001
-From: LaKato <lakato@noreply.codeberg.org>
-Date: Sat, 8 Mar 2025 12:14:41 -0500
-Subject: [PATCH] Update for v0.7
-
-Additional changes:
-- incxkbrules now uses its argument
-- A new setxkbrules function has been added
-- Keyboard groups are no longer looped over because only one is created
----
- config.def.h | 17 +++++++++++------
- dwl.c        | 44 +++++++++++++++++++++++++++++++++-----------
- 2 files changed, 44 insertions(+), 17 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 22d2171..b3b4699 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -52,12 +52,15 @@ static const MonitorRule monrules[] = {
- };
- 
- /* keyboard */
--static const struct xkb_rule_names xkb_rules = {
--	/* can specify fields: rules, model, layout, variant, options */
--	/* example:
--	.options = "ctrl:nocaps",
--	*/
--	.options = NULL,
-+static const struct xkb_rule_names xkb_rules[] = {
-+	{
-+		.layout = "us",
-+	},
-+	/*{
-+		.layout = "us",
-+		.variant = "dvp",
-+		.options = "compose:102,numpad:shift3,kpdl:semi,keypad:atm,caps:super"
-+	}*/
- };
- 
- static const int repeat_rate = 25;
-@@ -148,6 +151,8 @@ static const Key keys[] = {
- 	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
-+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          incxkbrules,    {.i = +1} },
-+	/*{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E,          setxkbrules,    {.i = +1} },*/
- 	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
- 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
- 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
-diff --git a/dwl.c b/dwl.c
-index a2711f6..a2413e9 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -249,6 +249,7 @@ static void arrange(Monitor *m);
- static void arrangelayer(Monitor *m, struct wl_list *list,
- 		struct wlr_box *usable_area, int exclusive);
- static void arrangelayers(Monitor *m);
-+static void assignkeymap(struct wlr_keyboard *keyboard);
- static void axisnotify(struct wl_listener *listener, void *data);
- static void buttonpress(struct wl_listener *listener, void *data);
- static void chvt(const Arg *arg);
-@@ -293,6 +294,7 @@ static void fullscreennotify(struct wl_listener *listener, void *data);
- static void gpureset(struct wl_listener *listener, void *data);
- static void handlesig(int signo);
- static void incnmaster(const Arg *arg);
-+static void incxkbrules(const Arg *arg);
- static void inputdevice(struct wl_listener *listener, void *data);
- static int keybinding(uint32_t mods, xkb_keysym_t sym);
- static void keypress(struct wl_listener *listener, void *data);
-@@ -333,6 +335,7 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
- static void setpsel(struct wl_listener *listener, void *data);
- static void setsel(struct wl_listener *listener, void *data);
- static void setup(void);
-+static void setxkbrules(const Arg *arg);
- static void spawn(const Arg *arg);
- static void startdrag(struct wl_listener *listener, void *data);
- static void tag(const Arg *arg);
-@@ -404,6 +407,7 @@ static struct wl_listener lock_listener = {.notify = locksession};
- 
- static struct wlr_seat *seat;
- static KeyboardGroup *kb_group;
-+static unsigned int kblayout = 0;
- static unsigned int cursor_mode;
- static Client *grabc;
- static int grabcx, grabcy; /* client-relative */
-@@ -580,6 +584,20 @@ arrangelayers(Monitor *m)
- 	}
- }
- 
-+void
-+assignkeymap(struct wlr_keyboard *keyboard) {
-+	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-+	struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, &xkb_rules[kblayout],
-+					XKB_KEYMAP_COMPILE_NO_FLAGS);
-+
-+	if (!keymap)
-+		die("failed to compile keymap");
-+
-+	wlr_keyboard_set_keymap(keyboard, keymap);
-+	xkb_keymap_unref(keymap);
-+	xkb_context_unref(context);
-+}
-+
- void
- axisnotify(struct wl_listener *listener, void *data)
- {
-@@ -885,21 +903,11 @@ KeyboardGroup *
- createkeyboardgroup(void)
- {
- 	KeyboardGroup *group = ecalloc(1, sizeof(*group));
--	struct xkb_context *context;
--	struct xkb_keymap *keymap;
- 
- 	group->wlr_group = wlr_keyboard_group_create();
- 	group->wlr_group->data = group;
- 
--	/* Prepare an XKB keymap and assign it to the keyboard group. */
--	context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
--	if (!(keymap = xkb_keymap_new_from_names(context, &xkb_rules,
--				XKB_KEYMAP_COMPILE_NO_FLAGS)))
--		die("failed to compile keymap");
--
--	wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap);
--	xkb_keymap_unref(keymap);
--	xkb_context_unref(context);
-+	assignkeymap(&group->wlr_group->keyboard);
- 
- 	wlr_keyboard_set_repeat_info(&group->wlr_group->keyboard, repeat_rate, repeat_delay);
- 
-@@ -1524,6 +1532,13 @@ incnmaster(const Arg *arg)
- 	arrange(selmon);
- }
- 
-+void
-+incxkbrules(const Arg *arg)
-+{
-+	kblayout = (kblayout + arg->i) % LENGTH(xkb_rules);
-+	assignkeymap(&kb_group->wlr_group->keyboard);
-+}
-+
- void
- inputdevice(struct wl_listener *listener, void *data)
- {
-@@ -2645,6 +2660,13 @@ setup(void)
- #endif
- }
- 
-+void
-+setxkbrules(const Arg *arg)
-+{
-+	kblayout = arg->i;
-+	assignkeymap(&kb_group->wlr_group->keyboard);
-+}
-+
- void
- spawn(const Arg *arg)
- {
--- 
-2.48.1
-

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
+