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

opt: optimize swallow in ipc action

Browse source
This commit is contained in:
DreamMaoMao 2026-06-29 12:07:45 +08:00
parent 76de8206dd
commit e914d76acd
8 changed files with 55 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/mango.c
View file

@ -432,7 +432,7 @@ struct Client {
int32_t force_fakemaximize;
int32_t force_tiled_state;
pid_t pid;
Client *swallowing, *swallowedby;
Client *swallowdby, *swallowing;
bool is_clip_to_hide;
bool drag_to_tile;
bool scratchpad_switching_mon;
@ -1719,7 +1719,7 @@ void client_reset_mon_tags(Client *c, Monitor *mon, uint32_t newtags) {
}
void check_match_tag_floating_rule(Client *c, Monitor *mon) {
if (c->tags && !c->isfloating && mon && !c->swallowedby &&
if (c->tags && !c->isfloating && mon && !c->swallowing &&
mon->pertag->open_as_floating[get_tags_first_tag_num(c->tags)]) {
c->isfloating = 1;
}
@ -1849,8 +1849,8 @@ void applyrules(Client *c) {
!c->surface.xdg->initial_commit) {
Client *p = termforwin(c);
if (p && !p->isminimized) {
c->swallowedby = p;
p->swallowing = c;
c->swallowing = p;
p->swallowdby = c;
client_replace(c, p, false);
@ -4568,8 +4568,8 @@ void init_client_properties(Client *c) {
c->overview_ismaximizescreenbak = 0;
c->overview_isfloatingbak = 0;
c->pid = 0;
c->swallowdby = NULL;
c->swallowing = NULL;
c->swallowedby = NULL;
c->ismaster = 0;
c->old_ismaster = 0;
c->isleftstack = 0;
@ -6798,16 +6798,11 @@ void unmapnotify(struct wl_listener *listener, void *data) {
(!c->mon || VISIBLEON(c, c->mon)))
init_fadeout_client(c);
if (c->ext_foreign_toplevel) {
wlr_ext_foreign_toplevel_handle_v1_destroy(c->ext_foreign_toplevel);
c->ext_foreign_toplevel = NULL;
}
// If the client is in a stack, remove it from the stack
if (c->swallowedby) {
c->swallowedby->mon = c->mon;
client_replace(c->swallowedby, c, false);
if (c->swallowing) {
c->swallowing->mon = c->mon;
client_replace(c->swallowing, c, false);
} else if ((c->group_next || c->group_prev) && c->isgroupfocusing) {
Client *group_replacement =
c->group_next ? c->group_next : c->group_prev;
@ -6840,9 +6835,9 @@ void unmapnotify(struct wl_listener *listener, void *data) {
}
if (c->mon && c->mon == selmon) {
if (next_node && !c->swallowedby) {
if (next_node && !c->swallowing) {
nextfocus = next_node->client;
} else if (prev_node && !c->swallowedby) {
} else if (prev_node && !c->swallowing) {
nextfocus = prev_node->client;
} else {
nextfocus = focustop(selmon);
@ -6895,30 +6890,43 @@ void unmapnotify(struct wl_listener *listener, void *data) {
c->foreign_toplevel = NULL;
}
if (c->swallowedby) {
setmaximizescreen(c->swallowedby, c->ismaximizescreen, true);
setfullscreen(c->swallowedby, c->isfullscreen, true);
c->swallowedby->swallowing = NULL;
c->swallowedby = NULL;
if (c->ext_foreign_toplevel) {
wlr_ext_foreign_toplevel_handle_v1_destroy(c->ext_foreign_toplevel);
c->ext_foreign_toplevel = NULL;
}
if (c->swallowing) {
c->swallowing->swallowedby = NULL;
setmaximizescreen(c->swallowing, c->ismaximizescreen, true);
setfullscreen(c->swallowing, c->isfullscreen, true);
c->swallowing->swallowdby = NULL;
c->swallowing = NULL;
}
if (c->swallowdby) {
c->swallowdby->swallowing = NULL;
c->swallowdby = NULL;
}
if (c->jump_label_node) {
mango_jump_label_node_destroy(c->jump_label_node);
c->jump_label_node = NULL;
}
if (c->group_bar) {
mango_group_bar_destroy(c->group_bar);
c->group_bar = NULL;
}
wlr_scene_node_destroy(&c->image_capture_scene_surface->buffer->node);
wlr_scene_node_destroy(&c->image_capture_scene->tree.node);
if (c->image_capture_tree) {
wlr_scene_node_destroy(&c->image_capture_tree->node);
c->image_capture_tree = NULL;
}
if (c->image_capture_scene) {
wlr_scene_node_destroy(&c->image_capture_scene->tree.node);
c->image_capture_scene = NULL;
}
c->image_capture_source = NULL;
init_client_properties(c);
wlr_scene_node_destroy(&c->scene->node);
@ -7310,7 +7318,7 @@ void activatex11(struct wl_listener *listener, void *data) {
if (!c || c->iskilling || !c->foreign_toplevel || client_is_unmanaged(c))
return;
if (c && c->swallowing)
if (c && c->swallowdby)
return;
if (c->isminimized) {