overlay: allow to draw both/either of filled/outlined rectangle

Filled/outlined rectangles shown as snapping overlay are now enabled/disabled
independently with `snapping.overlay.[region|edge].bg.enabled` and
`snapping.overlay.[region|edge].border.enabled`.

To keep the default behavior, `*.bg.enabled` is yes and `*.border.enabled` is
no for hardware-based renderers, while `*.bg.enabled` is no and
`*.border.enabled` is yes for software-based (pixman) renderer.

Users can now use a filled rectangle as an overlay even with pixman renderer.
However, this may severely impact performance when used with translucent
`snapping.overlay.[region|edge].bg.color`.

This commit includes a refactor to use substruct `theme_snapping_overlay`
inside `theme` in order to pass it to `create_overlay_rect()` in a cleaner way.

Breaking changes is:
- `snapping.overlay.[region|edge].fill` is now removed.

src/debug.c

@@ -138,13 +138,13 @@ get_special(struct server *server, struct wlr_scene_node *node)
 	if (node == &server->seat.drag.icons->node) {
 		return "seat->drag.icons";
 	}
-	if (server->seat.overlay.region_rect.node
-			&& node == server->seat.overlay.region_rect.node) {
+	if (server->seat.overlay.region_rect.tree
+			&& node == &server->seat.overlay.region_rect.tree->node) {
 		/* Created on-demand */
 		return "seat->overlay.region_rect";
 	}
-	if (server->seat.overlay.edge_rect.node
-			&& node == server->seat.overlay.edge_rect.node) {
+	if (server->seat.overlay.edge_rect.tree
+			&& node == &server->seat.overlay.edge_rect.tree->node) {
 		/* Created on-demand */
 		return "seat->overlay.edge_rect";
 	}
@@ -219,17 +219,23 @@ dump_tree(struct server *server, struct wlr_scene_node *node,
 	}
 	printf("%.*s %*c %4d  %4d  [%p]\n", max_width - 1, type, padding, ' ', x, y, node);
 
+	struct multi_rect *osd_preview_outline =
+		server->osd_state.preview_outline;
+	struct multi_rect *region_snapping_overlay_outline =
+		server->seat.overlay.region_rect.border_rect;
+	struct multi_rect *edge_snapping_overlay_outline =
+		server->seat.overlay.edge_rect.border_rect;
 	if ((IGNORE_MENU && node == &server->menu_tree->node)
 			|| (IGNORE_SSD && last_view
 				&& ssd_debug_is_root_node(last_view->ssd, node))
-			|| (IGNORE_OSD_PREVIEW_OUTLINE && server->osd_state.preview_outline
-				&& node == &server->osd_state.preview_outline->tree->node)
-			|| (IGNORE_SNAPPING_PREVIEW_OUTLINE && server->seat.overlay.region_rect.node
-				&& !server->seat.overlay.region_rect.fill
-				&& node == server->seat.overlay.region_rect.node)
-			|| (IGNORE_SNAPPING_PREVIEW_OUTLINE && server->seat.overlay.edge_rect.node
-				&& !server->seat.overlay.edge_rect.fill
-				&& node == server->seat.overlay.edge_rect.node)) {
+			|| (IGNORE_OSD_PREVIEW_OUTLINE && osd_preview_outline
+				&& node == &osd_preview_outline->tree->node)
+			|| (IGNORE_SNAPPING_PREVIEW_OUTLINE
+				&& region_snapping_overlay_outline
+				&& node == &region_snapping_overlay_outline->tree->node)
+			|| (IGNORE_SNAPPING_PREVIEW_OUTLINE
+				&& edge_snapping_overlay_outline
+				&& node == &edge_snapping_overlay_outline->tree->node)) {
 		printf("%*c%s\n", pos + 4 + INDENT_SIZE, ' ', "<skipping children>");
 		return;
 	}

src/main.c

@@ -171,7 +171,7 @@ main(int argc, char *argv[])
 	server_start(&server);
 
 	struct theme theme = { 0 };
-	theme_init(&theme, rc.theme_name);
+	theme_init(&theme, &server, rc.theme_name);
 	rc.theme = &theme;
 	server.theme = &theme;
 

src/overlay.c

@@ -1,62 +1,54 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
-#include <wlr/render/pixman.h>
 #include "labwc.h"
 #include "overlay.h"
 #include "view.h"
+#include "theme.h"
 
 static void
-create_overlay_rect(struct seat *seat, struct overlay_rect *rect, int fill,
-		float bg_color[4], int border_width, float border_colors[3][4])
+create_overlay_rect(struct seat *seat, struct overlay_rect *rect,
+		struct theme_snapping_overlay *theme)
 {
 	struct server *server = seat->server;
 
-	rect->fill = fill;
-	/* For pixman renderer, always render outlines to save CPU resource */
-	if (wlr_renderer_is_pixman(server->renderer)) {
-		rect->fill = false;
+	rect->bg_enabled = theme->bg_enabled;
+	rect->border_enabled = theme->border_enabled;
+	rect->tree = wlr_scene_tree_create(&server->scene->tree);
+
+	if (rect->bg_enabled) {
+		/* Create a filled rectangle */
+		rect->bg_rect = wlr_scene_rect_create(
+			rect->tree, 0, 0, theme->bg_color);
 	}
 
-	if (rect->fill) {
-		/* Create a filled rectangle */
-		rect->scene_rect = wlr_scene_rect_create(&server->scene->tree,
-			0, 0, bg_color);
-		rect->node = &rect->scene_rect->node;
-	} else {
+	if (rect->border_enabled) {
 		/* Create outlines */
 		float *colors[3] = {
-			border_colors[0],
-			border_colors[1],
-			border_colors[2],
+			theme->border_color[0],
+			theme->border_color[1],
+			theme->border_color[2],
 		};
-		rect->pixman_rect = multi_rect_create(&server->scene->tree,
-			colors, border_width);
-		rect->node = &rect->pixman_rect->tree->node;
+		rect->border_rect = multi_rect_create(
+			rect->tree, colors, theme->border_width);
 	}
 
-	wlr_scene_node_set_enabled(rect->node, false);
+	wlr_scene_node_set_enabled(&rect->tree->node, false);
 }
 
 void overlay_reconfigure(struct seat *seat)
 {
-	if (seat->overlay.region_rect.node) {
-		wlr_scene_node_destroy(seat->overlay.region_rect.node);
+	if (seat->overlay.region_rect.tree) {
+		wlr_scene_node_destroy(&seat->overlay.region_rect.tree->node);
 	}
-	if (seat->overlay.edge_rect.node) {
-		wlr_scene_node_destroy(seat->overlay.edge_rect.node);
+	if (seat->overlay.edge_rect.tree) {
+		wlr_scene_node_destroy(&seat->overlay.edge_rect.tree->node);
 	}
 
 	struct theme *theme = seat->server->theme;
 	create_overlay_rect(seat, &seat->overlay.region_rect,
-		theme->snapping_overlay_region_fill,
-		theme->snapping_overlay_region_bg_color,
-		theme->snapping_overlay_region_border_width,
-		theme->snapping_overlay_region_border_color);
+		&theme->snapping_overlay_region);
 	create_overlay_rect(seat, &seat->overlay.edge_rect,
-		theme->snapping_overlay_edge_fill,
-		theme->snapping_overlay_edge_bg_color,
-		theme->snapping_overlay_edge_border_width,
-		theme->snapping_overlay_edge_border_color);
+		&theme->snapping_overlay_edge);
 }
 
 static void
@@ -65,20 +57,20 @@ show_overlay(struct seat *seat, struct overlay_rect *rect, struct wlr_box *box)
 	struct server *server = seat->server;
 	struct view *view = server->grabbed_view;
 	assert(view);
-	struct wlr_scene_node *node = rect->node;
 
-	if (!node) {
+	if (!rect->tree) {
 		overlay_reconfigure(seat);
-		node = rect->node;
-		assert(node);
+		assert(rect->tree);
 	}
 
-	if (rect->fill) {
-		wlr_scene_rect_set_size(rect->scene_rect, box->width, box->height);
-	} else {
-		multi_rect_set_size(rect->pixman_rect, box->width, box->height);
+	if (rect->bg_enabled) {
+		wlr_scene_rect_set_size(rect->bg_rect, box->width, box->height);
+	}
+	if (rect->border_enabled) {
+		multi_rect_set_size(rect->border_rect, box->width, box->height);
 	}
 
+	struct wlr_scene_node *node = &rect->tree->node;
 	wlr_scene_node_reparent(node, view->scene_tree->node.parent);
 	wlr_scene_node_place_below(node, &view->scene_tree->node);
 	wlr_scene_node_set_position(node, box->x, box->y);
@@ -88,13 +80,13 @@ show_overlay(struct seat *seat, struct overlay_rect *rect, struct wlr_box *box)
 static void
 inactivate_overlay(struct overlay *overlay)
 {
-	if (overlay->region_rect.node) {
+	if (overlay->region_rect.tree) {
 		wlr_scene_node_set_enabled(
-			overlay->region_rect.node, false);
+			&overlay->region_rect.tree->node, false);
 	}
-	if (overlay->edge_rect.node) {
+	if (overlay->edge_rect.tree) {
 		wlr_scene_node_set_enabled(
-			overlay->edge_rect.node, false);
+			&overlay->edge_rect.tree->node, false);
 	}
 	overlay->active.region = NULL;
 	overlay->active.edge = VIEW_EDGE_INVALID;
@@ -259,12 +251,12 @@ overlay_hide(struct seat *seat)
 	 * Reparent the rectangle nodes to server's scene-tree so they don't
 	 * get destroyed on view destruction
 	 */
-	if (overlay->region_rect.node) {
-		wlr_scene_node_reparent(overlay->region_rect.node,
+	if (overlay->region_rect.tree) {
+		wlr_scene_node_reparent(&overlay->region_rect.tree->node,
 			&server->scene->tree);
 	}
-	if (overlay->edge_rect.node) {
-		wlr_scene_node_reparent(overlay->edge_rect.node,
+	if (overlay->edge_rect.tree) {
+		wlr_scene_node_reparent(&overlay->edge_rect.tree->node,
 			&server->scene->tree);
 	}
 }

src/server.c

@@ -51,7 +51,7 @@ reload_config_and_theme(struct server *server)
 	rcxml_finish();
 	rcxml_read(rc.config_file);
 	theme_finish(server->theme);
-	theme_init(server->theme, rc.theme_name);
+	theme_init(server->theme, server, rc.theme_name);
 
 	struct view *view;
 	wl_list_for_each(view, &server->views, link) {

src/theme.c

@@ -17,6 +17,7 @@
 #include <string.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
+#include <wlr/render/pixman.h>
 #include <strings.h>
 #include "common/macros.h"
 #include "common/dir.h"
@@ -28,6 +29,7 @@
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
 #include "button/button-png.h"
+#include "labwc.h"
 
 #if HAVE_RSVG
 #include "button/button-svg.h"
@@ -463,7 +465,7 @@ parse_justification(const char *str)
  * theme_builtin() applies a theme that is similar to vanilla GTK
  */
 static void
-theme_builtin(struct theme *theme)
+theme_builtin(struct theme *theme, struct server *server)
 {
 	theme->border_width = 1;
 	theme->padding_height = 3;
@@ -538,21 +540,31 @@ theme_builtin(struct theme *theme)
 	theme->osd_border_color[0] = FLT_MIN;
 	theme->osd_label_text_color[0] = FLT_MIN;
 
-	theme->snapping_overlay_region_fill = true;
-	theme->snapping_overlay_edge_fill = true;
+	if (wlr_renderer_is_pixman(server->renderer)) {
+		/* Draw only outlined overlay by default to save CPU resource */
+		theme->snapping_overlay_region.bg_enabled = false;
+		theme->snapping_overlay_edge.bg_enabled = false;
+		theme->snapping_overlay_region.border_enabled = true;
+		theme->snapping_overlay_edge.border_enabled = true;
+	} else {
+		theme->snapping_overlay_region.bg_enabled = true;
+		theme->snapping_overlay_edge.bg_enabled = true;
+		theme->snapping_overlay_region.border_enabled = false;
+		theme->snapping_overlay_edge.border_enabled = false;
+	}
 
-	parse_hexstr("#8080b380", theme->snapping_overlay_region_bg_color);
-	parse_hexstr("#8080b380", theme->snapping_overlay_edge_bg_color);
+	parse_hexstr("#8080b380", theme->snapping_overlay_region.bg_color);
+	parse_hexstr("#8080b380", theme->snapping_overlay_edge.bg_color);
 
 	/* inherit settings in post_processing() if not set elsewhere */
-	theme->snapping_overlay_region_border_width = INT_MIN;
-	theme->snapping_overlay_edge_border_width = INT_MIN;
-	memset(theme->snapping_overlay_region_border_color, 0,
-		sizeof(theme->snapping_overlay_region_border_color));
-	theme->snapping_overlay_region_border_color[0][0] = FLT_MIN;
-	memset(theme->snapping_overlay_edge_border_color, 0,
-		sizeof(theme->snapping_overlay_edge_border_color));
-	theme->snapping_overlay_edge_border_color[0][0] = FLT_MIN;
+	theme->snapping_overlay_region.border_width = INT_MIN;
+	theme->snapping_overlay_edge.border_width = INT_MIN;
+	memset(theme->snapping_overlay_region.border_color, 0,
+		sizeof(theme->snapping_overlay_region.border_color));
+	theme->snapping_overlay_region.border_color[0][0] = FLT_MIN;
+	memset(theme->snapping_overlay_edge.border_color, 0,
+		sizeof(theme->snapping_overlay_edge.border_color));
+	theme->snapping_overlay_edge.border_color[0][0] = FLT_MIN;
 }
 
 static void
@@ -754,29 +766,35 @@ entry(struct theme *theme, const char *key, const char *value)
 	if (match_glob(key, "osd.label.text.color")) {
 		parse_hexstr(value, theme->osd_label_text_color);
 	}
-	if (match_glob(key, "snapping.overlay.region.fill")) {
-		theme->snapping_overlay_region_fill = parse_bool(value, true);
+	if (match_glob(key, "snapping.overlay.region.bg.enabled")) {
+		set_bool(value, &theme->snapping_overlay_region.bg_enabled);
 	}
-	if (match_glob(key, "snapping.overlay.edge.fill")) {
-		theme->snapping_overlay_edge_fill = parse_bool(value, true);
+	if (match_glob(key, "snapping.overlay.edge.bg.enabled")) {
+		set_bool(value, &theme->snapping_overlay_edge.bg_enabled);
+	}
+	if (match_glob(key, "snapping.overlay.region.border.enabled")) {
+		set_bool(value, &theme->snapping_overlay_region.border_enabled);
+	}
+	if (match_glob(key, "snapping.overlay.edge.border.enabled")) {
+		set_bool(value, &theme->snapping_overlay_edge.border_enabled);
 	}
 	if (match_glob(key, "snapping.overlay.region.bg.color")) {
-		parse_hexstr(value, theme->snapping_overlay_region_bg_color);
+		parse_hexstr(value, theme->snapping_overlay_region.bg_color);
 	}
 	if (match_glob(key, "snapping.overlay.edge.bg.color")) {
-		parse_hexstr(value, theme->snapping_overlay_edge_bg_color);
+		parse_hexstr(value, theme->snapping_overlay_edge.bg_color);
 	}
 	if (match_glob(key, "snapping.overlay.region.border.width")) {
-		theme->snapping_overlay_region_border_width = atoi(value);
+		theme->snapping_overlay_region.border_width = atoi(value);
 	}
 	if (match_glob(key, "snapping.overlay.edge.border.width")) {
-		theme->snapping_overlay_edge_border_width = atoi(value);
+		theme->snapping_overlay_edge.border_width = atoi(value);
 	}
 	if (match_glob(key, "snapping.overlay.region.border.color")) {
-		parse_hexstrs(value, theme->snapping_overlay_region_border_color);
+		parse_hexstrs(value, theme->snapping_overlay_region.border_color);
 	}
 	if (match_glob(key, "snapping.overlay.edge.border.color")) {
-		parse_hexstrs(value, theme->snapping_overlay_edge_border_color);
+		parse_hexstrs(value, theme->snapping_overlay_edge.border_color);
 	}
 }
 
@@ -1113,32 +1131,32 @@ post_processing(struct theme *theme)
 			theme->osd_window_switcher_preview_border_color);
 	}
 
-	if (theme->snapping_overlay_region_border_width == INT_MIN) {
-		theme->snapping_overlay_region_border_width =
+	if (theme->snapping_overlay_region.border_width == INT_MIN) {
+		theme->snapping_overlay_region.border_width =
 			theme->osd_border_width;
 	}
-	if (theme->snapping_overlay_edge_border_width == INT_MIN) {
-		theme->snapping_overlay_edge_border_width =
+	if (theme->snapping_overlay_edge.border_width == INT_MIN) {
+		theme->snapping_overlay_edge.border_width =
 			theme->osd_border_width;
 	}
-	if (theme->snapping_overlay_region_border_color[0][0] == FLT_MIN) {
+	if (theme->snapping_overlay_region.border_color[0][0] == FLT_MIN) {
 		fill_colors_with_osd_theme(theme,
-			theme->snapping_overlay_region_border_color);
+			theme->snapping_overlay_region.border_color);
 	}
-	if (theme->snapping_overlay_edge_border_color[0][0] == FLT_MIN) {
+	if (theme->snapping_overlay_edge.border_color[0][0] == FLT_MIN) {
 		fill_colors_with_osd_theme(theme,
-			theme->snapping_overlay_edge_border_color);
+			theme->snapping_overlay_edge.border_color);
 	}
 }
 
 void
-theme_init(struct theme *theme, const char *theme_name)
+theme_init(struct theme *theme, struct server *server, const char *theme_name)
 {
 	/*
 	 * Set some default values. This is particularly important on
 	 * reconfigure as not all themes set all options
 	 */
-	theme_builtin(theme);
+	theme_builtin(theme, server);
 
 	/* Read <data-dir>/share/themes/$theme_name/openbox-3/themerc */
 	struct wl_list paths;