diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-14 21:12:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 21:12:56 -0400 |
| commit | b47f4f5fd4b8dc3852c5958f3e6ec70de448ff2d (patch) | |
| tree | 90b2a21c3a1cf5e0cdb8ef720081e7acfce64eee /sway/input | |
| parent | 3b92d5bb6dcaf6b8fa9b51d9cf879e68d67ee1fb (diff) | |
| parent | 64d567be9b4a1341bca165f02354e077a2f112fb (diff) | |
Merge pull request #2630 from emersion/wlroots-1243
Update for swaywm/wlroots#1243
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/cursor.c | 4 | ||||
| -rw-r--r-- | sway/input/seat.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index dc66d82d..85951c09 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -807,8 +807,8 @@ void dispatch_cursor_button(struct sway_cursor *cursor, // Handle clicking a layer surface if (surface && wlr_surface_is_layer_surface(surface)) { - struct wlr_layer_surface *layer = - wlr_layer_surface_from_wlr_surface(surface); + struct wlr_layer_surface_v1 *layer = + wlr_layer_surface_v1_from_wlr_surface(surface); if (layer->current.keyboard_interactive) { seat_set_focus_layer(seat, layer); } diff --git a/sway/input/seat.c b/sway/input/seat.c index 8704f90f..ab5047b2 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -769,7 +769,7 @@ void seat_set_focus_surface(struct sway_seat *seat, } void seat_set_focus_layer(struct sway_seat *seat, - struct wlr_layer_surface *layer) { + struct wlr_layer_surface_v1 *layer) { if (!layer && seat->focused_layer) { seat->focused_layer = NULL; struct sway_node *previous = seat_get_focus_inactive(seat, &root->node); |