diff options
| author |  Thomas Hebb <tommyhebb@gmail.com> | 2020-05-20 21:20:19 -0400 |
|---|---|---|
| committer |  Simon Ser <contact@emersion.fr> | 2020-06-05 17:24:23 +0200 |
| commit | 84ec8f92a69feb303e0e521f482b75b2cd12c4aa (patch) | |
| tree | 5ae6506ea226bf1e256598f08ca77caf4dfc2d95 /sway/input/cursor.c | |
| parent | Save transform during transaction (diff) | |
| download | sway-84ec8f92a69feb303e0e521f482b75b2cd12c4aa.tar.gz sway-84ec8f92a69feb303e0e521f482b75b2cd12c4aa.tar.zst sway-84ec8f92a69feb303e0e521f482b75b2cd12c4aa.zip | |
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.
Diffstat (limited to 'sway/input/cursor.c')
| -rw-r--r-- | sway/input/cursor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 1a211c3b..8e39dac1 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
| @@ -236,7 +236,7 @@ void cursor_update_image(struct sway_cursor *cursor, | |||
| 236 | static void cursor_hide(struct sway_cursor *cursor) { | 236 | static void cursor_hide(struct sway_cursor *cursor) { |
| 237 | wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0); | 237 | wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0); |
| 238 | cursor->hidden = true; | 238 | cursor->hidden = true; |
| 239 | wlr_seat_pointer_clear_focus(cursor->seat->wlr_seat); | 239 | wlr_seat_pointer_notify_clear_focus(cursor->seat->wlr_seat); |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | static int hide_notify(void *data) { | 242 | static int hide_notify(void *data) { |