frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: Update the scale based on enter/leave events 

Recompute the window scale each time the window enters or leaves an
output.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-By: Kenny Levinsen <kl@kl.wtf>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1197>
This commit is contained in:
Olivier Fourdan 2023-11-02 11:05:55 +01:00
parent 4248bfb0da
commit 290ae87c02
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/xwayland/xwayland-window.c
View File

@ -794,6 +794,12 @@ static const struct xdg_surface_listener xdg_surface_listener = {
xdg_surface_handle_configure, xdg_surface_handle_configure,
}; };
static void
xwl_window_update_surface_scale(struct xwl_window *xwl_window)
{
xwl_window->surface_scale = xwl_window_get_max_output_scale(xwl_window);
}
static void static void
xwl_window_enter_output(struct xwl_window *xwl_window, struct xwl_output *xwl_output) xwl_window_enter_output(struct xwl_window *xwl_window, struct xwl_output *xwl_output)
{ {
@ -828,6 +834,22 @@ xwl_window_free_outputs(struct xwl_window *xwl_window)
} }
} }
int
xwl_window_get_max_output_scale(struct xwl_window *xwl_window)
{
struct xwl_window_output *window_output;
struct xwl_output *xwl_output;
int scale = 1;
xorg_list_for_each_entry(window_output, &xwl_window->xwl_output_list, link) {
xwl_output = window_output->xwl_output;
if (xwl_output->scale > scale)
scale = xwl_output->scale;
}
return scale;
}
static void static void
xwl_window_surface_enter(void *data, xwl_window_surface_enter(void *data,
struct wl_surface *wl_surface, struct wl_surface *wl_surface,
@ -837,8 +859,10 @@ xwl_window_surface_enter(void *data,
struct xwl_screen *xwl_screen = xwl_window->xwl_screen; struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
struct xwl_output *xwl_output = xwl_output_from_wl_output(xwl_screen, wl_output); struct xwl_output *xwl_output = xwl_output_from_wl_output(xwl_screen, wl_output);
if (xwl_output) if (xwl_output) {
xwl_window_enter_output(xwl_window, xwl_output); xwl_window_enter_output(xwl_window, xwl_output);
xwl_window_update_surface_scale(xwl_window);
}
if (xwl_window->wl_output != wl_output) { if (xwl_window->wl_output != wl_output) {
xwl_window->wl_output = wl_output; xwl_window->wl_output = wl_output;
@ -857,8 +881,10 @@ xwl_window_surface_leave(void *data,
struct xwl_screen *xwl_screen = xwl_window->xwl_screen; struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
struct xwl_output *xwl_output = xwl_output_from_wl_output(xwl_screen, wl_output); struct xwl_output *xwl_output = xwl_output_from_wl_output(xwl_screen, wl_output);
if (xwl_output) if (xwl_output) {
xwl_window_leave_output(xwl_window, xwl_output); xwl_window_leave_output(xwl_window, xwl_output);
xwl_window_update_surface_scale(xwl_window);
}
if (xwl_window->wl_output == wl_output) if (xwl_window->wl_output == wl_output)
xwl_window->wl_output = NULL; xwl_window->wl_output = NULL;

2
hw/xwayland/xwayland-window.h
View File

@ -59,6 +59,7 @@ struct xwl_window {
struct wl_surface *surface; struct wl_surface *surface;
struct wp_viewport *viewport; struct wp_viewport *viewport;
float viewport_scale_x, viewport_scale_y; float viewport_scale_x, viewport_scale_y;
int surface_scale;
struct xdg_surface *xdg_surface; struct xdg_surface *xdg_surface;
struct xdg_toplevel *xdg_toplevel; struct xdg_toplevel *xdg_toplevel;
WindowPtr window; WindowPtr window;
@ -100,6 +101,7 @@ void xwl_window_set_window_pixmap(WindowPtr window, PixmapPtr pixmap);
void xwl_window_leave_output(struct xwl_window *xwl_window, void xwl_window_leave_output(struct xwl_window *xwl_window,
struct xwl_output *xwl_output); struct xwl_output *xwl_output);
int xwl_window_get_max_output_scale(struct xwl_window *xwl_window);
Bool xwl_realize_window(WindowPtr window); Bool xwl_realize_window(WindowPtr window);
Bool xwl_unrealize_window(WindowPtr window); Bool xwl_unrealize_window(WindowPtr window);
Bool xwl_change_window_attributes(WindowPtr window, unsigned long mask); Bool xwl_change_window_attributes(WindowPtr window, unsigned long mask);