fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-01 12:38:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: Refactor output_get_logical_mode/extents helpers

Browse source 
Preparation for later changes.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2095>
(cherry picked from commit a1be2542e0)
This commit is contained in:
Michel Dänzer 2025-10-31 18:53:03 +01:00 • committed by Alan Coopersmith
parent 9303c0dc50
commit 9b6adb97ed
1 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,34 @@ output_handle_mode(void *data, struct wl_output *wl_output, uint32_t flags,
xwl_output->refresh = refresh;
}
static void
output_get_logical_mode(struct xwl_output *xwl_output, int *width, int *height)
{
/* When we have xdg-output support the stored size is already rotated. */
if (xwl_output->xdg_output == NULL ||
(xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180))) {
*width = xwl_output->logical_w;
*height = xwl_output->logical_h;
} else {
*width = xwl_output->logical_h;
*height = xwl_output->logical_w;
}
}
static void
output_get_logical_extents(struct xwl_output *xwl_output, int *width, int *height)
{
/* When we have xdg-output support the stored size is already rotated. */
if (xwl_output->xdg_output ||
(xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180))) {
*width = xwl_output->logical_w;
*height = xwl_output->logical_h;
} else {
*width = xwl_output->logical_h;
*height = xwl_output->logical_w;
}
}
/**
* Decides on the maximum expanse of an output in logical space (i.e. in the
* Wayland compositor plane) respective to some fix width and height values. The
@ -132,15 +160,7 @@ output_get_new_size(struct xwl_output *xwl_output, int *width, int *height)
{
int logical_width, logical_height;
/* When we have xdg-output support the stored size is already rotated. */
if (xwl_output->xdg_output
|| (xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180))) {
logical_width = xwl_output->logical_w;
logical_height = xwl_output->logical_h;
} else {
logical_width = xwl_output->logical_h;
logical_height = xwl_output->logical_w;
}
output_get_logical_extents(xwl_output, &logical_width, &logical_height);
if (*width < xwl_output->logical_x + logical_width)
*width = xwl_output->logical_x + logical_width;
@ -633,17 +653,8 @@ apply_output_change(struct xwl_output *xwl_output)
xwl_output->wl_output_done = FALSE;
xwl_output->xdg_output_done = FALSE;
/* When we have received an xdg-output for the mode size we might need to
* rotate back the stored logical size it provided.
*/
if (xwl_output->xdg_output == NULL
|| xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180)) {
logical_width = xwl_output->logical_w;
logical_height = xwl_output->logical_h;
} else {
logical_width = xwl_output->logical_h;
logical_height = xwl_output->logical_w;
}
output_get_logical_mode(xwl_output, &logical_width, &logical_height);
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);