From 43a3c2426a10dccbf86e77b23518191a70f8e077 Mon Sep 17 00:00:00 2001
From: DreamMaoMao <2523610504@qq.com>
Date: Sun, 6 Apr 2025 13:44:09 +0800
Subject: [PATCH] fix: avoid use unmananged client as root_client

---
 maomao.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/maomao.c b/maomao.c
index 4009c04..82048a6 100644
--- a/maomao.c
+++ b/maomao.c
@@ -1694,7 +1694,7 @@ Client *center_select(Monitor* m) {
   int dirx,diry;
   long int distance;
   wl_list_for_each(c, &clients, link) {
-    if (c && VISIBLEON(c, m) && client_surface(c)->mapped && !c->isfloating) {
+    if (c && VISIBLEON(c, m) && client_surface(c)->mapped && !c->isfloating && !client_is_unmanaged(c)) {
       dirx = c->geom.x + c->geom.width / 2 - (m->w.x + m->w.width / 2);
       diry = c->geom.y + c->geom.height / 2 - (m->w.y + m->w.height / 2);
       distance = dirx * dirx + diry * diry;
@@ -3943,18 +3943,19 @@ mapnotify(struct wl_listener *listener, void *data) {
   c->scroller_proportion = scroller_default_proportion;
   c->need_scale_first_frame = true;
   // nop
+
   if (new_is_master &&
       strcmp(selmon->pertag->ltidxs[selmon->pertag->curtag]->name,
              "scroller") != 0)
     // tile at the top
     wl_list_insert(&clients, &c->link); // 新窗口是master,头部入栈
   else if (strcmp(selmon->pertag->ltidxs[selmon->pertag->curtag]->name,
-                  "scroller") == 0 &&
-           selmon->sel && ISTILED(selmon->sel)) {
-    selmon->sel->link.next->prev = &c->link;
-    c->link.prev = &selmon->sel->link;
-    c->link.next = selmon->sel->link.next;
-    selmon->sel->link.next = &c->link;
+                  "scroller") == 0 && center_select(selmon)) {
+    Client *at_client = center_select(selmon);
+    at_client->link.next->prev = &c->link;
+    c->link.prev = &at_client->link;
+    c->link.next = at_client->link.next;
+    at_client->link.next = &c->link;
   } else
     wl_list_insert(clients.prev, &c->link); // 尾部入栈
   wl_list_insert(&fstack, &c->flink);
@@ -5905,7 +5906,7 @@ void scroller(Monitor *m, unsigned int gappo, unsigned int gappi) {
 
   // 第一次遍历，计算 n 的值
   wl_list_for_each(c, &clients, link) {
-    if (VISIBLEON(c, c->mon) && !c->isfloating && !c->isfullscreen &&
+    if (VISIBLEON(c, c->mon) && !client_is_unmanaged(c) && !c->isfloating && !c->isfullscreen &&
         !c->ismaxmizescreen && !c->iskilling && !c->animation.tagouting &&
         c->mon == m) {
       n++;
@@ -5926,7 +5927,7 @@ void scroller(Monitor *m, unsigned int gappo, unsigned int gappi) {
   // 第二次遍历，填充 tempClients
   n = 0;
   wl_list_for_each(c, &clients, link) {
-    if (VISIBLEON(c, c->mon) && !c->isfloating && !c->isfullscreen &&
+    if (VISIBLEON(c, c->mon) && !client_is_unmanaged(c) && !c->isfloating && !c->isfullscreen &&
         !c->ismaxmizescreen && !c->iskilling && !c->animation.tagouting &&
         c->mon == m) {
       tempClients[n] = c;
@@ -5945,10 +5946,10 @@ void scroller(Monitor *m, unsigned int gappo, unsigned int gappi) {
     return;
   }
 
-  if (m->sel && !m->sel->isfloating && !m->sel->ismaxmizescreen &&
+  if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating && !m->sel->ismaxmizescreen &&
       !m->sel->isfullscreen) {
     root_client = m->sel;
-  } else if (m->prevsel && !m->prevsel->isfloating &&
+  } else if (m->prevsel && !client_is_unmanaged(m->prevsel) && !m->prevsel->isfloating &&
              !m->prevsel->ismaxmizescreen && !m->prevsel->isfullscreen) {
     root_client = m->prevsel;
   } else {