mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2024-03-19 12:56:45 +02:00 committed by Derek Foreman
parent bb6abf3c33
commit d88782bf41
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/main.c
View File

@ -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;
}

2
man/weston-drm.man
View File

@ -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