diff options
| author |  emersion <contact@emersion.fr> | 2018-09-14 19:21:44 +0200 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-09-14 19:21:44 +0200 |
| commit | 7699c5444c32289a22ce2c57d1daadabed87e7ac (patch) | |
| tree | 74696e6dd2f405e8629061ee010e14e3d6cf0b37 /sway/input | |
| parent | Merge pull request #2628 from RyanDwyer/remove-rejigger-assertion (diff) | |
| download | sway-7699c5444c32289a22ce2c57d1daadabed87e7ac.tar.gz sway-7699c5444c32289a22ce2c57d1daadabed87e7ac.tar.zst sway-7699c5444c32289a22ce2c57d1daadabed87e7ac.zip | |
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, | |||
| 807 | 807 | ||
| 808 | // Handle clicking a layer surface | 808 | // Handle clicking a layer surface |
| 809 | if (surface && wlr_surface_is_layer_surface(surface)) { | 809 | if (surface && wlr_surface_is_layer_surface(surface)) { |
| 810 | struct wlr_layer_surface *layer = | 810 | struct wlr_layer_surface_v1 *layer = |
| 811 | wlr_layer_surface_from_wlr_surface(surface); | 811 | wlr_layer_surface_v1_from_wlr_surface(surface); |
| 812 | if (layer->current.keyboard_interactive) { | 812 | if (layer->current.keyboard_interactive) { |
| 813 | seat_set_focus_layer(seat, layer); | 813 | seat_set_focus_layer(seat, layer); |
| 814 | } | 814 | } |
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, | |||
| 769 | } | 769 | } |
| 770 | 770 | ||
| 771 | void seat_set_focus_layer(struct sway_seat *seat, | 771 | void seat_set_focus_layer(struct sway_seat *seat, |
| 772 | struct wlr_layer_surface *layer) { | 772 | struct wlr_layer_surface_v1 *layer) { |
| 773 | if (!layer && seat->focused_layer) { | 773 | if (!layer && seat->focused_layer) { |
| 774 | seat->focused_layer = NULL; | 774 | seat->focused_layer = NULL; |
| 775 | struct sway_node *previous = seat_get_focus_inactive(seat, &root->node); | 775 | struct sway_node *previous = seat_get_focus_inactive(seat, &root->node); |