77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From 049333a0ecf8574a0612bf27850f9682f0f70533 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 4 Nov 2019 14:32:29 +0100
|
|
Subject: [PATCH xserver 23/25] xwayland: Fix setting of
|
|
_XWAYLAND_RANDR_EMU_MONITOR_RECTS prop on new windows
|
|
|
|
For window-manager managed windows, xwl_realize_window is only called for
|
|
the window-manager's decoration window and not for the actual client window
|
|
on which we should set the _XWAYLAND_RANDR_EMU_MONITOR_RECTS prop.
|
|
|
|
Usualy this is not a problem since we walk all client windows to update
|
|
the property when the resolution is changed through a randr call.
|
|
|
|
But for apps which first do the randr change and only then create their
|
|
window this does not work, and our xwl_output_set_window_randr_emu_props
|
|
call in xwl_realize_window is a no-op as that is only called for the wm
|
|
decoration window and not for the actual client's window.
|
|
|
|
This commit fixes this by making ensure_surface_for_window() call
|
|
xwl_output_set_window_randr_emu_props on the first and only child of
|
|
window-manager managed windows.
|
|
|
|
Note this also removes the non-functional xwl_output_set_window_randr_emu_props
|
|
call from xwl_realize_window, which was intended to do this, but does not
|
|
work.
|
|
|
|
This fixes apps using the ogre3d library always running at the
|
|
monitors native resolution.
|
|
|
|
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
(cherry picked from commit 148f428dfccf606b932a00d5a00af06e8dca8a7e)
|
|
---
|
|
hw/xwayland/xwayland.c | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
|
|
index 5bb7a68e9..1600c00cd 100644
|
|
--- a/hw/xwayland/xwayland.c
|
|
+++ b/hw/xwayland/xwayland.c
|
|
@@ -738,6 +738,7 @@ ensure_surface_for_window(WindowPtr window)
|
|
struct xwl_screen *xwl_screen;
|
|
struct xwl_window *xwl_window;
|
|
struct wl_region *region;
|
|
+ WindowPtr toplevel;
|
|
|
|
if (xwl_window_from_window(window))
|
|
return TRUE;
|
|
@@ -808,7 +809,14 @@ ensure_surface_for_window(WindowPtr window)
|
|
|
|
xwl_window_init_allow_commits(xwl_window);
|
|
|
|
- if (!window_is_wm_window(window)) {
|
|
+ /* When a new window-manager window is realized, then the randr emulation
|
|
+ * props may have not been set on the managed client window yet.
|
|
+ */
|
|
+ if (window_is_wm_window(window)) {
|
|
+ toplevel = window_get_client_toplevel(window);
|
|
+ if (toplevel)
|
|
+ xwl_output_set_window_randr_emu_props(xwl_screen, toplevel);
|
|
+ } else {
|
|
/* CSD or O-R toplevel window, check viewport on creation */
|
|
xwl_window_check_resolution_change_emulation(xwl_window);
|
|
}
|
|
@@ -857,8 +865,6 @@ xwl_realize_window(WindowPtr window)
|
|
return FALSE;
|
|
}
|
|
|
|
- xwl_output_set_window_randr_emu_props(xwl_screen, window);
|
|
-
|
|
return ensure_surface_for_window(window);
|
|
}
|
|
|
|
--
|
|
2.28.0
|
|
|