From 0969bf758b258b328f48ee360b30764b08a7d145 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 15 Oct 2018 16:18:46 +0200 Subject: cursor: functions to warp cursor to container and workspace The new functions allow a cursor to be warped without changing the focus. This is a preparation commit to handle cursor warping not only in seat_set_focus_warp. --- sway/input/cursor.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'sway/input') diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 5c446299..21e104ec 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "list.h" #include "log.h" #include "config.h" @@ -1271,4 +1272,44 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) { cursor->cursor = wlr_cursor; return cursor; + +} + +/** + * Warps the cursor to the middle of the container argument. + * Does nothing if the cursor is already inside the container. + * If container is NULL, returns without doing anything. + */ +void cursor_warp_to_container(struct sway_cursor *cursor, + struct sway_container *container) { + if (!container) { + return; + } + + struct wlr_box box; + container_get_box(container, &box); + if (wlr_box_contains_point(&box, cursor->cursor->x, cursor->cursor->y)) { + return; + } + + double x = container->x + container->width / 2.0; + double y = container->y + container->height / 2.0; + + wlr_cursor_warp(cursor->cursor, NULL, x, y); +} + +/** + * Warps the cursor to the middle of the workspace argument. + * If workspace is NULL, returns without doing anything. + */ +void cursor_warp_to_workspace(struct sway_cursor *cursor, + struct sway_workspace *workspace) { + if (!workspace) { + return; + } + + double x = workspace->x + workspace->width / 2.0; + double y = workspace->y + workspace->height / 2.0; + + wlr_cursor_warp(cursor->cursor, NULL, x, y); } -- cgit v1.2.3 From d69cf4c23c437b9ff724869f380e5c6cd03b091e Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 15 Oct 2018 16:20:18 +0200 Subject: seat: use new warping functions for cursor warping during focus warp --- sway/input/seat.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'sway/input') diff --git a/sway/input/seat.c b/sway/input/seat.c index 03ed638e..23f582ca 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -771,27 +771,18 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, workspace_consider_destroy(last_workspace); } - if (last_focus) { - if (config->mouse_warping && warp && - (new_output != last_output || - config->mouse_warping == WARP_CONTAINER)) { - double x = 0; - double y = 0; + if (last_focus && warp) { + if (container && config->mouse_warping == WARP_CONTAINER) { + cursor_warp_to_container(seat->cursor, container); + cursor_send_pointer_motion(seat->cursor, 0, true); + } else if (new_output != last_output && + config->mouse_warping >= WARP_OUTPUT) { if (container) { - x = container->x + container->width / 2.0; - y = container->y + container->height / 2.0; + cursor_warp_to_container(seat->cursor, container); } 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) - || config->mouse_warping == WARP_CONTAINER) { - wlr_cursor_warp(seat->cursor->cursor, NULL, x, y); - cursor_send_pointer_motion(seat->cursor, 0, true); + cursor_warp_to_workspace(seat->cursor, new_workspace); } + cursor_send_pointer_motion(seat->cursor, 0, true); } } -- cgit v1.2.3