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

added "move container to workspace"

Browse source 
makes the previous commit actually testable
This commit is contained in:
minus 2015-08-25 18:25:36 +02:00
parent f22c937953
commit 03e4a97dbe
3 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/layout.h
View file

@ -22,6 +22,7 @@ swayc_t *remove_child(swayc_t *child);
void swap_container(swayc_t *a, swayc_t *b);
void move_container(swayc_t* container,swayc_t* root,enum movement_direction direction);
void move_container_to(swayc_t* container, swayc_t* destination);
// Layout
void update_geometry(swayc_t *view);

25
sway/commands.c
View file

@ -344,7 +344,7 @@ static bool cmd_focus_follows_mouse(struct sway_config *config, int argc, char *
}
static bool cmd_move(struct sway_config *config, int argc, char **argv) {
if (!checkarg(argc, "workspace", EXPECTED_EQUAL_TO, 1)) {
if (!checkarg(argc, "workspace", EXPECTED_AT_LEAST, 1)) {
return false;
}
@ -358,6 +358,29 @@ static bool cmd_move(struct sway_config *config, int argc, char **argv) {
move_container(view,&root_container,MOVE_UP);
} else if (strcasecmp(argv[0], "down") == 0) {
move_container(view,&root_container,MOVE_DOWN);
} else if (strcasecmp(argv[0], "container") == 0 || strcasecmp(argv[0], "window") == 0) {
// "move container to workspace x"
if (!checkarg(argc, "move container/window", EXPECTED_EQUAL_TO, 4) ||
strcasecmp(argv[1], "to") != 0 ||
strcasecmp(argv[2], "workspace") != 0) {
return false;
}
if (view->type != C_CONTAINER && view->type != C_VIEW) {
return false;
}
const char *ws_name = argv[3];
if (argc == 5) {
// move "container to workspace number x"
ws_name = argv[4];
}
swayc_t *ws = workspace_by_name(ws_name);
if (ws == NULL) {
ws = workspace_create(ws_name);
}
move_container_to(view, ws);
} else {
return false;
}

15
sway/layout.c
View file

@ -203,6 +203,21 @@ void move_container(swayc_t *container,swayc_t* root,enum movement_direction dir
}
void move_container_to(swayc_t* container, swayc_t* destination) {
if (container->parent == destination) {
return;
}
destroy_container(remove_child(container));
set_focused_container(get_focused_view(&root_container));
if (container->is_floating) {
add_floating(destination, container);
} else {
add_child(destination, container);
}
update_visibility(container);
arrange_windows(&root_container, -1, -1);
}
void update_geometry(swayc_t *container) {
if (container->type != C_VIEW) {
return;