mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-04-03 07:15:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: cleanup layer scene node when cleanupmon

Browse source
This commit is contained in:
DreamMaoMao 2026-02-27 16:17:04 +08:00
parent c2ed0a48d8
commit 4ed671d30a
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/animation/client.h
View file

@ -521,7 +521,7 @@ void client_animation_next_tick(Client *c) {
void init_fadeout_client(Client *c) { void init_fadeout_client(Client *c) {
if (!c->mon || client_is_unmanaged(c)) if (!c->mon || client_is_unmanaged(c) || c->mon->iscleanuping)
return; return;
if (!c->scene) { if (!c->scene) {

2
src/animation/layer.h
View file

@ -325,7 +325,7 @@ void init_fadeout_layers(LayerSurface *l) {
return; return;
} }
if (!l->mon || !l->scene) if (!l->mon || !l->scene || l->mon->iscleanuping)
return; return;
if ((l->animation_type_close && if ((l->animation_type_close &&

25
src/mango.c
View file

@ -519,6 +519,7 @@ struct Monitor {
uint32_t resizing_count_pending; uint32_t resizing_count_pending;
uint32_t resizing_count_current; uint32_t resizing_count_current;
struct wlr_scene_tree *layers_scene_tree[NUM_LAYERS]; struct wlr_scene_tree *layers_scene_tree[NUM_LAYERS];
bool iscleanuping;
struct wl_list dwl_ipc_outputs; struct wl_list dwl_ipc_outputs;
int32_t gappih; /* horizontal gap between windows */ int32_t gappih; /* horizontal gap between windows */
@ -2254,11 +2255,27 @@ void cleanupmon(struct wl_listener *listener, void *data) {
Monitor *m = wl_container_of(listener, m, destroy); Monitor *m = wl_container_of(listener, m, destroy);
LayerSurface *l = NULL, *tmp = NULL; LayerSurface *l = NULL, *tmp = NULL;
uint32_t i; uint32_t i;
m->iscleanuping = true;
/* m->layers[i] are intentionally not unlinked */ /* m->layers[i] are intentionally not unlinked */
for (i = 0; i < LENGTH(m->layers); i++) { for (i = 0; i < LENGTH(m->layers); i++) {
wl_list_for_each_safe(l, tmp, &m->layers[i], link) wl_list_for_each_safe(l, tmp, &m->layers[i], link) {
wlr_layer_surface_v1_destroy(l->layer_surface); wlr_layer_surface_v1_destroy(l->layer_surface);
}
}
LayerSurface *l_tmp, *l_safe;
wl_list_for_each_safe(l_tmp, l_safe, &fadeout_layers, fadeout_link) {
if (l_tmp->mon == m) {
wlr_scene_node_reparent(&l_tmp->scene->node, layers[LyrFadeOut]);
}
}
Client *c_tmp, *c_safe;
wl_list_for_each_safe(c_tmp, c_safe, &fadeout_clients, link) {
if (c_tmp->mon == m) {
wlr_scene_node_reparent(&c_tmp->scene->node, layers[LyrFadeOut]);
}
} }
// clean ext-workspaces grouplab // clean ext-workspaces grouplab
@ -2285,6 +2302,11 @@ void cleanupmon(struct wl_listener *listener, void *data) {
} }
m->wlr_output->data = NULL; m->wlr_output->data = NULL;
for (i = 0; i < NUM_LAYERS; i++) {
wlr_scene_node_destroy(&m->layers_scene_tree[i]->node);
}
free(m->pertag); free(m->pertag);
free(m); free(m);
} }
@ -2854,6 +2876,7 @@ void createmon(struct wl_listener *listener, void *data) {
m->skiping_frame = false; m->skiping_frame = false;
m->resizing_count_pending = 0; m->resizing_count_pending = 0;
m->resizing_count_current = 0; m->resizing_count_current = 0;
m->iscleanuping = false;
m->wlr_output = wlr_output; m->wlr_output = wlr_output;
m->wlr_output->data = m; m->wlr_output->data = m;