mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2059 from RyanDwyer/ancestor-typo 

Fix ancestor typos
This commit is contained in:
emersion 2018-05-28 09:16:33 +01:00 committed by GitHub
parent cc1fc3b4a6 7c7d24600b
commit 9d1049ae8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sway/tree/container.h
View File

@ -186,8 +186,8 @@ void container_for_each_descendant_dfs(struct sway_container *container,
/**
* Returns true if the given container is an ancestor of this container.
*/
bool container_has_anscestor(struct sway_container *container,
struct sway_container *anscestor);
bool container_has_ancestor(struct sway_container *container,
struct sway_container *ancestor);
/**
* Returns true if the given container is a child descendant of this container.

4
sway/commands/swap.c
View File

@ -60,8 +60,8 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
} else if (current->type < C_CONTAINER || other->type < C_CONTAINER) {
error = cmd_results_new(CMD_FAILURE, "swap",
"Can only swap with containers and views");
} else if (container_has_anscestor(current, other)
|| container_has_anscestor(other, current)) {
} else if (container_has_ancestor(current, other)
|| container_has_ancestor(other, current)) {
error = cmd_results_new(CMD_FAILURE, "swap",
"Cannot swap ancestor and descendant");
} else if (current->layout == L_FLOATING || other->layout == L_FLOATING) {

2
sway/input/seat.c
View File

@ -542,7 +542,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
return;
}
// put all the anscestors of this container on top of the focus stack
// put all the ancestors of this container on top of the focus stack
struct sway_seat_container *parent =
seat_container_from_container(seat, container->parent);
while (parent) {

6
sway/tree/container.c
View File

@ -656,11 +656,11 @@ void container_for_each_descendant_bfs(struct sway_container *con,
}
}
bool container_has_anscestor(struct sway_container *descendant,
struct sway_container *anscestor) {
bool container_has_ancestor(struct sway_container *descendant,
struct sway_container *ancestor) {
while (descendant->type != C_ROOT) {
descendant = descendant->parent;
if (descendant == anscestor) {
if (descendant == ancestor) {
return true;
}
}

8
sway/tree/layout.c
View File

@ -157,7 +157,7 @@ struct sway_container *container_remove_child(struct sway_container *child) {
void container_move_to(struct sway_container *container,
struct sway_container *destination) {
if (container == destination
|| container_has_anscestor(container, destination)) {
|| container_has_ancestor(container, destination)) {
return;
}
struct sway_container *old_parent = container_remove_child(container);
@ -945,9 +945,9 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) {
"Can only swap containers and views")) {
return;
}
if (!sway_assert(!container_has_anscestor(con1, con2)
&& !container_has_anscestor(con2, con1),
"Cannot swap anscestor and descendant")) {
if (!sway_assert(!container_has_ancestor(con1, con2)
&& !container_has_ancestor(con2, con1),
"Cannot swap ancestor and descendant")) {
return;
}
if (!sway_assert(con1->layout != L_FLOATING && con2->layout != L_FLOATING,