added smartborders branch and patch

config.def.h

@@ -6,6 +6,7 @@
 /* appearance */
 static const int sloppyfocus               = 1;  /* focus follows mouse */
 static const int bypass_surface_visibility = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
+static const int smartborders              = 1;
 static const unsigned int borderpx         = 1;  /* border pixel of windows */
 static const float rootcolor[]             = COLOR(0x222222ff);
 static const float bordercolor[]           = COLOR(0x444444ff);

dwl.c

@@ -285,11 +285,10 @@ 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, int onlytiled);
+static Client *focustop(Monitor *m);
 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);
@@ -318,7 +317,7 @@ static void rendermon(struct wl_listener *listener, void *data);
 static void requestdecorationmode(struct wl_listener *listener, void *data);
 static void requeststartdrag(struct wl_listener *listener, void *data);
 static void requestmonstate(struct wl_listener *listener, void *data);
-static void resize(Client *c, struct wlr_box geo, int interact);
+static void resize(Client *c, struct wlr_box geo, int interact, int draw_borders);
 static void run(char *startup_cmd);
 static void setcursor(struct wl_listener *listener, void *data);
 static void setcursorshape(struct wl_listener *listener, void *data);
@@ -519,7 +518,7 @@ arrange(Monitor *m)
 	}
 
 	wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
-			(c = focustop(m, 0)) && c->isfullscreen);
+			(c = focustop(m)) && c->isfullscreen);
 
 	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol));
 
@@ -807,11 +806,11 @@ closemon(Monitor *m)
 	wl_list_for_each(c, &clients, link) {
 		if (c->isfloating && c->geom.x > m->m.width)
 			resize(c, (struct wlr_box){.x = c->geom.x - m->w.width, .y = c->geom.y,
-					.width = c->geom.width, .height = c->geom.height}, 0);
+					.width = c->geom.width, .height = c->geom.height}, 0, 1);
 		if (c->mon == m)
 			setmon(c, selmon, c->tags);
 	}
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	printstatus();
 }
 
@@ -876,7 +875,11 @@ commitnotify(struct wl_listener *listener, void *data)
 		return;
 	}
 
-	resize(c, c->geom, (c->isfloating && !c->isfullscreen));
+	if (client_surface(c)->mapped && c->mon && c->mon->lt[c->mon->sellt]->arrange
+			&& !c->isfullscreen && !c->isfloating)
+		c->mon->lt[c->mon->sellt]->arrange(c->mon);
+	else
+		resize(c, c->geom, (c->isfloating && !c->isfullscreen), (c->isfloating && !c->isfullscreen));
 
 	/* mark a pending resize as completed */
 	if (c->resize && c->resize <= c->surface.xdg->current.configure_serial)
@@ -1248,7 +1251,7 @@ void
 destroydragicon(struct wl_listener *listener, void *data)
 {
 	/* Focus enter isn't sent during drag, so refocus the focused node. */
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 	wl_list_remove(&listener->link);
 	free(listener);
@@ -1287,7 +1290,7 @@ destroylock(SessionLock *lock, int unlock)
 
 	wlr_scene_node_set_enabled(&locked_bg->node, 0);
 
-	focusclient(focustop(selmon, 0), 0);
+	focusclient(focustop(selmon), 0);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 
 destroy:
@@ -1316,7 +1319,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, 0), 1);
+		focusclient(focustop(selmon), 1);
 	} else {
 		wlr_seat_keyboard_clear_focus(seat);
 	}
@@ -1427,7 +1430,6 @@ 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 */
@@ -1481,14 +1483,14 @@ focusmon(const Arg *arg)
 			selmon = dirtomon(arg->i);
 		while (!selmon->wlr_output->enabled && i++ < nmons);
 	}
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 }
 
 void
 focusstack(const Arg *arg)
 {
 	/* Focus the next or previous client (in tiling order) on selmon */
-	Client *c, *sel = focustop(selmon, 0);
+	Client *c, *sel = focustop(selmon);
 	if (!sel || (sel->isfullscreen && !client_has_children(sel)))
 		return;
 	if (arg->i > 0) {
@@ -1514,15 +1516,12 @@ focusstack(const Arg *arg)
  * will focus the topmost client of this mon, when actually will
  * only return that client */
 Client *
-focustop(Monitor *m, int onlytiled)
+focustop(Monitor *m)
 {
 	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;
 }
@@ -1568,25 +1567,6 @@ 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)
 {
@@ -1725,7 +1705,7 @@ keyrepeat(void *data)
 void
 killclient(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (sel)
 		client_send_close(sel);
 }
@@ -1849,12 +1829,13 @@ monocle(Monitor *m)
 	wl_list_for_each(c, &clients, link) {
 		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
 			continue;
-		resize(c, m->w, 0);
+		resize(c, m->w, 0, !smartborders);
 		n++;
 	}
 	if (n)
 		snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
-	hidebehindmonocle(m);
+	if ((c = focustop(m)))
+		wlr_scene_node_raise_to_top(&c->scene->node);
 }
 
 void
@@ -1940,11 +1921,11 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
 	if (cursor_mode == CurMove) {
 		/* Move the grabbed client to the new position. */
 		resize(grabc, (struct wlr_box){.x = (int)round(cursor->x) - grabcx, .y = (int)round(cursor->y) - grabcy,
-			.width = grabc->geom.width, .height = grabc->geom.height}, 1);
+			.width = grabc->geom.width, .height = grabc->geom.height}, 1, 1);
 		return;
 	} else if (cursor_mode == CurResize) {
 		resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
-			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1);
+			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1, 1);
 		return;
 	}
 
@@ -2121,7 +2102,7 @@ printstatus(void)
 			if (c->isurgent)
 				urg |= c->tags;
 		}
-		if ((c = focustop(m, 0))) {
+		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);
@@ -2223,7 +2204,7 @@ requestmonstate(struct wl_listener *listener, void *data)
 }
 
 void
-resize(Client *c, struct wlr_box geo, int interact)
+resize(Client *c, struct wlr_box geo, int interact, int draw_borders)
 {
 	struct wlr_box *bbox;
 	struct wlr_box clip;
@@ -2235,6 +2216,7 @@ resize(Client *c, struct wlr_box geo, int interact)
 
 	client_set_bounds(c, geo.width, geo.height);
 	c->geom = geo;
+	c->bw = draw_borders ? borderpx : 0;
 	applybounds(c, bbox);
 
 	/* Update scene-graph, including borders */
@@ -2359,6 +2341,8 @@ setfloating(Client *c, int floating)
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
 			(p && p->isfullscreen) ? LyrFS
 			: c->isfloating ? LyrFloat : LyrTile]);
+	if (c->isfloating && !c->bw)
+		resize(c, c->mon->m, 0, 1);
 	arrange(c->mon);
 	printstatus();
 }
@@ -2376,11 +2360,11 @@ setfullscreen(Client *c, int fullscreen)
 
 	if (fullscreen) {
 		c->prev = c->geom;
-		resize(c, c->mon->m, 0);
+		resize(c, c->mon->m, 0, 0);
 	} else {
 		/* restore previous size instead of arrange for floating windows since
 		 * client positions are set by the user and cannot be recalculated */
-		resize(c, c->prev, 0);
+		resize(c, c->prev, 0, 1);
 	}
 	arrange(c->mon);
 	printstatus();
@@ -2396,6 +2380,12 @@ setlayout(const Arg *arg)
 	if (arg && arg->v)
 		selmon->lt[selmon->sellt] = (Layout *)arg->v;
 	strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
+	if (!selmon->lt[selmon->sellt]->arrange) {
+		/* floating layout, draw borders around all clients */
+		Client *c;
+		wl_list_for_each(c, &clients, link)
+			resize(c, c->mon->m, 0, 1);
+	}
 	arrange(selmon);
 	printstatus();
 }
@@ -2430,12 +2420,12 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
 		arrange(oldmon);
 	if (m) {
 		/* Make sure window actually overlaps with the monitor */
-		resize(c, c->geom, 0);
+		resize(c, c->geom, 0, 1);
 		c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 		setfloating(c, c->isfloating);
 	}
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 }
 
 void
@@ -2709,12 +2699,12 @@ startdrag(struct wl_listener *listener, void *data)
 void
 tag(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (!sel || (arg->ui & TAGMASK) == 0)
 		return;
 
 	sel->tags = arg->ui & TAGMASK;
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2722,7 +2712,7 @@ tag(const Arg *arg)
 void
 tagmon(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (sel)
 		setmon(sel, dirtomon(arg->i), 0);
 }
@@ -2730,7 +2720,7 @@ tagmon(const Arg *arg)
 void
 tile(Monitor *m)
 {
-	unsigned int mw, my, ty;
+	unsigned int mw, my, ty, draw_borders = 1;
 	int i, n = 0;
 	Client *c;
 
@@ -2740,6 +2730,9 @@ tile(Monitor *m)
 	if (n == 0)
 		return;
 
+	if (n == smartborders)
+		draw_borders = 0;
+
 	if (n > m->nmaster)
 		mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
 	else
@@ -2750,11 +2743,11 @@ tile(Monitor *m)
 			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);
+				.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0, draw_borders);
 			my += c->geom.height;
 		} else {
 			resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
-				.width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
+				.width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0, draw_borders);
 			ty += c->geom.height;
 		}
 		i++;
@@ -2764,7 +2757,7 @@ tile(Monitor *m)
 void
 togglefloating(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	/* return if fullscreen */
 	if (sel && !sel->isfullscreen)
 		setfloating(sel, !sel->isfloating);
@@ -2773,7 +2766,7 @@ togglefloating(const Arg *arg)
 void
 togglefullscreen(const Arg *arg)
 {
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (sel)
 		setfullscreen(sel, !sel->isfullscreen);
 }
@@ -2782,12 +2775,12 @@ void
 toggletag(const Arg *arg)
 {
 	uint32_t newtags;
-	Client *sel = focustop(selmon, 0);
+	Client *sel = focustop(selmon);
 	if (!sel || !(newtags = sel->tags ^ (arg->ui & TAGMASK)))
 		return;
 
 	sel->tags = newtags;
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2800,7 +2793,7 @@ toggleview(const Arg *arg)
 		return;
 
 	selmon->tagset[selmon->seltags] = newtagset;
-	focusclient(focustop(selmon, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -2824,7 +2817,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, 0), 1);
+		focusclient(focustop(selmon), 1);
 	motionnotify(0, NULL, 0, 0, 0, 0);
 }
 
@@ -2841,7 +2834,7 @@ unmapnotify(struct wl_listener *listener, void *data)
 	if (client_is_unmanaged(c)) {
 		if (c == exclusive_focus) {
 			exclusive_focus = NULL;
-			focusclient(focustop(selmon, 0), 1);
+			focusclient(focustop(selmon), 1);
 		}
 	} else {
 		wl_list_remove(&c->link);
@@ -2922,8 +2915,8 @@ 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, 0)) && c->isfullscreen)
+		if ((c = focustop(m)) && c->isfullscreen)
-			resize(c, m->m, 0);
+			resize(c, m->m, 0, 0);
 
 		/* Try to re-set the gamma LUT when updating monitors,
 		 * it's only really needed when enabling a disabled output, but meh. */
@@ -2942,7 +2935,7 @@ updatemons(struct wl_listener *listener, void *data)
 			if (!c->mon && client_surface(c)->mapped)
 				setmon(c, selmon, c->tags);
 		}
-		focusclient(focustop(selmon, 0), 1);
+		focusclient(focustop(selmon), 1);
 		if (selmon->lock_surface) {
 			client_notify_enter(selmon->lock_surface->surface,
 					wlr_seat_get_keyboard(seat));
@@ -2964,7 +2957,7 @@ void
 updatetitle(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_title);
-	if (c == focustop(c->mon, 0))
+	if (c == focustop(c->mon))
 		printstatus();
 }
 
@@ -2974,7 +2967,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, 0))
+	if (!c || c == focustop(selmon))
 		return;
 
 	c->isurgent = 1;
@@ -2992,7 +2985,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, 0), 1);
+	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();
 }
@@ -3063,7 +3056,7 @@ xytonode(double x, double y, struct wlr_surface **psurface,
 void
 zoom(const Arg *arg)
 {
-	Client *c, *sel = focustop(selmon, 0);
+	Client *c, *sel = focustop(selmon);
 
 	if (!sel || !selmon || !selmon->lt[selmon->sellt]->arrange || sel->isfloating)
 		return;
@@ -3132,7 +3125,7 @@ configurex11(struct wl_listener *listener, void *data)
 	if ((c->isfloating && c != grabc) || !c->mon->lt[c->mon->sellt]->arrange) {
 		resize(c, (struct wlr_box){.x = event->x - c->bw,
 				.y = event->y - c->bw, .width = event->width + c->bw * 2,
-				.height = event->height + c->bw * 2}, 0);
+				.height = event->height + c->bw * 2}, 0, 1);
 	} else {
 		arrange(c->mon);
 	}
@@ -3174,7 +3167,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, 0) || !c->surface.xwayland->hints)
+	if (c == focustop(selmon) || !c->surface.xwayland->hints)
 		return;
 
 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);

hide-behind-monocle.patch

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