From d88782bf41760d0476c9fe98a66c22cdbde7c8e9 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Tue, 19 Mar 2024 12:56:45 +0200 Subject: [PATCH] frontend/man: Use 'clone-of' instead of 'same-as' Rather than using the same key entry for the DRM backend to cloned outputs, rename to 'clone-of'. This means that ini configuration files will break after this change, but this should be documented with the next Weston release. Signed-off-by: Marius Vlad --- frontend/main.c | 22 +++++++++++----------- man/weston-drm.man | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/main.c b/frontend/main.c index 80bb9b8b..0ac42282 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -2271,8 +2271,8 @@ drm_backend_output_configure(struct weston_output *output, /* Find the output section to use for configuring the output with the * named head. If an output section with the given name contains - * a "same-as" key, ignore all other settings in the output section and - * instead find an output section named by the "same-as". Do this + * a "clone-of" key, ignore all other settings in the output section and + * instead find an output section named by the "clone-of". Do this * recursively. */ static struct weston_config_section * @@ -2280,33 +2280,33 @@ drm_config_find_controlling_output_section(struct weston_config *config, const char *head_name) { struct weston_config_section *section; - char *same_as; + char *clone_of; int depth = 0; - same_as = strdup(head_name); + clone_of = strdup(head_name); do { section = weston_config_get_section(config, "output", - "name", same_as); + "name", clone_of); if (!section && depth > 0) weston_log("Configuration error: " "output section referred to with " - "'same-as=%s' not found.\n", same_as); + "'clone-of=%s' not found.\n", clone_of); - free(same_as); + free(clone_of); if (!section) return NULL; if (++depth > 10) { weston_log("Configuration error: " - "'same-as' nested too deep for output '%s'.\n", + "'clone-of' nested too deep for output '%s'.\n", head_name); return NULL; } - weston_config_section_get_string(section, "same-as", - &same_as, NULL); - } while (same_as); + weston_config_section_get_string(section, "clone-of", + &clone_of, NULL); + } while (clone_of); return section; } diff --git a/man/weston-drm.man b/man/weston-drm.man index 52a78c41..bfa91a7b 100644 --- a/man/weston-drm.man +++ b/man/weston-drm.man @@ -149,7 +149,7 @@ Set the DRM KMS framebuffer format for this specific output. If not set, If using the Pixman-renderer, use shadow framebuffers. Defaults to .BR true . .TP -\fBsame-as\fR=\fIname\fR +\fBclone-of\fR=\fIname\fR Make this output (connector) a clone of another. The argument .IR name " is the " .BR name " value of another output section. The