From 98d0b962807914fcecda39283de3872e64b60c6b Mon Sep 17 00:00:00 2001
From: DreamMaoMao <2523610504@qq.com>
Date: Sun, 5 Oct 2025 18:21:19 +0800
Subject: [PATCH] fix: confuse focus for xim popup window when re-map client by
 click tray

---
 src/mango.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mango.c b/src/mango.c
index aff8b9a..9fc9e4c 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -4568,8 +4568,10 @@ void setmon(Client *c, Monitor *m, unsigned int newtags, bool focus) {
 		setfloating(c, c->isfloating);
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 	}
-	if (m && focus)
-		focusclient(focustop(m), 1);
+
+	if (focus) {
+		focusclient(focustop(selmon), 1);
+	}
 
 	if (m) {