From 9e07d25a1b933007c403df27fa430a82a2327743 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Mon, 15 May 2017 13:32:01 +0200 Subject: [PATCH] xwm: Don't change focus on focus events from grabs xwm would not let X clients change the focus behind the compositor's back, reverting focus where it's supposed to be when this occurs. However, X11 grab also issue focus in events, on which some clients rely and reverting focus in this case braks the client logic (e.g. combobox menu in gtk+ using the X11 backend). Check if the focus event is actually coming from a grab or ungrab and do not revert focus in this case, to avoid breaking clients logic. Signed-off-by: Olivier Fourdan Tested-by: Pekka Paalanen Acked-by: Pekka Paalanen Acked-by: Daniel Stone Acked-by: Quentin Glidic --- xwayland/window-manager.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index 26080759..25008539 100644 --- a/xwayland/window-manager.c +++ b/xwayland/window-manager.c @@ -2055,6 +2055,12 @@ static void weston_wm_handle_focus_in(struct weston_wm *wm, xcb_generic_event_t *event) { xcb_focus_in_event_t *focus = (xcb_focus_in_event_t *) event; + + /* Do not interfere with grabs */ + if (focus->mode == XCB_NOTIFY_MODE_GRAB || + focus->mode == XCB_NOTIFY_MODE_UNGRAB) + return; + /* Do not let X clients change the focus behind the compositor's * back. Reset the focus to the old one if it changed. */ if (!wm->focus_window || focus->event != wm->focus_window->id)