mirror of
https://github.com/swaywm/sway.git
synced 2025-11-09 13:29:49 -05:00
Merge branch 'master' into workspace-move-to-output
This commit is contained in:
Brian Ashworth
GitHub
commit
639f3368e1
19 changed files with 534 additions and 192 deletions
|
|
@ -1,4 +1,5 @@
|
|||
#define _XOPEN_SOURCE 500
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <wlr/types/wlr_cursor.h>
|
||||
|
|
@ -18,11 +19,11 @@
|
|||
#include "list.h"
|
||||
#include "log.h"
|
||||
|
||||
static const char* expected_syntax =
|
||||
static const char *expected_syntax =
|
||||
"Expected 'move <left|right|up|down> <[px] px>' or "
|
||||
"'move <container|window> to workspace <name>' or "
|
||||
"'move <container|window|workspace> to output <name|direction>' or "
|
||||
"'move position mouse'";
|
||||
"'move [--no-auto-back-and-forth] <container|window> [to] workspace <name>' or "
|
||||
"'move [--no-auto-back-and-forth] <container|window|workspace> [to] output <name|direction>' or "
|
||||
"'move <container|window> [to] mark <mark>'";
|
||||
|
||||
static struct sway_container *output_in_direction(const char *direction,
|
||||
struct wlr_output *reference, int ref_lx, int ref_ly) {
|
||||
|
|
@ -54,104 +55,140 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
|
|||
int argc, char **argv) {
|
||||
struct cmd_results *error = NULL;
|
||||
if ((error = checkarg(argc, "move container/window",
|
||||
EXPECTED_AT_LEAST, 4))) {
|
||||
EXPECTED_AT_LEAST, 3))) {
|
||||
return error;
|
||||
} else if (strcasecmp(argv[1], "to") == 0
|
||||
&& strcasecmp(argv[2], "workspace") == 0) {
|
||||
// move container to workspace x
|
||||
if (current->type == C_WORKSPACE) {
|
||||
if (current->children->length == 0) {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Can't move an empty workspace");
|
||||
}
|
||||
current = container_wrap_children(current);
|
||||
} else if (current->type != C_CONTAINER && current->type != C_VIEW) {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Can only move containers and views.");
|
||||
}
|
||||
struct sway_container *ws;
|
||||
char *ws_name = NULL;
|
||||
if (argc == 5 && strcasecmp(argv[3], "number") == 0) {
|
||||
// move "container to workspace number x"
|
||||
ws_name = strdup(argv[4]);
|
||||
ws = workspace_by_number(ws_name);
|
||||
} else {
|
||||
ws_name = join_args(argv + 3, argc - 3);
|
||||
ws = workspace_by_name(ws_name);
|
||||
}
|
||||
}
|
||||
|
||||
if (config->auto_back_and_forth && prev_workspace_name) {
|
||||
// auto back and forth move
|
||||
struct sway_container *curr_ws = container_parent(current, C_WORKSPACE);
|
||||
if (curr_ws->name && strcmp(curr_ws->name, ws_name) == 0) {
|
||||
// if target workspace is the current one
|
||||
free(ws_name);
|
||||
ws_name = strdup(prev_workspace_name);
|
||||
if (current->type == C_WORKSPACE) {
|
||||
if (current->children->length == 0) {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Can't move an empty workspace");
|
||||
}
|
||||
current = container_wrap_children(current);
|
||||
} else if (current->type != C_CONTAINER && current->type != C_VIEW) {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Can only move containers and views.");
|
||||
}
|
||||
|
||||
bool no_auto_back_and_forth = false;
|
||||
while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) {
|
||||
no_auto_back_and_forth = true;
|
||||
if (--argc < 3) {
|
||||
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
|
||||
}
|
||||
++argv;
|
||||
}
|
||||
while (strcasecmp(argv[1], "--no-auto-back-and-forth") == 0) {
|
||||
no_auto_back_and_forth = true;
|
||||
if (--argc < 3) {
|
||||
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
|
||||
}
|
||||
argv++;
|
||||
}
|
||||
|
||||
while (strcasecmp(argv[1], "to") == 0) {
|
||||
if (--argc < 3) {
|
||||
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
|
||||
}
|
||||
argv++;
|
||||
}
|
||||
|
||||
struct sway_container *old_parent = current->parent;
|
||||
struct sway_container *old_ws = container_parent(current, C_WORKSPACE);
|
||||
struct sway_container *destination = NULL;
|
||||
|
||||
// determine destination
|
||||
if (strcasecmp(argv[1], "workspace") == 0) {
|
||||
// move container to workspace x
|
||||
struct sway_container *ws;
|
||||
if (strcasecmp(argv[2], "next") == 0 ||
|
||||
strcasecmp(argv[2], "prev") == 0 ||
|
||||
strcasecmp(argv[2], "next_on_output") == 0 ||
|
||||
strcasecmp(argv[2], "prev_on_output") == 0 ||
|
||||
strcasecmp(argv[2], "back_and_forth") == 0 ||
|
||||
strcasecmp(argv[2], "current") == 0) {
|
||||
ws = workspace_by_name(argv[2]);
|
||||
} else if (strcasecmp(argv[2], "back_and_forth") == 0) {
|
||||
if (!(ws = workspace_by_name(argv[2]))) {
|
||||
if (prev_workspace_name) {
|
||||
ws = workspace_create(NULL, prev_workspace_name);
|
||||
} else {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"No workspace was previously active.");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
char *ws_name = NULL;
|
||||
if (strcasecmp(argv[2], "number") == 0) {
|
||||
// move "container to workspace number x"
|
||||
if (argc < 4) {
|
||||
return cmd_results_new(CMD_INVALID, "move",
|
||||
expected_syntax);
|
||||
}
|
||||
ws_name = strdup(argv[3]);
|
||||
ws = workspace_by_number(ws_name);
|
||||
} else {
|
||||
ws_name = join_args(argv + 2, argc - 2);
|
||||
ws = workspace_by_name(ws_name);
|
||||
}
|
||||
}
|
||||
|
||||
if (!ws) {
|
||||
ws = workspace_create(NULL, ws_name);
|
||||
}
|
||||
free(ws_name);
|
||||
struct sway_container *old_parent = current->parent;
|
||||
struct sway_container *old_ws = container_parent(current, C_WORKSPACE);
|
||||
struct sway_container *destination = seat_get_focus_inactive(
|
||||
config->handler_context.seat, ws);
|
||||
container_move_to(current, destination);
|
||||
struct sway_container *focus = seat_get_focus_inactive(
|
||||
config->handler_context.seat, old_parent);
|
||||
seat_set_focus_warp(config->handler_context.seat, focus, true, false);
|
||||
container_reap_empty(old_parent);
|
||||
container_reap_empty(destination->parent);
|
||||
if (!no_auto_back_and_forth && config->auto_back_and_forth &&
|
||||
prev_workspace_name) {
|
||||
// auto back and forth move
|
||||
if (old_ws->name && strcmp(old_ws->name, ws_name) == 0) {
|
||||
// if target workspace is the current one
|
||||
free(ws_name);
|
||||
ws_name = strdup(prev_workspace_name);
|
||||
ws = workspace_by_name(ws_name);
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Ideally we would arrange the surviving parent after reaping,
|
||||
// but container_reap_empty does not return it, so we arrange the
|
||||
// workspace instead.
|
||||
arrange_windows(old_ws);
|
||||
arrange_windows(destination->parent);
|
||||
|
||||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
} else if (strcasecmp(argv[1], "to") == 0
|
||||
&& strcasecmp(argv[2], "output") == 0) {
|
||||
if (current->type == C_WORKSPACE) {
|
||||
// TODO: Wrap children in a container and move that
|
||||
return cmd_results_new(CMD_FAILURE, "move", "Unimplemented");
|
||||
} else if (current->type != C_CONTAINER
|
||||
&& current->type != C_VIEW) {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Can only move containers and views.");
|
||||
if (!ws) {
|
||||
ws = workspace_create(NULL, ws_name);
|
||||
}
|
||||
free(ws_name);
|
||||
}
|
||||
destination = seat_get_focus_inactive(config->handler_context.seat, ws);
|
||||
} else if (strcasecmp(argv[1], "output") == 0) {
|
||||
struct sway_container *source = container_parent(current, C_OUTPUT);
|
||||
struct sway_container *destination = output_in_direction(argv[3],
|
||||
struct sway_container *dest_output = output_in_direction(argv[2],
|
||||
source->sway_output->wlr_output, current->x, current->y);
|
||||
if (!destination) {
|
||||
if (!dest_output) {
|
||||
return cmd_results_new(CMD_FAILURE, "move workspace",
|
||||
"Can't find output with name/direction '%s'", argv[3]);
|
||||
"Can't find output with name/direction '%s'", argv[2]);
|
||||
}
|
||||
struct sway_container *focus = seat_get_focus_inactive(
|
||||
config->handler_context.seat, destination);
|
||||
if (!focus) {
|
||||
destination = seat_get_focus_inactive(
|
||||
config->handler_context.seat, dest_output);
|
||||
if (!destination) {
|
||||
// We've never been to this output before
|
||||
focus = destination->children->items[0];
|
||||
destination = dest_output->children->items[0];
|
||||
}
|
||||
struct sway_container *old_parent = current->parent;
|
||||
struct sway_container *old_ws = container_parent(current, C_WORKSPACE);
|
||||
container_move_to(current, focus);
|
||||
seat_set_focus_warp(config->handler_context.seat, old_parent, true, false);
|
||||
container_reap_empty(old_parent);
|
||||
container_reap_empty(focus->parent);
|
||||
|
||||
// TODO: Ideally we would arrange the surviving parent after reaping,
|
||||
// but container_reap_empty does not return it, so we arrange the
|
||||
// workspace instead.
|
||||
arrange_windows(old_ws);
|
||||
arrange_windows(focus->parent);
|
||||
|
||||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
} else if (strcasecmp(argv[1], "mark") == 0) {
|
||||
struct sway_view *dest_view = view_find_mark(argv[2]);
|
||||
if (dest_view == NULL) {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Mark '%s' not found", argv[2]);
|
||||
}
|
||||
destination = dest_view->swayc;
|
||||
} else {
|
||||
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
|
||||
}
|
||||
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
|
||||
|
||||
// move container, arrange windows and return focus
|
||||
container_move_to(current, destination);
|
||||
struct sway_container *focus =
|
||||
seat_get_focus_inactive(config->handler_context.seat, old_parent);
|
||||
seat_set_focus_warp(config->handler_context.seat, focus, true, false);
|
||||
container_reap_empty(old_parent);
|
||||
container_reap_empty(destination->parent);
|
||||
|
||||
// TODO: Ideally we would arrange the surviving parent after reaping,
|
||||
// but container_reap_empty does not return it, so we arrange the
|
||||
// workspace instead.
|
||||
arrange_windows(old_ws);
|
||||
arrange_windows(destination->parent);
|
||||
|
||||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
}
|
||||
|
||||
static void workspace_move_to_output(struct sway_container *workspace,
|
||||
|
|
@ -197,20 +234,29 @@ static void workspace_move_to_output(struct sway_container *workspace,
|
|||
static struct cmd_results *cmd_move_workspace(struct sway_container *current,
|
||||
int argc, char **argv) {
|
||||
struct cmd_results *error = NULL;
|
||||
if ((error = checkarg(argc, "move workspace", EXPECTED_EQUAL_TO, 4))) {
|
||||
if ((error = checkarg(argc, "move workspace", EXPECTED_AT_LEAST, 2))) {
|
||||
return error;
|
||||
} else if (strcasecmp(argv[1], "to") != 0
|
||||
|| strcasecmp(argv[2], "output") != 0) {
|
||||
}
|
||||
|
||||
while (strcasecmp(argv[1], "to") == 0) {
|
||||
if (--argc < 3) {
|
||||
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
|
||||
}
|
||||
++argv;
|
||||
}
|
||||
|
||||
if (strcasecmp(argv[1], "output") != 0) {
|
||||
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
|
||||
}
|
||||
|
||||
struct sway_container *source = container_parent(current, C_OUTPUT);
|
||||
int center_x = current->width / 2 + current->x,
|
||||
center_y = current->height / 2 + current->y;
|
||||
struct sway_container *destination = output_in_direction(argv[3],
|
||||
struct sway_container *destination = output_in_direction(argv[2],
|
||||
source->sway_output->wlr_output, center_x, center_y);
|
||||
if (!destination) {
|
||||
return cmd_results_new(CMD_FAILURE, "move workspace",
|
||||
"Can't find output with name/direction '%s'", argv[3]);
|
||||
"Can't find output with name/direction '%s'", argv[2]);
|
||||
}
|
||||
if (current->type != C_WORKSPACE) {
|
||||
current = container_parent(current, C_WORKSPACE);
|
||||
|
|
@ -284,9 +330,9 @@ static struct cmd_results *move_in_direction(struct sway_container *container,
|
|||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
}
|
||||
|
||||
static const char* expected_position_syntax =
|
||||
"Expected 'move [absolute] position <x> <y>' or "
|
||||
"'move [absolute] position mouse'";
|
||||
static const char *expected_position_syntax =
|
||||
"Expected 'move [absolute] position <x> [px] <y> [px]' or "
|
||||
"'move [absolute] position center|mouse'";
|
||||
|
||||
static struct cmd_results *move_to_position(struct sway_container *container,
|
||||
int argc, char **argv) {
|
||||
|
|
@ -321,10 +367,18 @@ static struct cmd_results *move_to_position(struct sway_container *container,
|
|||
double ly = seat->cursor->cursor->y - container->height / 2;
|
||||
container_floating_move_to(container, lx, ly);
|
||||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
} else if (strcmp(argv[0], "center") == 0) {
|
||||
struct sway_container *ws = container_parent(container, C_WORKSPACE);
|
||||
double lx = ws->x + (ws->width - container->width) / 2;
|
||||
double ly = ws->y + (ws->height - container->height) / 2;
|
||||
container_floating_move_to(container, lx, ly);
|
||||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
}
|
||||
if (argc != 2) {
|
||||
|
||||
if (argc < 2) {
|
||||
return cmd_results_new(CMD_FAILURE, "move", expected_position_syntax);
|
||||
}
|
||||
|
||||
double lx, ly;
|
||||
char *inv;
|
||||
lx = (double)strtol(argv[0], &inv, 10);
|
||||
|
|
@ -332,11 +386,22 @@ static struct cmd_results *move_to_position(struct sway_container *container,
|
|||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Invalid position specified");
|
||||
}
|
||||
if (strcmp(argv[1], "px") == 0) {
|
||||
--argc;
|
||||
++argv;
|
||||
}
|
||||
|
||||
if (argc > 3) {
|
||||
return cmd_results_new(CMD_FAILURE, "move", expected_position_syntax);
|
||||
}
|
||||
|
||||
ly = (double)strtol(argv[1], &inv, 10);
|
||||
if (*inv != '\0' && strcasecmp(inv, "px") != 0) {
|
||||
if ((*inv != '\0' && strcasecmp(inv, "px") != 0) ||
|
||||
(argc == 3 && strcmp(argv[2], "px") != 0)) {
|
||||
return cmd_results_new(CMD_FAILURE, "move",
|
||||
"Invalid position specified");
|
||||
}
|
||||
|
||||
container_floating_move_to(container, lx, ly);
|
||||
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||
}
|
||||
|
|
@ -384,8 +449,11 @@ struct cmd_results *cmd_move(int argc, char **argv) {
|
|||
return move_in_direction(current, MOVE_UP, argc, argv);
|
||||
} else if (strcasecmp(argv[0], "down") == 0) {
|
||||
return move_in_direction(current, MOVE_DOWN, argc, argv);
|
||||
} else if (strcasecmp(argv[0], "container") == 0
|
||||
|| strcasecmp(argv[0], "window") == 0) {
|
||||
} else if ((strcasecmp(argv[0], "container") == 0
|
||||
|| strcasecmp(argv[0], "window") == 0) ||
|
||||
(strcasecmp(argv[0], "--no-auto-back-and-forth") &&
|
||||
(strcasecmp(argv[0], "container") == 0
|
||||
|| strcasecmp(argv[0], "window") == 0))) {
|
||||
return cmd_move_container(current, argc, argv);
|
||||
} else if (strcasecmp(argv[0], "workspace") == 0) {
|
||||
return cmd_move_workspace(current, argc, argv);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue