mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-17 06:46:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a90a2902cf into a7d9535eb3

Browse source
This commit is contained in:
Daniel Morilha 2025-09-17 10:39:10 -07:00 • committed by GitHub
commit 1a743f318e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
sway/commands/move.c
View file

@ -777,16 +777,20 @@ static struct cmd_results *cmd_move_in_direction(
} }
static struct cmd_results *cmd_move_to_position_pointer( 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; struct sway_seat *seat = config->handler_context.seat;
if (!seat->cursor) { if (!seat->cursor) {
return cmd_results_new(CMD_FAILURE, "No cursor device"); return cmd_results_new(CMD_FAILURE, "No cursor device");
} }
struct wlr_cursor *cursor = seat->cursor->cursor; struct wlr_cursor *cursor = seat->cursor->cursor;
/* Determine where to put the window. */ /* Determine where to put the window. */
double lx = cursor->x - container->pending.width / 2; double lx = cursor->x;
double ly = cursor->y - container->pending.height / 2; 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). */ /* Correct target coordinates to be in bounds (on screen). */
struct wlr_output *output = wlr_output_layout_output_at( struct wlr_output *output = wlr_output_layout_output_at(
root->output_layout, cursor->x, cursor->y); root->output_layout, cursor->x, cursor->y);
@ -811,7 +815,7 @@ static struct cmd_results *cmd_move_to_position_pointer(
static const char expected_position_syntax[] = static const char expected_position_syntax[] =
"Expected 'move [absolute] position <x> [px] <y> [px]' or " "Expected 'move [absolute] position <x> [px] <y> [px]' or "
"'move [absolute] position center' 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) { static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
struct sway_container *container = config->handler_context.container; struct sway_container *container = config->handler_context.container;
@ -840,13 +844,23 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
if (!argc) { if (!argc) {
return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax); 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 || if (strcmp(argv[0], "cursor") == 0 || strcmp(argv[0], "mouse") == 0 ||
strcmp(argv[0], "pointer") == 0) { strcmp(argv[0], "pointer") == 0) {
if (absolute) { if (absolute) {
return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax); return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
} }
return cmd_move_to_position_pointer(container); return cmd_move_to_position_pointer(container, next);
} else if (strcmp(argv[0], "center") == 0) { } else if (next) {
return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
}
if (strcmp(argv[0], "center") == 0) {
double lx, ly; double lx, ly;
if (absolute) { if (absolute) {
lx = root->x + (root->width - container->pending.width) / 2; lx = root->x + (root->width - container->pending.width) / 2;

5
sway/sway.5.scd
View file

@ -246,8 +246,9 @@ set|plus|minus|toggle <amount>
Moves the focused container to be centered on the workspace. If _absolute_ Moves the focused container to be centered on the workspace. If _absolute_
is used, it is moved to the center of all outputs. is used, it is moved to the center of all outputs.
*move* position cursor|mouse|pointer *move* position [next] cursor|mouse|pointer
Moves the focused container to be centered on the cursor. Moves the focused container to be centered on the cursor. If _next_ is
used, it moves the left upper corner to the cursor's position.
*move* [container|window] [to] mark <mark> *move* [container|window] [to] mark <mark>
Moves the focused container to the specified mark. Moves the focused container to the specified mark.