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

xwayland: update_screen_size() takes a screen argument 

update_screen_size() takes an xwl_output argument, mostly for historical
reasons, whereas it actually applies to a screen (as its name implies).

Reshuffle the code to take an xwl_screen instead, in preparation for
the geometry mode in Xwayland - No functional change.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Olivier Fourdan 2022-04-27 14:34:37 +02:00
parent eae3c06c23
commit 5cc0319ca5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xwayland/xwayland-output.c
View File

@ -180,10 +180,8 @@ update_backing_pixmaps(struct xwl_screen *xwl_screen, int width, int height)
} }
static void static void
update_screen_size(struct xwl_output *xwl_output, int width, int height) update_screen_size(struct xwl_screen *xwl_screen, int width, int height)
{ {
struct xwl_screen *xwl_screen = xwl_output->xwl_screen;
if (xwl_screen->root_clip_mode == ROOT_CLIP_FULL) if (xwl_screen->root_clip_mode == ROOT_CLIP_FULL)
SetRootClip(xwl_screen->screen, ROOT_CLIP_NONE); SetRootClip(xwl_screen->screen, ROOT_CLIP_NONE);
@ -645,7 +643,7 @@ apply_output_change(struct xwl_output *xwl_output)
--xwl_screen->expecting_event; --xwl_screen->expecting_event;
} }
update_screen_size(xwl_output, width, height); update_screen_size(xwl_screen, width, height);
} }
static void static void
@ -837,7 +835,7 @@ xwl_output_remove(struct xwl_output *xwl_output)
xorg_list_for_each_entry(it, &xwl_screen->output_list, link) xorg_list_for_each_entry(it, &xwl_screen->output_list, link)
output_get_new_size(it, &width, &height); output_get_new_size(it, &width, &height);
update_screen_size(xwl_output, width, height); update_screen_size(xwl_screen, width, height);
RRCrtcDestroy(xwl_output->randr_crtc); RRCrtcDestroy(xwl_output->randr_crtc);
RROutputDestroy(xwl_output->randr_output); RROutputDestroy(xwl_output->randr_output);