Introduce cursor_rebase

This function "rebases" the cursor on top of whatever is underneath it,
without triggering any focus changes.

2 files changed, 2 insertions, 3 deletions

diff --git a/sway/tree/view.c b/sway/tree/view.c
index 85998547..43a9d510 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -653,9 +653,8 @@ void view_unmap(struct sway_view *view) {
                         } else if (node && node->type == N_WORKSPACE) {
                                 cursor_warp_to_workspace(seat->cursor, node->sway_workspace);
                         }
-                } else {
-                        cursor_send_pointer_motion(seat->cursor, 0, true);
                 }
+                cursor_rebase(seat->cursor);
         }
 
         transaction_commit_dirty();
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index a1282c1e..2a00824d 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -399,7 +399,7 @@ bool workspace_switch(struct sway_workspace *workspace,
         }
         seat_set_focus(seat, next);
         arrange_workspace(workspace);
-        cursor_send_pointer_motion(seat->cursor, 0, true);
+        cursor_rebase(seat->cursor);
         return true;
 }