xserver: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Nov 9 09:58:51 UTC 2020
hw/xwayland/xwayland-window.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit df3aa4922fd7e256169e541188b724f67ca948e1
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Fri Nov 6 10:14:19 2020 +0100
xwayland: Make window_get_client_toplevel non-recursive
Noticed while reading the code.
Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index d03790633..486149c4a 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -257,11 +257,11 @@ window_get_client_toplevel(WindowPtr window)
* decoration/wrapper windows. In that case recurse by checking the client
* of the first *and only* child of the decoration/wrapper window.
*/
- if (window_is_wm_window(window)) {
- if (window->firstChild && window->firstChild == window->lastChild)
- return window_get_client_toplevel(window->firstChild);
- else
+ while (window_is_wm_window(window)) {
+ if (!window->firstChild || window->firstChild != window->lastChild)
return NULL; /* Should never happen, skip resolution emulation */
+
+ window = window->firstChild;
}
return window;
More information about the xorg-commit
mailing list