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

xwayland: Remove unnecessary xwl_window_is_toplevel() check from xwl_output_set_window_randr_emu_props() 

Since the recent fix to call xwl_output_set_window_randr_emu_props() from
ensure_surface_for_window(), it is now only called on a toplevel window,
so the is-toplevel check is not necessary for the
xwl_output_set_window_randr_emu_props() case.

This commit moves the check to xwl_output_set_randr_emu_prop_callback()
so that we only do it when we are walking over all Windows of a client
to update the property on a change of the emulated resolution.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2019-11-04 15:01:18 +01:00
parent 148f428dfc
commit d4faab8708
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,9 +472,6 @@ static void
xwl_output_set_randr_emu_prop(WindowPtr window, xwl_output_set_randr_emu_prop(WindowPtr window,
struct xwl_output_randr_emu_prop *prop) struct xwl_output_randr_emu_prop *prop)
{ {
if (!xwl_window_is_toplevel(window))
return;
if (prop->rect_count) { if (prop->rect_count) {
dixChangeWindowProperty(serverClient, window, prop->atom, dixChangeWindowProperty(serverClient, window, prop->atom,
XA_CARDINAL, 32, PropModeReplace, XA_CARDINAL, 32, PropModeReplace,
@ -487,6 +484,7 @@ xwl_output_set_randr_emu_prop(WindowPtr window,
static void static void
xwl_output_set_randr_emu_prop_callback(void *resource, XID id, void *user_data) xwl_output_set_randr_emu_prop_callback(void *resource, XID id, void *user_data)
{ {
if (xwl_window_is_toplevel(resource))
xwl_output_set_randr_emu_prop(resource, user_data); xwl_output_set_randr_emu_prop(resource, user_data);
} }