marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11.drv: Change slave to a more neutral word. 

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
André Hentschel 2020-06-18 13:34:27 +02:00 committed by Alexandre Julliard
parent d593be3b4c
commit 9f974579b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/winex11.drv/xrandr.c
View File

@ -948,7 +948,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new
if (!output_info->crtc || !crtc_info->mode) if (!output_info->crtc || !crtc_info->mode)
detached = TRUE; detached = TRUE;
/* Ignore mirroring output slaves because mirrored monitors are under the same adapter */ /* Ignore mirroring output replicas because mirrored monitors are under the same adapter */
mirrored = FALSE; mirrored = FALSE;
if (!detached) if (!detached)
{ {
@ -970,7 +970,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new
continue; continue;
/* Some outputs may have the same coordinates, aka mirrored. Choose the output with /* Some outputs may have the same coordinates, aka mirrored. Choose the output with
* the lowest value as primary and the rest will then be slaves in a mirroring set */ * the lowest value as primary and the rest will then be replicas in a mirroring set */
if (crtc_info->x == enum_crtc_info->x && if (crtc_info->x == enum_crtc_info->x &&
crtc_info->y == enum_crtc_info->y && crtc_info->y == enum_crtc_info->y &&
crtc_info->width == enum_crtc_info->width && crtc_info->width == enum_crtc_info->width &&
@ -1079,7 +1079,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor *
goto done; goto done;
} }
/* Inactive but attached monitor, no need to check for mirrored/slave monitors */ /* Inactive but attached monitor, no need to check for mirrored/replica monitors */
if (!output_info->crtc || !crtc_info->mode) if (!output_info->crtc || !crtc_info->mode)
{ {
lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW );