Implement mouse warping

2 files changed, 18 insertions, 4 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 74af6426..9cdd66d8 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -156,8 +156,8 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
         cursor_send_pointer_motion(cursor, event->time_msec);
 }
 
-static void handle_cursor_motion_absolute(struct wl_listener *listener,
-                void *data) {
+static void handle_cursor_motion_absolute(
+                struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor =
                 wl_container_of(listener, cursor, motion_absolute);
         struct wlr_event_pointer_motion_absolute *event = data;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 8d592872..eab5cf40 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -333,15 +333,29 @@ void sway_seat_set_focus(struct sway_seat *seat,
         if (last_focus) {
                 struct sway_container *last_ws = last_focus;
                 if (last_ws && last_ws->type != C_WORKSPACE) {
-                        last_ws = container_parent(last_focus, C_WORKSPACE);
+                        last_ws = container_parent(last_ws, C_WORKSPACE);
                 }
                 if (last_ws) {
-                        wlr_log(L_DEBUG, "sending workspace event");
                         ipc_event_workspace(last_ws, container, "focus");
                         if (last_ws->children->length == 0) {
                                 container_workspace_destroy(last_ws);
                         }
                 }
+                struct sway_container *last_output = last_focus;
+                if (last_output && last_output->type != C_OUTPUT) {
+                        last_output = container_parent(last_output, C_OUTPUT);
+                }
+                struct sway_container *new_output = container;
+                if (new_output && new_output->type != C_OUTPUT) {
+                        new_output = container_parent(new_output, C_OUTPUT);
+                }
+                if (new_output != last_output && config->mouse_warping) {
+                        struct wlr_output *output = new_output->sway_output->wlr_output;
+                        // TODO: Change container coords to layout coords
+                        double x = container->x + output->lx + container->width / 2.0;
+                        double y = container->y + output->ly + container->height / 2.0;
+                        wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
+                }
         }
 
         if (last_focus && last_focus->type == C_VIEW &&