From afc8b781d87a490da7d56a76e5a30877face1fc0 Mon Sep 17 00:00:00 2001 From: Ian Forbes Date: Tue, 5 Aug 2025 10:20:00 -0500 Subject: [PATCH] xwayland: Try harder to find a top-level for root grabs The commit referenced below partially resolved an issue with grabs being made on the root window. Unfortunately it assumes that the application uses the same client for all windows. VMware Workstation uses nested windows for each VM, each of which runs its own process with this own client. Theses windows are managed by the GUI which is the top level for the application and maps the windows based on which tab is selected. Because the VM windows issue a grab on the root window and don't share the same client as the GUI, grabs don't work properly with global shortcut inhibition being completely broken. Getting the parent top-level of the nested windows fixes this issue. Fixes: c7730cfe5577 ("xwayland: Translate keyboard grabs on the root window") Signed-off-by: Ian Forbes Part-of: --- hw/xwayland/xwayland-input.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c index de41c7c78..cd2046e1d 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -1605,9 +1605,13 @@ find_toplevel_callback(void *resource, XID id, void *user_data) WindowPtr window = resource; WindowPtr *toplevel = user_data; - /* Pick the first realized toplevel we find */ - if (*toplevel == NullWindow && window->realized && xwl_window_is_toplevel(window)) - *toplevel = window; + while (*toplevel == NullWindow && window) { + /* Pick the first realized toplevel we find */ + if (window->realized && xwl_window_is_toplevel(window)) + *toplevel = window; + else + window = window->parent; + } } static WindowPtr