diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-19 22:28:02 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-19 22:28:02 +1000 |
commit | 4d743b64d0a8e15f79b0b71fd8b82bb044a6e82b (patch) | |
tree | 60a0dbb15a7ecc160bff46acec7aead1ca06ae54 /sway/input/seat.c | |
parent | Merge pull request #2875 from RedSoxFan/input-device-bindings (diff) | |
download | sway-4d743b64d0a8e15f79b0b71fd8b82bb044a6e82b.tar.gz sway-4d743b64d0a8e15f79b0b71fd8b82bb044a6e82b.tar.zst sway-4d743b64d0a8e15f79b0b71fd8b82bb044a6e82b.zip |
Fix logic used for mouse_warping output
Turns out we don't need to store the previous focus, and it should be
based on which output the cursor was in.
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 08b2e7cf..cffceaae 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -646,7 +646,6 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) { | |||
646 | } | 646 | } |
647 | 647 | ||
648 | struct sway_node *last_focus = seat_get_focus(seat); | 648 | struct sway_node *last_focus = seat_get_focus(seat); |
649 | seat->prev_focus = last_focus; | ||
650 | if (last_focus == node) { | 649 | if (last_focus == node) { |
651 | return; | 650 | return; |
652 | } | 651 | } |
@@ -1190,12 +1189,17 @@ void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec, | |||
1190 | 1189 | ||
1191 | void seat_consider_warp_to_focus(struct sway_seat *seat) { | 1190 | void seat_consider_warp_to_focus(struct sway_seat *seat) { |
1192 | struct sway_node *focus = seat_get_focus(seat); | 1191 | struct sway_node *focus = seat_get_focus(seat); |
1193 | if (config->mouse_warping == WARP_NO || !focus || !seat->prev_focus) { | 1192 | if (config->mouse_warping == WARP_NO || !focus) { |
1194 | return; | 1193 | return; |
1195 | } | 1194 | } |
1196 | if (config->mouse_warping == WARP_OUTPUT && | 1195 | if (config->mouse_warping == WARP_OUTPUT) { |
1197 | node_get_output(focus) == node_get_output(seat->prev_focus)) { | 1196 | struct sway_output *output = node_get_output(focus); |
1198 | return; | 1197 | struct wlr_box box; |
1198 | output_get_box(output, &box); | ||
1199 | if (wlr_box_contains_point(&box, | ||
1200 | seat->cursor->cursor->x, seat->cursor->cursor->y)) { | ||
1201 | return; | ||
1202 | } | ||
1199 | } | 1203 | } |
1200 | 1204 | ||
1201 | if (focus->type == N_CONTAINER) { | 1205 | if (focus->type == N_CONTAINER) { |