fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 07:00:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: Take viewport scale into account for the input region

Browse source 
This is necessary because the input region is specified in surface
coordinates.

Fixes: a4ed100c0c ("xwayland: Set wl_surface input region:)
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2071>
This commit is contained in:
Michel Dänzer 2025-09-26 18:26:54 +02:00 • committed by Marge Bot
parent 0ee6039053
commit 66984ab8ae
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hw/xwayland/xwayland-window.c
View file

@ -394,6 +394,7 @@ xwl_window_disable_viewport(struct xwl_window *xwl_window)
xwl_window->viewport = NULL; xwl_window->viewport = NULL;
xwl_window->viewport_scale_x = 1.0; xwl_window->viewport_scale_x = 1.0;
xwl_window->viewport_scale_y = 1.0; xwl_window->viewport_scale_y = 1.0;
xwl_window_set_input_region(xwl_window, wInputShape(xwl_window->toplevel));
} }
/* Enable the viewport for fractional scale support with Xwayland rootful. /* Enable the viewport for fractional scale support with Xwayland rootful.
@ -430,6 +431,7 @@ xwl_window_enable_viewport_for_fractional_scale(struct xwl_window *xwl_window,
xwl_window->viewport_scale_x = scale; xwl_window->viewport_scale_x = scale;
xwl_window->viewport_scale_y = scale; xwl_window->viewport_scale_y = scale;
xwl_window_set_input_region(xwl_window, wInputShape(xwl_window->toplevel));
} }
/* Enable the viewport for Xwayland rootful fullscreen, to match the XRandR /* Enable the viewport for Xwayland rootful fullscreen, to match the XRandR
@ -465,6 +467,7 @@ xwl_window_enable_viewport_for_output(struct xwl_window *xwl_window,
xwl_window->viewport_scale_x = (float) width / xwl_output->width; xwl_window->viewport_scale_x = (float) width / xwl_output->width;
xwl_window->viewport_scale_y = (float) height / xwl_output->height; xwl_window->viewport_scale_y = (float) height / xwl_output->height;
xwl_window_set_input_region(xwl_window, wInputShape(xwl_window->toplevel));
} }
static Bool static Bool
@ -2039,12 +2042,20 @@ xwl_window_set_input_region(struct xwl_window *xwl_window,
region = wl_compositor_create_region(xwl_window->xwl_screen->compositor); region = wl_compositor_create_region(xwl_window->xwl_screen->compositor);
box = RegionRects(input_shape); box = RegionRects(input_shape);
for (i = 0; i < RegionNumRects(input_shape); ++i, ++box) { for (i = 0; i < RegionNumRects(input_shape); ++i) {
wl_region_add(region, BoxRec b = box[i];
box->x1,
box->y1, if (xwl_window->viewport_scale_x != 1.0f) {
box->x2 - box->x1, b.x1 = floorf(b.x1 / xwl_window->viewport_scale_x);
box->y2 - box->y1); b.x2 = ceilf(b.x2 / xwl_window->viewport_scale_x);
}
if (xwl_window->viewport_scale_y != 1.0f) {
b.y1 = floorf(b.y1 / xwl_window->viewport_scale_y);
b.y2 = ceilf(b.y2 / xwl_window->viewport_scale_y);
}
wl_region_add(region, b.x1, b.y1, b.x2 - b.x1, b.y2 - b.y1);
} }
wl_surface_set_input_region(xwl_window->surface, region); wl_surface_set_input_region(xwl_window->surface, region);