fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-03 04:30:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: Add RandR mode for the native resolution if it fits in logical

Browse source 
Always add it as the first mode, which makes it considered the preferred
mode per the RandR protocol.

Mark the logical mode as currently set.

v2:
* Drop change in xwl_window_should_enable_viewport which seems
  unnecessary and coult result in a crash. (Olivier Fourdan)
* Use 'native' instead of 'actual'.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2095>
(cherry picked from commit 288dcb3128)
This commit is contained in:
Michel Dänzer 2022-02-28 18:08:23 +01:00 • committed by Alan Coopersmith
parent 0268f28aea
commit ff641acc65
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
hw/xwayland/xwayland-output.c
View file

@ -375,27 +375,46 @@ output_get_rr_modes(struct xwl_output *xwl_output,
RRModePtr *rr_modes;
int i;
rr_modes = xallocarray(ARRAY_SIZE(xwl_output_fake_modes) + 1, sizeof(RRModePtr));
rr_modes = xallocarray(ARRAY_SIZE(xwl_output_fake_modes) + 2, sizeof(RRModePtr));
if (!rr_modes)
goto err;
/* Add actual output mode */
rr_modes[0] = xwayland_cvt(width, height, xwl_output->refresh / 1000.0, 0, 0);
if (!rr_modes[0])
*count = 0;
if (xwl_screen_has_resolution_change_emulation(xwl_screen) &&
(width > xwl_output->mode_width ||
(width == xwl_output->mode_width && height > xwl_output->mode_height))) {
/* Add native output mode as preferred */
rr_modes[0] = xwayland_cvt(xwl_output->mode_width, xwl_output->mode_height,
xwl_output->refresh / 1000.0, 0, 0);
if (!rr_modes[0])
goto err;
*count = 1;
}
/* Add logical output mode */
rr_modes[*count] = xwayland_cvt(width, height, xwl_output->refresh / 1000.0, 0, 0);
if (!rr_modes[*count])
goto err;
*count = 1;
(*count)++;
if (!xwl_screen_has_resolution_change_emulation(xwl_screen) && !xwl_screen->force_xrandr_emulation)
return rr_modes;
/* Add fake modes */
for (i = 0; i < ARRAY_SIZE(xwl_output_fake_modes); i++) {
/* Skip actual output mode, already added */
/* Skip logical output mode, already added */
if (xwl_output_fake_modes[i][0] == width &&
xwl_output_fake_modes[i][1] == height)
continue;
/* Skip native output mode, already added */
if (xwl_output_fake_modes[i][0] == xwl_output->mode_width &&
xwl_output_fake_modes[i][1] == xwl_output->mode_height)
continue;
/* Skip modes which are too big, avoid downscaling */
if (xwl_output_fake_modes[i][0] > width ||
xwl_output_fake_modes[i][1] > height)
@ -657,6 +676,7 @@ apply_output_change(struct xwl_output *xwl_output)
struct xwl_output *it;
int logical_width, logical_height, count, has_this_output = 0;
RRModePtr *randr_modes;
RRModePtr default_mode;
/* Clear out the "done" received flags */
xwl_output->wl_output_done = FALSE;
@ -667,8 +687,15 @@ apply_output_change(struct xwl_output *xwl_output)
if (xwl_output->randr_output) {
/* Build a fresh modes array using the current refresh rate */
randr_modes = output_get_rr_modes(xwl_output, logical_width, logical_height, &count);
if (randr_modes[0]->mode.width == logical_width &&
randr_modes[0]->mode.height == logical_height)
default_mode = randr_modes[0];
else
default_mode = randr_modes[1];
RROutputSetModes(xwl_output->randr_output, randr_modes, count, 1);
RRCrtcNotify(xwl_output->randr_crtc, randr_modes[0],
RRCrtcNotify(xwl_output->randr_crtc, default_mode,
xwl_output->logical_x, xwl_output->logical_y,
xwl_output->rotation, NULL, 1, &xwl_output->randr_output);
/* RROutputSetModes takes ownership of the passed in modes, so we only