mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #147 from taiyu-len/master

Browse source 
move v3
This commit is contained in:
Drew DeVault 2015-08-28 22:43:23 -04:00
parent e0d5486957 63e735270c
commit 70c238ef66
2 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/commands.c
View file

@ -366,7 +366,6 @@ static bool cmd_move(struct sway_config *config, int argc, char **argv) {
return false; return false;
} }
// TODO handle case of workspace, something similar to _do_split
if (view->type != C_CONTAINER && view->type != C_VIEW) { if (view->type != C_CONTAINER && view->type != C_VIEW) {
return false; return false;
} }

59
sway/layout.c
View file

@ -195,7 +195,6 @@ void swap_geometry(swayc_t *a, swayc_t *b) {
// TODO fix workspace movement, as in // TODO fix workspace movement, as in
// [a][b][c] => |move b| => [aa][cc] // [a][b][c] => |move b| => [aa][cc]
// [a][b][c] => |down | => [bbbbbb] // [a][b][c] => |down | => [bbbbbb]
//
void move_container(swayc_t *container, enum movement_direction dir) { void move_container(swayc_t *container, enum movement_direction dir) {
enum swayc_layouts layout; enum swayc_layouts layout;
if (container->is_floating) { if (container->is_floating) {
@ -210,37 +209,37 @@ void move_container(swayc_t *container, enum movement_direction dir) {
} }
swayc_t *parent = container->parent; swayc_t *parent = container->parent;
swayc_t *child = container; swayc_t *child = container;
bool ascended = false;
while (true) { while (true) {
sway_log(L_DEBUG, "container:%p, parent:%p, child %p,", sway_log(L_DEBUG, "container:%p, parent:%p, child %p,",
container,parent,child); container,parent,child);
if (parent->layout == layout) { if (parent->layout == layout) {
int diff; int diff;
// When child == container the container is removed, // If it has ascended (parent has moved up), no container is removed
// so when inserting it back in, it needs to be -1, or 1 // so insert it at index, or index+1.
// inserts at 1-1 or 1+1 // if it has not, the moved container is removed, so it needs to be
// 0 1 2 3 => 0 1 2 => 0 1 2 3 or 0 1 2 3 // inserted at index-1, or index+1
// |0|1|2| => |0|2| => |1|0|2| or |0|2|1| if (ascended) {
// When child != container, no container is removed
// inserts at 1+0 or 1+1
// 0 1 2 3 => 0 1 2 3 4 or 0 1 2 3 4
// |0|1|2| => |0|n|1|2| or |0|1|n|2|
if (child == container) {
diff = dir == MOVE_LEFT || dir == MOVE_UP ? -1 : 1;
} else {
diff = dir == MOVE_LEFT || dir == MOVE_UP ? 0 : 1; diff = dir == MOVE_LEFT || dir == MOVE_UP ? 0 : 1;
} else {
diff = dir == MOVE_LEFT || dir == MOVE_UP ? -1 : 1;
} }
int desired = index_child(child) + diff; int desired = index_child(child) + diff;
// Legal position // when it has ascended, legal insertion position is 0:len
// when child == container, desired must be less then parent, // when it has not, legal insertion position is 0:len-1
// when child != container, desired can be equal to parent length if (desired >= 0 && desired - ascended < parent->children->length) {
if (desired >= 0 && desired - (child != container) < parent->children->length) { if (!ascended) {
// Case where we descend into a container
if (child == container) {
child = parent->children->items[desired]; child = parent->children->items[desired];
// Move container Into child container. // Move container into sibling container
if (child->type == C_CONTAINER) { if (child->type == C_CONTAINER) {
parent = child; parent = child;
desired = index_child(child->focused); // Insert it in first/last if matching layout,otherwise
// inesrt it next to focused container
if (parent->layout == layout) {
desired = (diff < 0) * parent->children->length;
} else {
desired = index_child(child->focused);
}
//reset geometry //reset geometry
container->width = container->height = 0; container->width = container->height = 0;
} }
@ -252,12 +251,22 @@ void move_container(swayc_t *container, enum movement_direction dir) {
break; break;
} }
} }
// Change parent layout if we need to
if (parent->children->length == 1 && parent->layout != layout) {
parent->layout = layout;
continue;
}
if (parent->type == C_WORKSPACE) {
// We simply cannot move any further.
if (parent->layout == layout) {
break;
}
// Create container around workspace to insert child into
parent = new_container(parent, layout);
}
ascended = true;
child = parent; child = parent;
parent = child->parent; parent = child->parent;
if (!parent || child->type == C_WORKSPACE) {
sway_log(L_DEBUG, "Failed to move container");
return;
}
} }
// Dirty hack to fix a certain case // Dirty hack to fix a certain case
arrange_windows(parent, -1, -1); arrange_windows(parent, -1, -1);