diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-18 23:08:45 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-18 23:08:45 +1000 |
commit | 24a90e5d86441fc345356eb3767e5a6880dcedbd (patch) | |
tree | dbf14c684b7802c2f2876fc8b11636bec26abc3d /sway/input/cursor.c | |
parent | Merge pull request #2868 from emersion/xcursor-env (diff) | |
download | sway-24a90e5d86441fc345356eb3767e5a6880dcedbd.tar.gz sway-24a90e5d86441fc345356eb3767e5a6880dcedbd.tar.zst sway-24a90e5d86441fc345356eb3767e5a6880dcedbd.zip |
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, | |||
597 | struct sway_output *focused_output = node_get_output(focus); | 597 | struct sway_output *focused_output = node_get_output(focus); |
598 | struct sway_output *output = node_get_output(node); | 598 | struct sway_output *output = node_get_output(node); |
599 | if (output != focused_output) { | 599 | if (output != focused_output) { |
600 | seat_set_focus_warp(seat, node, false); | 600 | seat_set_focus(seat, node); |
601 | } | 601 | } |
602 | } else if (node->type == N_CONTAINER && node->sway_container->view) { | 602 | } else if (node->type == N_CONTAINER && node->sway_container->view) { |
603 | // Focus node if the following are true: | 603 | // Focus node if the following are true: |
@@ -607,14 +607,14 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
607 | if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && | 607 | if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && |
608 | node != prev_node && | 608 | node != prev_node && |
609 | view_is_visible(node->sway_container->view)) { | 609 | view_is_visible(node->sway_container->view)) { |
610 | seat_set_focus_warp(seat, node, false); | 610 | seat_set_focus(seat, node); |
611 | } else { | 611 | } else { |
612 | struct sway_node *next_focus = | 612 | struct sway_node *next_focus = |
613 | seat_get_focus_inactive(seat, &root->node); | 613 | seat_get_focus_inactive(seat, &root->node); |
614 | if (next_focus && next_focus->type == N_CONTAINER && | 614 | if (next_focus && next_focus->type == N_CONTAINER && |
615 | next_focus->sway_container->view && | 615 | next_focus->sway_container->view && |
616 | view_is_visible(next_focus->sway_container->view)) { | 616 | view_is_visible(next_focus->sway_container->view)) { |
617 | seat_set_focus_warp(seat, next_focus, false); | 617 | seat_set_focus(seat, next_focus); |
618 | } | 618 | } |
619 | } | 619 | } |
620 | } | 620 | } |