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

fix treenode removal edge case

Browse Source
This commit is contained in:
Akos Horvath
2023-07-04 16:08:04 +02:00
parent 3252773ff7
commit 6db707686a
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.c
View File

@ -244,7 +244,7 @@ void wm_client_kill(Wm *wm, Client *c)
if (XSendEvent(wm->display, c->window, false, NoEventMask, &event) != Success) if (XSendEvent(wm->display, c->window, false, NoEventMask, &event) != Success)
XKillClient(wm->display, c->window); XKillClient(wm->display, c->window);
TreeNode* parent = wm_treenode_remove_client(&c->ws->tree, c); TreeNode* parent = wm_treenode_remove_client(wm, &c->ws->tree, c);
wm_client_free(wm, c); wm_client_free(wm, c);

25
src/util.c
View File

@ -43,7 +43,7 @@ void wm_treenode_split_space(TreeNode *node, Rect *ret1, Rect *ret2)
ret1->x = node->pos.x; ret1->x = node->pos.x;
ret1->y = node->pos.y; ret1->y = node->pos.y;
ret2->x = node->pos.x + ret1->w + 1; ret2->x = node->pos.x + ret1->w;
ret2->y = node->pos.y; ret2->y = node->pos.y;
return; return;
case NODE_HORIZONTAL: case NODE_HORIZONTAL:
@ -56,7 +56,7 @@ void wm_treenode_split_space(TreeNode *node, Rect *ret1, Rect *ret2)
ret1->y = node->pos.y; ret1->y = node->pos.y;
ret2->x = node->pos.x; ret2->x = node->pos.x;
ret2->y = node->pos.y + ret1->h + 1; ret2->y = node->pos.y + ret1->h;
return; return;
default: default:
fprintf(stderr, "wm: unhandled treenode type %d in %s, exiting.\n", fprintf(stderr, "wm: unhandled treenode type %d in %s, exiting.\n",
@ -176,7 +176,7 @@ TreeNode* wm_treenode_split_get_sibling(TreeNode *node)
return NULL; return NULL;
} }
TreeNode* wm_treenode_remove_client(TreeNode *root, Client *client) TreeNode* wm_treenode_remove_client(Wm *wm, TreeNode *root, Client *client)
{ {
DEBUG_PRINT("%s\n", __func__); DEBUG_PRINT("%s\n", __func__);
TreeNode *client_node = wm_treenode_ptr_find_client_node(root, client); TreeNode *client_node = wm_treenode_ptr_find_client_node(root, client);
@ -207,16 +207,31 @@ TreeNode* wm_treenode_remove_client(TreeNode *root, Client *client)
TreeNode *sibling_node = wm_treenode_split_get_sibling(client_node); TreeNode *sibling_node = wm_treenode_split_get_sibling(client_node);
wm_nodearray_free(&client_node->children); wm_nodearray_free(&client_node->children);
wm_nodearray_free(&node->children); // wm_nodearray_free(&node->children);
// TODO
size_t dock_y = 0;
if (node->parent == NULL) { if (node->parent == NULL) {
// parent is root node // parent is root node
DEBUG_PRINT("parent is root node!\n");
sibling_node->parent = NULL; sibling_node->parent = NULL;
client->ws->tree = *sibling_node; client->ws->tree = *sibling_node;
client->ws->tree.pos = (Rect) {
.x = wm->cfg_border_width, .y = wm->cfg_border_width + dock_y ,
.w = client->ws->monitor->info.width - wm->cfg_border_width*2,
.h = client->ws->monitor->info.height - wm->cfg_border_width*2 - dock_y,
};
assert(client->ws->tree.children.size == 2);
wm_treenode_split_space(&client->ws->tree, &client->ws->tree.children.nodes[0].pos,
&client->ws->tree.children.nodes[1].pos);
} else } else
*node = *sibling_node; *node = *sibling_node;
return node; assert(client->ws->tree.children.size >= 1);
return &node->children.nodes[0];
} }
NodeArray wm_nodearray_new() NodeArray wm_nodearray_new()

2
src/util.h
View File

@ -65,7 +65,7 @@ struct TreeNode {
TreeNode wm_treenode_new(NodeType type, TreeNode *parent); TreeNode wm_treenode_new(NodeType type, TreeNode *parent);
bool wm_treenode_is_empty(TreeNode *node); bool wm_treenode_is_empty(TreeNode *node);
void wm_treenode_split_space(TreeNode *node, Rect *ret1, Rect *ret2); void wm_treenode_split_space(TreeNode *node, Rect *ret1, Rect *ret2);
TreeNode* wm_treenode_remove_client(TreeNode *root, Client *client); TreeNode* wm_treenode_remove_client(Wm *wm, TreeNode *root, Client *client);
void wm_treenode_remove_node(TreeNode *root, unsigned int node_id); void wm_treenode_remove_node(TreeNode *root, unsigned int node_id);
int wm_get_node_index(TreeNode *parent, unsigned int node_id); int wm_get_node_index(TreeNode *parent, unsigned int node_id);
void wm_tree_to_DOT(TreeNode *root, const char *filename); void wm_tree_to_DOT(TreeNode *root, const char *filename);