patched hide-behind-monocle

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

@@ -246,7 +246,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);
@@ -286,12 +285,12 @@ static Monitor *dirtomon(enum wlr_direction dir);
 static void focusclient(Client *c, int lift);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
-static Client *focustop(Monitor *m);
+static Client *focustop(Monitor *m, int onlytiled);
 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 hidebehindmonocle(Monitor *m);
 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 */
@@ -522,7 +519,7 @@ arrange(Monitor *m)
 	}
 
 	wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
-			(c = focustop(m)) && c->isfullscreen);
+			(c = focustop(m, 0)) && c->isfullscreen);
 
 	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol));
 
@@ -606,20 +603,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)
 {
@@ -828,7 +811,7 @@ closemon(Monitor *m)
 		if (c->mon == m)
 			setmon(c, selmon, c->tags);
 	}
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 	printstatus();
 }
 
@@ -966,11 +949,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);
 
@@ -1255,7 +1248,7 @@ void
 destroydragicon(struct wl_listener *listener, void *data)
 {
 	/* Focus enter isn't sent during drag, so refocus the focused node. */
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 	wl_list_remove(&listener->link);
 	free(listener);
@@ -1294,7 +1287,7 @@ destroylock(SessionLock *lock, int unlock)
 
 	wlr_scene_node_set_enabled(&locked_bg->node, 0);
 
-	focusclient(focustop(selmon), 0);
+	focusclient(focustop(selmon, 0), 0);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 
 destroy:
@@ -1323,7 +1316,7 @@ destroylocksurface(struct wl_listener *listener, void *data)
 		surface = wl_container_of(cur_lock->surfaces.next, surface, link);
 		client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
 	} else if (!locked) {
-		focusclient(focustop(selmon), 1);
+		focusclient(focustop(selmon, 0), 1);
 	} else {
 		wlr_seat_keyboard_clear_focus(seat);
 	}
@@ -1434,6 +1427,7 @@ focusclient(Client *c, int lift)
 		wl_list_insert(&fstack, &c->flink);
 		selmon = c->mon;
 		c->isurgent = 0;
+		hidebehindmonocle(c->mon);
 
 		/* Don't change border color if there is an exclusive focus or we are
 		 * handling a drag operation */
@@ -1487,14 +1481,14 @@ focusmon(const Arg *arg)
 			selmon = dirtomon(arg->i);
 		while (!selmon->wlr_output->enabled && i++ < nmons);
 	}
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 }
 
 void
 focusstack(const Arg *arg)
 {
 	/* Focus the next or previous client (in tiling order) on selmon */
-	Client *c, *sel = focustop(selmon);
+	Client *c, *sel = focustop(selmon, 0);
 	if (!sel || (sel->isfullscreen && !client_has_children(sel)))
 		return;
 	if (arg->i > 0) {
@@ -1520,13 +1514,16 @@ focusstack(const Arg *arg)
  * will focus the topmost client of this mon, when actually will
  * only return that client */
 Client *
-focustop(Monitor *m)
+focustop(Monitor *m, int onlytiled)
 {
 	Client *c;
 	wl_list_for_each(c, &fstack, flink) {
-		if (VISIBLEON(c, m))
+		if (VISIBLEON(c, m)) {
+			if (onlytiled && c->isfloating)
+				continue;
 			return c;
 		}
+	}
 	return NULL;
 }
 
@@ -1571,6 +1568,25 @@ handlesig(int signo)
 		quit(NULL);
 }
 
+void
+hidebehindmonocle(Monitor *m)
+{
+	Client *c;
+	if (m && m->lt[m->sellt]->arrange == monocle) {
+		wl_list_for_each(c, &clients, link) {
+			if (c->mon != m)
+				continue;
+			wlr_scene_node_set_enabled(&c->scene->node, VISIBLEON(c, m) && c->isfloating);
+		}
+
+		c = NULL;
+
+		/* Enable top tiled client, fullscreen is considered tiled */
+		if ((c = focustop(m, 1)))
+			wlr_scene_node_set_enabled(&c->scene->node, 1);
+	}
+}
+
 void
 incnmaster(const Arg *arg)
 {
@@ -1580,13 +1596,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)
 {
@@ -1716,7 +1725,7 @@ keyrepeat(void *data)
 void
 killclient(const Arg *arg)
 {
-	Client *sel = focustop(selmon);
+	Client *sel = focustop(selmon, 0);
 	if (sel)
 		client_send_close(sel);
 }
@@ -1845,8 +1854,7 @@ monocle(Monitor *m)
 	}
 	if (n)
 		snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
-	if ((c = focustop(m)))
+	hidebehindmonocle(m);
-		wlr_scene_node_raise_to_top(&c->scene->node);
 }
 
 void
@@ -2113,7 +2121,7 @@ printstatus(void)
 			if (c->isurgent)
 				urg |= c->tags;
 		}
-		if ((c = focustop(m))) {
+		if ((c = focustop(m, 0))) {
 			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);
@@ -2427,7 +2435,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 		setfloating(c, c->isfloating);
 	}
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 }
 
 void
@@ -2676,13 +2684,6 @@ setup(void)
 #endif
 }
 
-void
-setxkbrules(const Arg *arg)
-{
-	kblayout = arg->i;
-	assignkeymap(&kb_group->wlr_group->keyboard);
-}
-
 void
 spawn(const Arg *arg)
 {
@@ -2708,12 +2709,12 @@ startdrag(struct wl_listener *listener, void *data)
 void
 tag(const Arg *arg)
 {
-	Client *sel = focustop(selmon);
+	Client *sel = focustop(selmon, 0);
 	if (!sel || (arg->ui & TAGMASK) == 0)
 		return;
 
 	sel->tags = arg->ui & TAGMASK;
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2721,7 +2722,7 @@ tag(const Arg *arg)
 void
 tagmon(const Arg *arg)
 {
-	Client *sel = focustop(selmon);
+	Client *sel = focustop(selmon, 0);
 	if (sel)
 		setmon(sel, dirtomon(arg->i), 0);
 }
@@ -2763,7 +2764,7 @@ tile(Monitor *m)
 void
 togglefloating(const Arg *arg)
 {
-	Client *sel = focustop(selmon);
+	Client *sel = focustop(selmon, 0);
 	/* return if fullscreen */
 	if (sel && !sel->isfullscreen)
 		setfloating(sel, !sel->isfloating);
@@ -2772,7 +2773,7 @@ togglefloating(const Arg *arg)
 void
 togglefullscreen(const Arg *arg)
 {
-	Client *sel = focustop(selmon);
+	Client *sel = focustop(selmon, 0);
 	if (sel)
 		setfullscreen(sel, !sel->isfullscreen);
 }
@@ -2781,12 +2782,12 @@ void
 toggletag(const Arg *arg)
 {
 	uint32_t newtags;
-	Client *sel = focustop(selmon);
+	Client *sel = focustop(selmon, 0);
 	if (!sel || !(newtags = sel->tags ^ (arg->ui & TAGMASK)))
 		return;
 
 	sel->tags = newtags;
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2799,7 +2800,7 @@ toggleview(const Arg *arg)
 		return;
 
 	selmon->tagset[selmon->seltags] = newtagset;
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2823,7 +2824,7 @@ unmaplayersurfacenotify(struct wl_listener *listener, void *data)
 	if (l->layer_surface->output && (l->mon = l->layer_surface->output->data))
 		arrangelayers(l->mon);
 	if (l->layer_surface->surface == seat->keyboard_state.focused_surface)
-		focusclient(focustop(selmon), 1);
+		focusclient(focustop(selmon, 0), 1);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 }
 
@@ -2840,7 +2841,7 @@ unmapnotify(struct wl_listener *listener, void *data)
 	if (client_is_unmanaged(c)) {
 		if (c == exclusive_focus) {
 			exclusive_focus = NULL;
-			focusclient(focustop(selmon), 1);
+			focusclient(focustop(selmon, 0), 1);
 		}
 	} else {
 		wl_list_remove(&c->link);
@@ -2921,7 +2922,7 @@ updatemons(struct wl_listener *listener, void *data)
 		/* Don't move clients to the left output when plugging monitors */
 		arrange(m);
 		/* make sure fullscreen clients have the right size */
-		if ((c = focustop(m)) && c->isfullscreen)
+		if ((c = focustop(m, 0)) && c->isfullscreen)
 			resize(c, m->m, 0);
 
 		/* Try to re-set the gamma LUT when updating monitors,
@@ -2941,7 +2942,7 @@ updatemons(struct wl_listener *listener, void *data)
 			if (!c->mon && client_surface(c)->mapped)
 				setmon(c, selmon, c->tags);
 		}
-		focusclient(focustop(selmon), 1);
+		focusclient(focustop(selmon, 0), 1);
 		if (selmon->lock_surface) {
 			client_notify_enter(selmon->lock_surface->surface,
 					wlr_seat_get_keyboard(seat));
@@ -2963,7 +2964,7 @@ void
 updatetitle(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_title);
-	if (c == focustop(c->mon))
+	if (c == focustop(c->mon, 0))
 		printstatus();
 }
 
@@ -2973,7 +2974,7 @@ urgent(struct wl_listener *listener, void *data)
 	struct wlr_xdg_activation_v1_request_activate_event *event = data;
 	Client *c = NULL;
 	toplevel_from_wlr_surface(event->surface, &c, NULL);
-	if (!c || c == focustop(selmon))
+	if (!c || c == focustop(selmon, 0))
 		return;
 
 	c->isurgent = 1;
@@ -2991,7 +2992,7 @@ view(const Arg *arg)
 	selmon->seltags ^= 1; /* toggle sel tagset */
 	if (arg->ui & TAGMASK)
 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-	focusclient(focustop(selmon), 1);
+	focusclient(focustop(selmon, 0), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -3062,7 +3063,7 @@ xytonode(double x, double y, struct wlr_surface **psurface,
 void
 zoom(const Arg *arg)
 {
-	Client *c, *sel = focustop(selmon);
+	Client *c, *sel = focustop(selmon, 0);
 
 	if (!sel || !selmon || !selmon->lt[selmon->sellt]->arrange || sel->isfloating)
 		return;
@@ -3173,7 +3174,7 @@ sethints(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_hints);
 	struct wlr_surface *surface = client_surface(c);
-	if (c == focustop(selmon) || !c->surface.xwayland->hints)
+	if (c == focustop(selmon, 0) || !c->surface.xwayland->hints)
 		return;
 
 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);

hide-behind-monocle.patch

@@ -0,0 +1,332 @@
+From 8022376ee59d616831271dbc9f289a8bfd4fedda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
+ <leohdz172@proton.me>
+Date: Sat, 8 Jul 2023 17:25:16 -0600
+Subject: [PATCH] hide behind monocle
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
+---
+ dwl.c | 87 +++++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 55 insertions(+), 32 deletions(-)
+
+diff --git a/dwl.c b/dwl.c
+index ad21e1ba..cad3b0b2 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -285,10 +285,11 @@ static Monitor *dirtomon(enum wlr_direction dir);
+ static void focusclient(Client *c, int lift);
+ static void focusmon(const Arg *arg);
+ static void focusstack(const Arg *arg);
+-static Client *focustop(Monitor *m);
++static Client *focustop(Monitor *m, int onlytiled);
+ 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 hidebehindmonocle(Monitor *m);
+ static void incnmaster(const Arg *arg);
+ static void inputdevice(struct wl_listener *listener, void *data);
+ static int keybinding(uint32_t mods, xkb_keysym_t sym);
+@@ -518,7 +519,7 @@ arrange(Monitor *m)
+ 	}
+ 
+ 	wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
+-			(c = focustop(m)) && c->isfullscreen);
++			(c = focustop(m, 0)) && c->isfullscreen);
+ 
+ 	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol));
+ 
+@@ -807,7 +808,7 @@ closemon(Monitor *m)
+ 		if (c->mon == m)
+ 			setmon(c, selmon, c->tags);
+ 	}
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ 	printstatus();
+ }
+ 
+@@ -1243,7 +1244,7 @@ void
+ destroydragicon(struct wl_listener *listener, void *data)
+ {
+ 	/* Focus enter isn't sent during drag, so refocus the focused node. */
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ 	motionnotify(0, NULL, 0, 0, 0, 0);
+ 	wl_list_remove(&listener->link);
+ }
+@@ -1280,7 +1281,7 @@ destroylock(SessionLock *lock, int unlock)
+ 
+ 	wlr_scene_node_set_enabled(&locked_bg->node, 0);
+ 
+-	focusclient(focustop(selmon), 0);
++	focusclient(focustop(selmon, 0), 0);
+ 	motionnotify(0, NULL, 0, 0, 0, 0);
+ 
+ destroy:
+@@ -1309,7 +1310,7 @@ destroylocksurface(struct wl_listener *listener, void *data)
+ 		surface = wl_container_of(cur_lock->surfaces.next, surface, link);
+ 		client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
+ 	} else if (!locked) {
+-		focusclient(focustop(selmon), 1);
++		focusclient(focustop(selmon, 0), 1);
+ 	} else {
+ 		wlr_seat_keyboard_clear_focus(seat);
+ 	}
+@@ -1420,6 +1421,7 @@ focusclient(Client *c, int lift)
+ 		wl_list_insert(&fstack, &c->flink);
+ 		selmon = c->mon;
+ 		c->isurgent = 0;
++		hidebehindmonocle(c->mon);
+ 
+ 		/* Don't change border color if there is an exclusive focus or we are
+ 		 * handling a drag operation */
+@@ -1473,14 +1475,14 @@ focusmon(const Arg *arg)
+ 			selmon = dirtomon(arg->i);
+ 		while (!selmon->wlr_output->enabled && i++ < nmons);
+ 	}
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ }
+ 
+ void
+ focusstack(const Arg *arg)
+ {
+ 	/* Focus the next or previous client (in tiling order) on selmon */
+-	Client *c, *sel = focustop(selmon);
++	Client *c, *sel = focustop(selmon, 0);
+ 	if (!sel || (sel->isfullscreen && !client_has_children(sel)))
+ 		return;
+ 	if (arg->i > 0) {
+@@ -1506,12 +1508,15 @@ focusstack(const Arg *arg)
+  * will focus the topmost client of this mon, when actually will
+  * only return that client */
+ Client *
+-focustop(Monitor *m)
++focustop(Monitor *m, int onlytiled)
+ {
+ 	Client *c;
+ 	wl_list_for_each(c, &fstack, flink) {
+-		if (VISIBLEON(c, m))
++		if (VISIBLEON(c, m)) {
++			if (onlytiled && c->isfloating)
++				continue;
+ 			return c;
++		}
+ 	}
+ 	return NULL;
+ }
+@@ -1557,6 +1562,25 @@ handlesig(int signo)
+ 		quit(NULL);
+ }
+ 
++void
++hidebehindmonocle(Monitor *m)
++{
++	Client *c;
++	if (m && m->lt[m->sellt]->arrange == monocle) {
++		wl_list_for_each(c, &clients, link) {
++			if (c->mon != m)
++				continue;
++			wlr_scene_node_set_enabled(&c->scene->node, VISIBLEON(c, m) && c->isfloating);
++		}
++
++		c = NULL;
++
++		/* Enable top tiled client, fullscreen is considered tiled */
++		if ((c = focustop(m, 1)))
++			wlr_scene_node_set_enabled(&c->scene->node, 1);
++	}
++}
++
+ void
+ incnmaster(const Arg *arg)
+ {
+@@ -1695,7 +1719,7 @@ keyrepeat(void *data)
+ void
+ killclient(const Arg *arg)
+ {
+-	Client *sel = focustop(selmon);
++	Client *sel = focustop(selmon, 0);
+ 	if (sel)
+ 		client_send_close(sel);
+ }
+@@ -1824,8 +1848,7 @@ monocle(Monitor *m)
+ 	}
+ 	if (n)
+ 		snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
+-	if ((c = focustop(m)))
+-		wlr_scene_node_raise_to_top(&c->scene->node);
++	hidebehindmonocle(m);
+ }
+ 
+ void
+@@ -2092,7 +2115,7 @@ printstatus(void)
+ 			if (c->isurgent)
+ 				urg |= c->tags;
+ 		}
+-		if ((c = focustop(m))) {
++		if ((c = focustop(m, 0))) {
+ 			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);
+@@ -2406,7 +2429,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
+ 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
+ 		setfloating(c, c->isfloating);
+ 	}
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ }
+ 
+ void
+@@ -2680,12 +2703,12 @@ startdrag(struct wl_listener *listener, void *data)
+ void
+ tag(const Arg *arg)
+ {
+-	Client *sel = focustop(selmon);
++	Client *sel = focustop(selmon, 0);
+ 	if (!sel || (arg->ui & TAGMASK) == 0)
+ 		return;
+ 
+ 	sel->tags = arg->ui & TAGMASK;
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ 	arrange(selmon);
+ 	printstatus();
+ }
+@@ -2693,7 +2716,7 @@ tag(const Arg *arg)
+ void
+ tagmon(const Arg *arg)
+ {
+-	Client *sel = focustop(selmon);
++	Client *sel = focustop(selmon, 0);
+ 	if (sel)
+ 		setmon(sel, dirtomon(arg->i), 0);
+ }
+@@ -2735,7 +2758,7 @@ tile(Monitor *m)
+ void
+ togglefloating(const Arg *arg)
+ {
+-	Client *sel = focustop(selmon);
++	Client *sel = focustop(selmon, 0);
+ 	/* return if fullscreen */
+ 	if (sel && !sel->isfullscreen)
+ 		setfloating(sel, !sel->isfloating);
+@@ -2744,7 +2767,7 @@ togglefloating(const Arg *arg)
+ void
+ togglefullscreen(const Arg *arg)
+ {
+-	Client *sel = focustop(selmon);
++	Client *sel = focustop(selmon, 0);
+ 	if (sel)
+ 		setfullscreen(sel, !sel->isfullscreen);
+ }
+@@ -2753,12 +2776,12 @@ void
+ toggletag(const Arg *arg)
+ {
+ 	uint32_t newtags;
+-	Client *sel = focustop(selmon);
++	Client *sel = focustop(selmon, 0);
+ 	if (!sel || !(newtags = sel->tags ^ (arg->ui & TAGMASK)))
+ 		return;
+ 
+ 	sel->tags = newtags;
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ 	arrange(selmon);
+ 	printstatus();
+ }
+@@ -2771,7 +2794,7 @@ toggleview(const Arg *arg)
+ 		return;
+ 
+ 	selmon->tagset[selmon->seltags] = newtagset;
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ 	arrange(selmon);
+ 	printstatus();
+ }
+@@ -2795,7 +2818,7 @@ unmaplayersurfacenotify(struct wl_listener *listener, void *data)
+ 	if (l->layer_surface->output && (l->mon = l->layer_surface->output->data))
+ 		arrangelayers(l->mon);
+ 	if (l->layer_surface->surface == seat->keyboard_state.focused_surface)
+-		focusclient(focustop(selmon), 1);
++		focusclient(focustop(selmon, 0), 1);
+ 	motionnotify(0, NULL, 0, 0, 0, 0);
+ }
+ 
+@@ -2812,7 +2835,7 @@ unmapnotify(struct wl_listener *listener, void *data)
+ 	if (client_is_unmanaged(c)) {
+ 		if (c == exclusive_focus) {
+ 			exclusive_focus = NULL;
+-			focusclient(focustop(selmon), 1);
++			focusclient(focustop(selmon, 0), 1);
+ 		}
+ 	} else {
+ 		wl_list_remove(&c->link);
+@@ -2893,7 +2916,7 @@ updatemons(struct wl_listener *listener, void *data)
+ 		/* Don't move clients to the left output when plugging monitors */
+ 		arrange(m);
+ 		/* make sure fullscreen clients have the right size */
+-		if ((c = focustop(m)) && c->isfullscreen)
++		if ((c = focustop(m, 0)) && c->isfullscreen)
+ 			resize(c, m->m, 0);
+ 
+ 		/* Try to re-set the gamma LUT when updating monitors,
+@@ -2913,7 +2936,7 @@ updatemons(struct wl_listener *listener, void *data)
+ 			if (!c->mon && client_surface(c)->mapped)
+ 				setmon(c, selmon, c->tags);
+ 		}
+-		focusclient(focustop(selmon), 1);
++		focusclient(focustop(selmon, 0), 1);
+ 		if (selmon->lock_surface) {
+ 			client_notify_enter(selmon->lock_surface->surface,
+ 					wlr_seat_get_keyboard(seat));
+@@ -2935,7 +2958,7 @@ void
+ updatetitle(struct wl_listener *listener, void *data)
+ {
+ 	Client *c = wl_container_of(listener, c, set_title);
+-	if (c == focustop(c->mon))
++	if (c == focustop(c->mon, 0))
+ 		printstatus();
+ }
+ 
+@@ -2945,7 +2968,7 @@ urgent(struct wl_listener *listener, void *data)
+ 	struct wlr_xdg_activation_v1_request_activate_event *event = data;
+ 	Client *c = NULL;
+ 	toplevel_from_wlr_surface(event->surface, &c, NULL);
+-	if (!c || c == focustop(selmon))
++	if (!c || c == focustop(selmon, 0))
+ 		return;
+ 
+ 	c->isurgent = 1;
+@@ -2963,7 +2986,7 @@ view(const Arg *arg)
+ 	selmon->seltags ^= 1; /* toggle sel tagset */
+ 	if (arg->ui & TAGMASK)
+ 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+-	focusclient(focustop(selmon), 1);
++	focusclient(focustop(selmon, 0), 1);
+ 	arrange(selmon);
+ 	printstatus();
+ }
+@@ -3034,7 +3057,7 @@ xytonode(double x, double y, struct wlr_surface **psurface,
+ void
+ zoom(const Arg *arg)
+ {
+-	Client *c, *sel = focustop(selmon);
++	Client *c, *sel = focustop(selmon, 0);
+ 
+ 	if (!sel || !selmon || !selmon->lt[selmon->sellt]->arrange || sel->isfloating)
+ 		return;
+@@ -3145,7 +3168,7 @@ sethints(struct wl_listener *listener, void *data)
+ {
+ 	Client *c = wl_container_of(listener, c, set_hints);
+ 	struct wlr_surface *surface = client_surface(c);
+-	if (c == focustop(selmon))
++	if (c == focustop(selmon, 0))
+ 		return;
+ 
+ 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
+-- 
+2.48.0
+

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
-