commands: Learn 'move <container|window> to output <direction|name>'.

This commit is contained in:
S. Christoffer Eliesen 2015-10-25 00:38:33 +02:00
parent 0833fa0c75
commit 9c8394022e
2 changed files with 22 additions and 1 deletions

View file

@ -102,6 +102,10 @@ Commands
Moves the focused container to the workspace identified by _name_.
_name_ may be a special workspace name. See **workspace**.
**move** <container|window> to output <name|direction>::
Moves the focused container to the output identified by _name_ or _direction_.
_direction_ may be one of _up_, _down_, _left_, _right_.
**mouse_warping** <output|none>::
When _output_: place mouse at center of newly focused window when changing
output. When _none_: don't move mouse.

View file

@ -555,7 +555,8 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
return error;
}
const char* expected_syntax = "Expected 'move <left|right|up|down>' or "
"'move <container|window> to workspace <name>'";
"'move <container|window> to workspace <name>' or "
"'move <container|window> to output <name|direction>'";
swayc_t *view = get_focused_container(&root_container);
if (strcasecmp(argv[0], "left") == 0) {
@ -587,6 +588,22 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
ws = workspace_create(ws_name);
}
move_container_to(view, get_focused_container(ws));
} else if (strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "output") == 0) {
// move container to output x
swayc_t *output = NULL;
if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
} else if (!(output = output_by_name(argv[3]))) {
return cmd_results_new(CMD_FAILURE, "move",
"Can't find output with name/direction '%s'", argv[3]);
} else {
swayc_t *container = get_focused_container(output);
if (container->is_floating) {
move_container_to(view, container->parent);
} else {
move_container_to(view, container);
}
}
} else {
return cmd_results_new(CMD_INVALID, "move", expected_syntax);
}