feat: refactor to use new blur node (#465)

Author: the-eater

include/sway/layers.h

@@ -22,6 +22,7 @@ struct sway_layer_surface {
 	struct sway_output *output;
 	struct wlr_scene_layer_surface_v1 *scene;
 	struct wlr_scene_tree *tree;
+	struct wlr_scene_blur *blur_node;
 	struct wlr_scene_shadow *shadow_node;
 	struct wlr_layer_surface_v1 *layer_surface;
 

include/sway/tree/container.h

@@ -90,6 +90,7 @@ struct sway_container {
 		struct wlr_scene_rect *right;
 	} border;
 
+	struct wlr_scene_blur *blur;
 	struct wlr_scene_shadow *shadow;
 
 	struct wlr_scene_tree *content_tree;

include/sway/tree/node.h

@@ -91,4 +91,7 @@ struct wlr_scene_shadow *alloc_scene_shadow(struct wlr_scene_tree *parent,
 		int width, int height, int corner_radius, float blur_sigma,
 		const float color [static 4], bool *failed);
 
+struct wlr_scene_blur *alloc_scene_blur(struct wlr_scene_tree *parent,
+		int width, int height, bool *failed);
+
 #endif

sway/desktop/layer_shell.c

@@ -98,7 +98,12 @@ static void arrange_surface(struct sway_output *output, const struct wlr_box *fu
 			continue;
 		}
 
+		wlr_scene_node_set_enabled(&surface->blur_node->node, surface->blur_enabled);
+		wlr_scene_blur_set_size(surface->blur_node, surface->layer_surface->surface->current.width,
+			surface->layer_surface->surface->current.height);
+
 		wlr_scene_node_set_enabled(&surface->shadow_node->node, surface->shadow_enabled);
+
 		if (surface->shadow_enabled) {
 			// Adjust the size and position of the shadow node
 			wlr_scene_shadow_set_size(surface->shadow_node,
@@ -242,6 +247,7 @@ static struct sway_layer_surface *sway_layer_surface_create(
 	surface->shadow_enabled = false;
 
 	bool failed = false;
+	surface->blur_node = alloc_scene_blur(surface->tree, 0, 0, &failed);
 	surface->shadow_node = alloc_scene_shadow(surface->tree, 0, 0,
 			0, config->shadow_blur_sigma, config->shadow_color, &failed);
 	if (failed) {
@@ -377,6 +383,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 
 	layer_parse_criteria(surface);
 	wlr_scene_node_lower_to_bottom(&surface->shadow_node->node);
+	wlr_scene_node_lower_to_bottom(&surface->blur_node->node);
 
 	// focus on new surface
 	if (layer_surface->current.keyboard_interactive &&

sway/desktop/output.c

@@ -222,7 +222,6 @@ void output_configure_scene(struct sway_output *output, struct wlr_scene_node *n
 		opacity = con->alpha;
 		corner_radius = con->corner_radius;
 		blur_enabled = con->blur_enabled;
-
 		enum sway_container_layout layout = con->current.layout;
 		has_titlebar |= con->current.border == B_NORMAL || layout == L_STACKED || layout == L_TABBED;
 	}
@@ -263,11 +262,6 @@ void output_configure_scene(struct sway_output *output, struct wlr_scene_node *n
 			wlr_scene_buffer_set_corner_radius(buffer,
 					container_has_corner_radius(closest_con) ? corner_radius : 0,
 					has_titlebar ? CORNER_LOCATION_BOTTOM : CORNER_LOCATION_ALL);
-			wlr_scene_buffer_set_backdrop_blur(buffer, blur_enabled);
-			wlr_scene_buffer_set_backdrop_blur_ignore_transparent(buffer, false);
-			// Only enable xray blur if tiled or when xray is explicitly enabled
-			bool should_optimize_blur = (closest_con && !container_is_floating_or_child(closest_con)) || config->blur_xray;
-			wlr_scene_buffer_set_backdrop_blur_optimized(buffer, should_optimize_blur);
 		} else if (wlr_subsurface_try_from_wlr_surface(surface->surface)) {
 			wlr_scene_buffer_set_corner_radius(buffer,
 					container_has_corner_radius(closest_con) ? corner_radius : 0,
@@ -279,16 +273,32 @@ void output_configure_scene(struct sway_output *output, struct wlr_scene_node *n
 			wlr_scene_buffer_set_corner_radius(buffer, surface->corner_radius, CORNER_LOCATION_ALL);
 			wlr_scene_shadow_set_blur_sigma(surface->shadow_node, config->shadow_blur_sigma);
 			wlr_scene_shadow_set_corner_radius(surface->shadow_node, surface->corner_radius);
-			wlr_scene_buffer_set_backdrop_blur(buffer, surface->blur_enabled);
-			wlr_scene_buffer_set_backdrop_blur_ignore_transparent(buffer, surface->blur_ignore_transparent);
-			wlr_scene_buffer_set_backdrop_blur_optimized(buffer, surface->blur_xray);
+
+			wlr_scene_node_set_enabled(&surface->blur_node->node, surface->blur_enabled);
+
+			if (surface->blur_enabled) {
+				if (surface->blur_ignore_transparent) {
+					wlr_scene_blur_set_transparency_mask_source(surface->blur_node, buffer);
+				} else {
+					wlr_scene_blur_set_transparency_mask_source(surface->blur_node, NULL);
+				}
+				wlr_scene_blur_set_should_only_blur_bottom_layer(surface->blur_node, surface->blur_xray);
+				wlr_scene_blur_set_corner_radius(surface->blur_node, surface->corner_radius, CORNER_LOCATION_ALL);
+			}
 		}
 	} else if (node->type == WLR_SCENE_NODE_TREE) {
 		struct wlr_scene_tree *tree = wlr_scene_tree_from_node(node);
 		struct wlr_scene_node *node;
 		wl_list_for_each(node, &tree->children, link) {
 			output_configure_scene(output, node, opacity, corner_radius, blur_enabled, has_titlebar, closest_con);
 		}
+	} else if (node->type == WLR_SCENE_NODE_BLUR && closest_con) {
+		struct wlr_scene_blur *blur = wlr_scene_blur_from_node(node);
+
+		// Only enable xray blur if tiled or when xray is explicitly enabled
+		bool should_optimize_blur = !container_is_floating_or_child(closest_con) || config->blur_xray;
+		wlr_scene_blur_set_should_only_blur_bottom_layer(blur, should_optimize_blur);
+		wlr_scene_node_set_enabled(node, closest_con->blur_enabled);
 	}
 }
 

sway/desktop/transaction.c

@@ -311,6 +311,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 			arrange_title_bar(child, title_offset, -title_bar_height,
 				next_title_offset - title_offset, title_bar_height);
 			wlr_scene_node_set_enabled(&child->border.tree->node, activated);
+			wlr_scene_node_set_enabled(&child->blur->node, activated);
 			wlr_scene_node_set_enabled(&child->shadow->node, false);
 			wlr_scene_node_set_enabled(&child->scene_tree->node, true);
 			wlr_scene_node_set_position(&child->scene_tree->node, 0, title_bar_height);
@@ -342,6 +343,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 
 			arrange_title_bar(child, 0, y - title_height, width, title_bar_height);
 			wlr_scene_node_set_enabled(&child->border.tree->node, activated);
+			wlr_scene_node_set_enabled(&child->blur->node, activated);
 			wlr_scene_node_set_enabled(&child->shadow->node, false);
 			wlr_scene_node_set_enabled(&child->scene_tree->node, true);
 			wlr_scene_node_set_position(&child->scene_tree->node, 0, title_height);
@@ -363,6 +365,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 			int cheight = child->current.height;
 
 			wlr_scene_node_set_enabled(&child->border.tree->node, true);
+			wlr_scene_node_set_enabled(&child->blur->node, true);
 			wlr_scene_node_set_enabled(&child->shadow->node,
 					container_has_shadow(child) && child->view);
 			wlr_scene_node_set_position(&child->scene_tree->node, 0, off);
@@ -381,6 +384,7 @@ static void arrange_children(enum sway_container_layout layout, list_t *children
 			int cwidth = child->current.width;
 
 			wlr_scene_node_set_enabled(&child->border.tree->node, true);
+			wlr_scene_node_set_enabled(&child->blur->node, true);
 			wlr_scene_node_set_enabled(&child->shadow->node,
 					container_has_shadow(child) && child->view);
 			wlr_scene_node_set_position(&child->scene_tree->node, off, 0);
@@ -553,6 +557,11 @@ static void arrange_container(struct sway_container *con,
 		wlr_scene_node_reparent(&con->view->scene_tree->node, con->content_tree);
 		wlr_scene_node_set_position(&con->view->scene_tree->node,
 			border_left, border_top);
+
+		wlr_scene_node_set_enabled(&con->blur->node, con->blur_enabled);
+		wlr_scene_node_set_position(&con->blur->node, border_left, border_top);
+		wlr_scene_blur_set_size(con->blur, con->current.content_width,
+			con->current.content_height);
 	} else {
 		// make sure to disable the title bar if the parent is not managing it
 		if (title_bar) {

sway/input/seatop_move_tiling.c

@@ -28,11 +28,13 @@ struct seatop_move_tiling_event {
 	bool split_target;
 	bool insert_after_target;
 	struct wlr_scene_rect *indicator_rect;
+	struct wlr_scene_blur *indicator_blur;
 };
 
 static void handle_end(struct sway_seat *seat) {
 	struct seatop_move_tiling_event *e = seat->seatop_data;
 	wlr_scene_node_destroy(&e->indicator_rect->node);
+	wlr_scene_node_destroy(&e->indicator_blur->node);
 	e->indicator_rect = NULL;
 }
 
@@ -55,6 +57,7 @@ static void handle_motion_prethreshold(struct sway_seat *seat) {
 	// If the threshold has been exceeded, start the actual drag
 	if ((cx - sx) * (cx - sx) + (cy - sy) * (cy - sy) > threshold) {
 		wlr_scene_node_set_enabled(&e->indicator_rect->node, true);
+		wlr_scene_node_set_enabled(&e->indicator_blur->node, true);
 		e->threshold_reached = true;
 		cursor_set_image(seat->cursor, "grab", NULL);
 	}
@@ -154,6 +157,9 @@ static bool split_titlebar(struct sway_node *node, struct sway_container *avoid,
 }
 
 static void update_indicator(struct seatop_move_tiling_event *e, struct wlr_box *box) {
+	wlr_scene_node_set_position(&e->indicator_blur->node, box->x, box->y);
+	wlr_scene_blur_set_size(e->indicator_blur, box->width, box->height);
+
 	wlr_scene_node_set_position(&e->indicator_rect->node, box->x, box->y);
 	wlr_scene_rect_set_size(e->indicator_rect, box->width, box->height);
 
@@ -166,9 +172,10 @@ static void update_indicator(struct seatop_move_tiling_event *e, struct wlr_box
 			corner_radius += e->con->current.border_thickness;
 		}
 	}
-	wlr_scene_rect_set_corner_radius(e->indicator_rect,
-			MIN(corner_radius, MIN(box->width / 2, box->height / 2)),
-			CORNER_LOCATION_ALL);
+
+	int corner_radius_real = MIN(corner_radius, MIN(box->width / 2, box->height / 2));
+	wlr_scene_rect_set_corner_radius(e->indicator_rect, corner_radius_real, CORNER_LOCATION_ALL);
+	wlr_scene_blur_set_corner_radius(e->indicator_blur, corner_radius_real, CORNER_LOCATION_ALL);
 }
 
 static void handle_motion_postthreshold(struct sway_seat *seat) {
@@ -468,12 +475,19 @@ void seatop_begin_move_tiling_threshold(struct sway_seat *seat,
 		indicator[2] * .5,
 		indicator[3] * .5,
 	};
+
+	e->indicator_blur = wlr_scene_blur_create(seat->scene_tree, 0, 0);
+	if (!e->indicator_blur) {
+		free(e);
+		return;
+	}
+
 	e->indicator_rect = wlr_scene_rect_create(seat->scene_tree, 0, 0, color);
 	if (!e->indicator_rect) {
+		wlr_scene_node_destroy(&e->indicator_blur->node);
 		free(e);
 		return;
 	}
-	wlr_scene_rect_set_backdrop_blur(e->indicator_rect, true);
 
 	e->con = con;
 	e->ref_lx = seat->cursor->cursor->x;

sway/tree/container.c

@@ -92,6 +92,7 @@ struct sway_container *container_create(struct sway_view *view) {
 
 	// Container tree structure
 	// - scene tree
+	//   - blur source
 	//   - shadow
 	//   - title bar
 	//     - border
@@ -107,6 +108,8 @@ struct sway_container *container_create(struct sway_view *view) {
 	bool failed = false;
 	c->scene_tree = alloc_scene_tree(root->staging, &failed);
 
+	c->blur = alloc_scene_blur(c->scene_tree, 0, 0, &failed);
+
 	c->shadow = alloc_scene_shadow(c->scene_tree, 0, 0,
 			0, config->shadow_blur_sigma, config->shadow_color, &failed);
 
@@ -303,6 +306,8 @@ void container_update(struct sway_container *con) {
 		sway_text_node_set_background(con->title_bar.marks_text, colors->background);
 	}
 
+	wlr_scene_node_set_enabled(&con->blur->node, con->blur_enabled);
+
 	if (con->dim_rect) {
 		float *color = config->dim_inactive_colors.unfocused;
 

sway/tree/node.c

@@ -206,3 +206,20 @@ struct wlr_scene_shadow *alloc_scene_shadow(struct wlr_scene_tree *parent,
 	return shadow;
 }
 
+struct wlr_scene_blur *alloc_scene_blur(struct wlr_scene_tree *parent,
+		int width, int height, bool *failed) {
+	// fallthrough
+	if (*failed) {
+		return NULL;
+	}
+
+	struct wlr_scene_blur *blur = wlr_scene_blur_create(
+			parent, width, height);
+	if (!blur) {
+		sway_log(SWAY_ERROR, "Failed to allocate a scene node");
+		*failed = true;
+	}
+
+	return blur;
+}
+

sway/tree/view.c

@@ -1233,9 +1233,6 @@ static void view_save_buffer_iterator(struct wlr_scene_buffer *buffer,
 
 	// Set effects to saved views
 	wlr_scene_buffer_set_corner_radius(sbuf, buffer->corner_radius, buffer->corners);
-	wlr_scene_buffer_set_backdrop_blur(sbuf, buffer->backdrop_blur);
-	wlr_scene_buffer_set_backdrop_blur_optimized(sbuf, buffer->backdrop_blur_optimized);
-	wlr_scene_buffer_set_backdrop_blur_ignore_transparent(sbuf, buffer->backdrop_blur_ignore_transparent);
 }
 
 void view_save_buffer(struct sway_view *view) {