koma/wm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrite wm_treenode_ptr_find_client_node, return sibling from wm_treenode_remove_client

Browse Source
This commit is contained in:
Akos Horvath 2023-07-01 20:16:54 +02:00
parent 64d2adbe49
commit e350587aa2
2 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
util.c
View File

@ -65,7 +65,7 @@ void wm_treenode_split_space(TreeNode *node, Rect *ret1, Rect *ret2)
}
}
void wm_treenode_remove_client(TreeNode *root, Client *client)
TreeNode* wm_treenode_remove_client(TreeNode *root, Client *client)
{
DEBUG_PRINT("%s\n", __func__);
TreeNode *client_node = wm_treenode_ptr_find_client_node(root, client);
@ -73,23 +73,24 @@ void wm_treenode_remove_client(TreeNode *root, Client *client)
if (client_node->parent == NULL) {
client_node->client = NULL;
wm_nodearray_clear(&client_node->children);
return;
return NULL;
}
TreeNode *parent = client_node->parent;
parent->type = NODE_CLIENT;
TreeNode *node = client_node->parent;
node->type = NODE_CLIENT;
Client *other_client = NULL;
for (size_t i = 0; i < parent->children.size; i++) {
if (parent->children.nodes[i].type == NODE_CLIENT &&
parent->children.nodes[i].client != client) {
other_client = parent->children.nodes[i].client;
for (size_t i = 0; i < node->children.size; i++) {
if (node->children.nodes[i].type == NODE_CLIENT &&
node->children.nodes[i].client != client) {
other_client = node->children.nodes[i].client;
}
}
assert(other_client);
parent->client = other_client;
wm_nodearray_clear(&parent->children);
node->client = other_client;
wm_nodearray_clear(&node->children);
return node;
}
NodeArray wm_nodearray_new()
@ -364,7 +365,7 @@ TreeNode* wm_treenode_ptr_find_focused_client_node(TreeNode *root)
if (!wm_ptrarray_pop_front(&queue, (void**)&node))
goto ret;
if (node->type == NODE_CLIENT && node->client->focused) {
if (node->type == NODE_CLIENT && node->client && node->client->focused) {
ret = node;
goto ret;
}
@ -395,50 +396,22 @@ ret:
TreeNode* wm_treenode_ptr_find_client_node(TreeNode *root, Client *client)
{
DEBUG_PRINT("%s\n", __func__);
assert(root);
assert(client);
TreeNode *ret = NULL;
PtrArray client_nodes = wm_treenode_find_client_nodes_ptr(root);
NodeArray visited = wm_nodearray_new();
wm_nodearray_push(&visited, *root);
PtrArray queue = wm_ptrarray_new();
wm_ptrarray_push(&queue, root);
while (queue.size > 0) {
TreeNode *node;
if (!wm_ptrarray_pop_front(&queue, (void*)node))
goto ret;
for (size_t i = 0; i < client_nodes.size; i++) {
TreeNode *node = (TreeNode*)client_nodes.ptrs[i];
if (node->client == client) {
ret = node;
goto ret;
}
for (int i = 0; i < node->children.size; i++) {
TreeNode child_node = node->children.nodes[i];
bool _visited = false;
for (int j = 0; j < visited.size; j++) {
if (visited.nodes[j].id == child_node.id) {
_visited = true;
break;
}
}
if (!_visited) {
wm_nodearray_push(&visited, child_node);
wm_ptrarray_push(&queue, &child_node);
}
}
}
ret:
wm_nodearray_free(&visited);
wm_ptrarray_free(&queue);
wm_ptrarray_free(&client_nodes);
return ret;
}

2
util.h
View File

@ -65,7 +65,7 @@ struct TreeNode {
TreeNode wm_treenode_new(NodeType type, TreeNode *parent);
bool wm_treenode_is_empty(TreeNode *node);
void wm_treenode_split_space(TreeNode *node, Rect *ret1, Rect *ret2);
void wm_treenode_remove_client(TreeNode *root, Client *client);
TreeNode* wm_treenode_remove_client(TreeNode *root, Client *client);
NodeArray wm_nodearray_new();
void wm_nodearray_push(NodeArray *arr, TreeNode node);