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

fix: fix swallow conflict group

Browse source
This commit is contained in:
DreamMaoMao 2026-06-29 16:41:23 +08:00
parent cbd37f388c
commit 0cafd91c72
2 changed files with 61 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/action/client.h
View file

@ -160,7 +160,7 @@ void client_focus_group_member(Client *c) {
cur_focusing->isgroupfocusing = false;
c->mon = cur_focusing->mon;
client_replace(c, cur_focusing, true);
client_replace(c, cur_focusing, true, false);
mango_group_bar_set_focus(cur_focusing->group_bar, false);
c->isgroupfocusing = true;

100
src/mango.c
View file

@ -817,7 +817,8 @@ static void clear_fullscreen_flag(Client *c);
static pid_t getparentprocess(pid_t p);
static int32_t isdescprocess(pid_t p, pid_t c);
static Client *termforwin(Client *w);
static void client_replace(Client *c, Client *w, bool isgroupaction);
static void client_replace(Client *c, Client *w, bool is_group_change_member,
bool is_swallow);
static void warp_cursor_to_selmon(Monitor *m);
uint32_t want_restore_fullscreen(Client *target_client);
@ -1301,7 +1302,8 @@ void client_update_oldmonname_record(Client *c, Monitor *m) {
c->oldmonname[sizeof(c->oldmonname) - 1] = '\0';
}
void client_replace(Client *c, Client *w, bool isgroupaction) {
void client_replace(Client *c, Client *w, bool is_group_change_member,
bool is_swallow) {
c->bw = w->bw;
c->isfloating = w->isfloating;
c->isurgent = w->isurgent;
@ -1318,41 +1320,61 @@ void client_replace(Client *c, Client *w, bool isgroupaction) {
c->overview_backup_geom = w->overview_backup_geom;
c->animation.current = w->animation.current;
c->stack_proportion = w->stack_proportion;
c->is_logic_hide = w->is_logic_hide;
if (!isgroupaction) {
if (w->group_prev == c) {
c->group_next = w->group_next;
if (w->group_next) {
w->group_next->group_prev = c;
}
} else if (w->group_next == c) {
c->group_prev = w->group_prev;
if (w->group_prev) {
w->group_prev->group_next = c;
}
} else {
c->group_prev = w->group_prev;
c->group_next = w->group_next;
if (w->group_prev) {
w->group_prev->group_next = c;
}
if (w->group_next) {
w->group_next->group_prev = c;
}
if (is_swallow) {
c->group_prev = w->group_prev;
c->group_next = w->group_next;
if (w->group_prev) {
w->group_prev->group_next = c;
}
if (w->group_next) {
w->group_next->group_prev = c;
}
w->group_next = NULL;
w->group_prev = NULL;
if (!c->group_prev && !c->group_next) {
c->isgroupfocusing = false;
} else {
if (!w->is_logic_hide) {
c->isgroupfocusing = w->isgroupfocusing;
} else {
c->isgroupfocusing = false;
}
if (c->isgroupfocusing)
mango_group_bar_set_focus(c->group_bar, true);
} else {
if (!is_group_change_member) {
if (w->group_prev == c) {
c->group_next = w->group_next;
if (w->group_next) {
w->group_next->group_prev = c;
}
} else if (w->group_next == c) {
c->group_prev = w->group_prev;
if (w->group_prev) {
w->group_prev->group_next = c;
}
} else {
c->group_prev = w->group_prev;
c->group_next = w->group_next;
if (w->group_prev) {
w->group_prev->group_next = c;
}
if (w->group_next) {
w->group_next->group_prev = c;
}
}
if (!c->group_prev && !c->group_next) {
c->isgroupfocusing = false;
} else {
c->isgroupfocusing = w->isgroupfocusing;
}
}
}
w->is_logic_hide = true;
mango_group_bar_set_focus(c->group_bar, c->isgroupfocusing);
if (w->overview_scene_surface) {
wlr_scene_node_reparent(&w->shield->node, w->overview_scene_surface);
@ -1367,16 +1389,18 @@ void client_replace(Client *c, Client *w, bool isgroupaction) {
overview_backup_surface(c);
}
if (w->group_bar && !isgroupaction) {
if (w->group_bar && !is_group_change_member) {
wlr_scene_node_set_enabled(&w->group_bar->scene_buffer->node, false);
}
wl_list_safe_reinsert_next(&w->link, &c->link);
wl_list_safe_reinsert_prev(&w->flink, &c->flink);
wlr_scene_node_set_enabled(&w->scene->node, false);
w->is_logic_hide = true;
c->is_logic_hide = false;
if (!c->is_logic_hide) {
wlr_scene_node_set_enabled(&c->scene->node, true);
wlr_scene_node_set_enabled(&c->scene_surface->node, true);
}
if (w->foreign_toplevel) {
wlr_foreign_toplevel_handle_v1_output_leave(w->foreign_toplevel,
@ -1385,10 +1409,6 @@ void client_replace(Client *c, Client *w, bool isgroupaction) {
w->foreign_toplevel = NULL;
}
wlr_scene_node_set_enabled(&w->scene->node, false);
wlr_scene_node_set_enabled(&c->scene->node, true);
wlr_scene_node_set_enabled(&c->scene_surface->node, true);
if (!c->foreign_toplevel && c->mon)
add_foreign_toplevel(c);
else if (c->foreign_toplevel && c->mon) {
@ -1845,7 +1865,7 @@ void applyrules(Client *c) {
c->swallowing = p;
p->swallowdby = c;
client_replace(c, p, false);
client_replace(c, p, false, true);
mon = p->mon;
newtags = p->tags;
@ -6679,12 +6699,12 @@ void unmapnotify(struct wl_listener *listener, void *data) {
if (c->swallowing) {
c->swallowing->mon = c->mon;
client_replace(c->swallowing, c, false);
client_replace(c->swallowing, c, false, true);
} else if ((c->group_next || c->group_prev) && c->isgroupfocusing) {
Client *group_replacement =
c->group_next ? c->group_next : c->group_prev;
group_replacement->mon = c->mon;
client_replace(group_replacement, c, false);
client_replace(group_replacement, c, false, false);
} else {
scroller_remove_client(c);
dwindle_remove_client(c);