From de69105576c85e6454081a91a9b84414209eb343 Mon Sep 17 00:00:00 2001 From: dmorilha Date: Tue, 19 Mar 2024 08:59:32 -0500 Subject: [PATCH] add optional next to move command for cursor | mouse | pointer Currently moving a window to the cursor position centers it. This change creates an optional "next" argument that moves the top upper corner of the window to the pointer's position. Useful for floating popups. --- sway/commands/move.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/sway/commands/move.c b/sway/commands/move.c index 8addf26e..6e6f4c07 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -775,16 +775,20 @@ static struct cmd_results *cmd_move_in_direction( } static struct cmd_results *cmd_move_to_position_pointer( - struct sway_container *container) { + struct sway_container *container, bool next) { struct sway_seat *seat = config->handler_context.seat; if (!seat->cursor) { return cmd_results_new(CMD_FAILURE, "No cursor device"); } struct wlr_cursor *cursor = seat->cursor->cursor; /* Determine where to put the window. */ - double lx = cursor->x - container->pending.width / 2; - double ly = cursor->y - container->pending.height / 2; - + double lx = cursor->x; + double ly = cursor->y; + if (!next) { + lx -= container->pending.width / 2; + ly -= container->pending.height / 2; + } + /* Correct target coordinates to be in bounds (on screen). */ struct wlr_output *output = wlr_output_layout_output_at( root->output_layout, cursor->x, cursor->y); @@ -809,7 +813,7 @@ static struct cmd_results *cmd_move_to_position_pointer( static const char expected_position_syntax[] = "Expected 'move [absolute] position [px] [px]' or " "'move [absolute] position center' or " - "'move position cursor|mouse|pointer'"; + "'move position [next] cursor|mouse|pointer'"; static struct cmd_results *cmd_move_to_position(int argc, char **argv) { struct sway_container *container = config->handler_context.container; @@ -838,13 +842,23 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) { if (!argc) { return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax); } + + bool next = false; + if (strcmp(argv[0], "next") == 0) { + next = true; + --argc; + ++argv; + } if (strcmp(argv[0], "cursor") == 0 || strcmp(argv[0], "mouse") == 0 || strcmp(argv[0], "pointer") == 0) { if (absolute) { return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax); } - return cmd_move_to_position_pointer(container); - } else if (strcmp(argv[0], "center") == 0) { + return cmd_move_to_position_pointer(container, next); + } else if (next) { + return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax); + } + if (strcmp(argv[0], "center") == 0) { double lx, ly; if (absolute) { lx = root->x + (root->width - container->pending.width) / 2;