mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-11-02 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: crash when selmon sel set foreign toplevel status

Browse source
This commit is contained in:
DreamMaoMao 2025-04-21 07:29:41 +08:00
parent cd919f7afd
commit 1609976954
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/maomao.c
View file

@ -2295,6 +2295,9 @@ buttonpress(struct wl_listener *listener, void *data) {
wlr_seat_pointer_clear_focus(seat); wlr_seat_pointer_clear_focus(seat);
motionnotify(0, NULL, 0, 0, 0, 0); motionnotify(0, NULL, 0, 0, 0, 0);
/* Drop the window off on its new monitor */ /* Drop the window off on its new monitor */
if(grabc == selmon->sel){
selmon->sel = NULL;
}
selmon = xytomon(cursor->x, cursor->y); selmon = xytomon(cursor->x, cursor->y);
setmon(grabc, selmon, 0, true); setmon(grabc, selmon, 0, true);
reset_foreign_tolevel(grabc); reset_foreign_tolevel(grabc);
@ -5251,6 +5254,15 @@ void setmon(Client *c, Monitor *m, uint32_t newtags, bool focus) {
if (oldmon == m) if (oldmon == m)
return; return;
if (oldmon && oldmon->sel == c) {
oldmon->sel = NULL;
}
if (oldmon && oldmon->prevsel == c) {
oldmon->prevsel = NULL;
}
c->mon = m; c->mon = m;
c->prev = c->geom; c->prev = c->geom;
@ -6523,6 +6535,7 @@ void init_fadeout_client(Client *c) {
void unmapnotify(struct wl_listener *listener, void *data) { void unmapnotify(struct wl_listener *listener, void *data) {
/* Called when the surface is unmapped, and should no longer be shown. */ /* Called when the surface is unmapped, and should no longer be shown. */
Client *c = wl_container_of(listener, c, unmap); Client *c = wl_container_of(listener, c, unmap);
Monitor *m;
c->iskilling = 1; c->iskilling = 1;
if (animations && !c->isminied && (!c->mon || VISIBLEON(c, c->mon))) if (animations && !c->isminied && (!c->mon || VISIBLEON(c, c->mon)))
@ -6538,18 +6551,26 @@ void unmapnotify(struct wl_listener *listener, void *data) {
grabc = NULL; grabc = NULL;
} }
if (c->mon && c == c->mon->prevsel) wl_list_for_each(m, &mons, link) {
c->mon->prevsel = NULL; if (!m->wlr_output->enabled) {
continue;
}
if(c == m->sel){
m->sel = NULL;
}
if(c == m->prevsel){
m->prevsel = NULL;
}
}
if (c->mon && c == c->mon->sel) { if (c->mon && c->mon == selmon) {
c->mon->sel = NULL; Client *nextfocus = focustop(selmon);
Client *nextfocus = focustop(c->mon);
if (nextfocus && c->mon && c->mon == selmon) { if (nextfocus) {
focusclient(nextfocus, 0); focusclient(nextfocus, 0);
} }
if (!nextfocus && selmon->isoverview && c->mon && c->mon == selmon) { if (!nextfocus && selmon->isoverview) {
Arg arg = {0}; Arg arg = {0};
toggleoverview(&arg); toggleoverview(&arg);
} }