alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix container move when workspace is focused

Browse source 
Fixes #819. If workspace is focused and command 'move container to
workspace/output' is issued, workspace child containers are wrapped in a
new container and moved according to command.
This commit is contained in:
D.B 2016-08-07 17:07:30 +02:00
parent e8ca63702e
commit 61781bbef0
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sway/commands.c
View file

@ -1032,7 +1032,9 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
return error; return error;
} else if ( strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "workspace") == 0) { } else if ( strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "workspace") == 0) {
// move container to workspace x // move container to workspace x
if (view->type != C_CONTAINER && view->type != C_VIEW) { if (view->type == C_WORKSPACE) {
view = new_container(view, view->layout);
} if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
} }
@ -1055,18 +1057,20 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
swayc_t *output = NULL; swayc_t *output = NULL;
struct wlc_point abs_pos; struct wlc_point abs_pos;
get_absolute_center_position(view, &abs_pos); get_absolute_center_position(view, &abs_pos);
if (view->type != C_CONTAINER && view->type != C_VIEW) { if (view->type == C_WORKSPACE) {
view = new_container(view, view->layout);
} else if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
} else if (!(output = output_by_name(argv[3], &abs_pos))) { } else if (!(output = output_by_name(argv[3], &abs_pos))) {
return cmd_results_new(CMD_FAILURE, "move", return cmd_results_new(CMD_FAILURE, "move",
"Can't find output with name/direction '%s' @ (%i,%i)", argv[3], abs_pos.x, abs_pos.y); "Can't find output with name/direction '%s' @ (%i,%i)", argv[3], abs_pos.x, abs_pos.y);
}
swayc_t *container = get_focused_container(output);
if (container->is_floating) {
move_container_to(view, container->parent);
} else { } else {
swayc_t *container = get_focused_container(output); move_container_to(view, container);
if (container->is_floating) {
move_container_to(view, container->parent);
} else {
move_container_to(view, container);
}
} }
} else { } else {
return cmd_results_new(CMD_INVALID, "move", expected_syntax); return cmd_results_new(CMD_INVALID, "move", expected_syntax);