diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-31 17:44:49 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-05 18:01:43 +1000 |
| commit | 2aa6afae542b4cc25b48510e46abb82f85aca518 (patch) | |
| tree | ed17118acaf84340d94f75941c3ba64b49a0d397 /sway | |
| parent | 26204441b40591415855d971f87f2bed511ccd7d (diff) | |
Fix mouse_warping
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/input/seat.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 2f7a3318..feb98cd4 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -709,13 +709,20 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, } if (config->mouse_warping && warp && new_output != last_output) { - double x = container->x + container->width / 2.0; - double y = container->y + container->height / 2.0; - if (!wlr_output_layout_contains_point(root->output_layout, - new_output->wlr_output, seat->cursor->cursor->x, - seat->cursor->cursor->y)) { - wlr_cursor_warp(seat->cursor->cursor, NULL, x, y); - cursor_send_pointer_motion(seat->cursor, 0, true); + double x = 0; + double y = 0; + if (container) { + x = container->x + container->width / 2.0; + y = container->y + container->height / 2.0; + } else { + x = new_workspace->x + new_workspace->width / 2.0; + y = new_workspace->y + new_workspace->height / 2.0; + } + if (!wlr_output_layout_contains_point(root->output_layout, + new_output->wlr_output, seat->cursor->cursor->x, + seat->cursor->cursor->y)) { + wlr_cursor_warp(seat->cursor->cursor, NULL, x, y); + cursor_send_pointer_motion(seat->cursor, 0, true); } } } |