From 84ec8f92a69feb303e0e521f482b75b2cd12c4aa Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Wed, 20 May 2020 21:20:19 -0400 Subject: Use new wlroots API for clearing keyboard/pointer focus during grabs We are not allowed to do what we did in #5222 and pass a `NULL` surface wlr_seat_pointer_notify_enter(), and it's causing crashes when an xdg-shell popup is active (see #5294 and swaywm/wlroots#2161). Instead, solve #5220 using the new wlroots API introduced in swaywm/wlroots#2217. --- sway/config/output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/config') diff --git a/sway/config/output.c b/sway/config/output.c index 5aaa4d93..713cd219 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -645,7 +645,7 @@ void apply_output_config_to_outputs(struct output_config *oc) { struct sway_seat *seat; wl_list_for_each(seat, &server.input->seats, link) { - wlr_seat_pointer_clear_focus(seat->wlr_seat); + wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); cursor_rebase(seat->cursor); } } -- cgit v1.2.3