diff options
| author | Ryan Dwyer <[email protected]> | 2018-10-18 23:08:45 +1000 |
|---|---|---|
| committer | Ryan Dwyer <[email protected]> | 2018-10-18 23:08:45 +1000 |
| commit | 24a90e5d86441fc345356eb3767e5a6880dcedbd (patch) | |
| tree | dbf14c684b7802c2f2876fc8b11636bec26abc3d /sway/input/cursor.c | |
| parent | 103b7bc47d656e91406f5493a3e1317cb9ce5c02 (diff) | |
Remove cursor warping from seat_set_focus
Because cursor warping was the default behaviour in seat_set_focus,
there may be cases where we may have been warping the cursor
unintentionally. This patch removes cursor warping from seat_set_focus
and only does it in the focus command. This is managed by a static
function in focus.c.
To know whether to warp or not, we need to know which node had focus
previously. To keep track of this easily, seat->prev_focus has been
introduced and is set to the previous in seat_set_focus.
Diffstat (limited to 'sway/input/cursor.c')
| -rw-r--r-- | sway/input/cursor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 925190d6..688fc230 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -597,7 +597,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, struct sway_output *focused_output = node_get_output(focus); struct sway_output *output = node_get_output(node); if (output != focused_output) { - seat_set_focus_warp(seat, node, false); + seat_set_focus(seat, node); } } else if (node->type == N_CONTAINER && node->sway_container->view) { // Focus node if the following are true: @@ -607,14 +607,14 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && node != prev_node && view_is_visible(node->sway_container->view)) { - seat_set_focus_warp(seat, node, false); + seat_set_focus(seat, node); } else { struct sway_node *next_focus = seat_get_focus_inactive(seat, &root->node); if (next_focus && next_focus->type == N_CONTAINER && next_focus->sway_container->view && view_is_visible(next_focus->sway_container->view)) { - seat_set_focus_warp(seat, next_focus, false); + seat_set_focus(seat, next_focus); } } } |