mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-22 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for redundant splits after killing container

Browse source
This commit is contained in:
Kogasa 2022-05-04 23:34:03 -05:00
parent a7898637de
commit 9a26da3c6b
1 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

48
sway/commands/kill.c
View file

@ -6,9 +6,57 @@
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
#include "sway/commands.h" #include "sway/commands.h"
/** Killing x from either A[x B[y]] or A[C[x] B[y]]
* leaves A[B[y]], which should be flattened to B[y].
* obsolete_if_killed(x) returns B.
*/
struct sway_container *obsolete_if_killed(struct sway_container *con) {
if (container_get_siblings(con)->length==1) {
if (con->pending.parent) {
con = con->pending.parent;
} else {
return con;
}
}
if (container_get_siblings(con)->length !=2) {
return con;
}
list_t *siblings = container_get_siblings(con);
int idX = list_find(siblings, con);
struct sway_container *sibling = siblings->items[1 - idX];
if (sibling->view || !sibling->pending.layout) {
return con;
}
sway_log(SWAY_DEBUG, "Killing %p will obsolete %p", con, sibling);
return sibling;
}
void flatten_obsolete(struct sway_container *obs) {
enum sway_container_layout layout = obs->pending.layout;
if (obs->pending.parent) {
obs->pending.parent->pending.layout = layout;
} else if (obs->pending.workspace) {
obs->pending.workspace->layout = layout;
}
while (obs->pending.children->length) {
struct sway_container *current = obs->pending.children->items[0];
container_detach(current);
container_add_sibling(obs, current, 0);
}
container_detach(obs);
container_begin_destroy(obs);
return;
}
static void close_container_iterator(struct sway_container *con, void *data) { static void close_container_iterator(struct sway_container *con, void *data) {
if (con->view) { if (con->view) {
struct sway_container *obs = obsolete_if_killed(con);
view_close(con->view); view_close(con->view);
if (obs && obs != con) {
flatten_obsolete(obs);
}
} }
} }