blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: send focus change event unconditionally 

This fixes issues with (at least) dialogs in Jetbrains IDEs becoming
unclickable if they ever lost focus (ref. swaywm/sway#5373). Prior to
this change, since `xwm->focus_surface` would be set prior to
`xwm_surface_activate` being called, the latter would short-circuit
immediately and not notify the application of the focus change.
This commit is contained in:
Tudor Brindus 2020-05-23 10:41:20 -04:00 committed by Simon Ser
parent 5c942bd597
commit 0758a4fc9d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xwayland/xwm.c
View File

@ -1243,12 +1243,12 @@ static void xwm_handle_focus_in(struct wlr_xwm *xwm,
// Because of that, we allow changing focus between surfaces belonging to the // Because of that, we allow changing focus between surfaces belonging to the
// same application. // same application.
struct wlr_xwayland_surface *requested_focus = lookup_surface(xwm, ev->event); struct wlr_xwayland_surface *requested_focus = lookup_surface(xwm, ev->event);
if (!xwm->focus_surface || !requested_focus || if (xwm->focus_surface && requested_focus &&
requested_focus->pid != xwm->focus_surface->pid) { requested_focus->pid == xwm->focus_surface->pid) {
xwm_send_focus_window(xwm, xwm->focus_surface);
} else {
xwm->focus_surface = requested_focus; xwm->focus_surface = requested_focus;
} }
xwm_send_focus_window(xwm, xwm->focus_surface);
} }
static void xwm_handle_xcb_error(struct wlr_xwm *xwm, xcb_value_error_t *ev) { static void xwm_handle_xcb_error(struct wlr_xwm *xwm, xcb_value_error_t *ev) {