From: Po Lu <luangruo@yahoo.com>
Date: Mon, 12 Sep 2022 06:01:52 +0000 (+0800)
Subject: Fix focus restoration upon x_mouse_leave again
X-Git-Tag: emacs-29.0.90~1856^2~593
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=239bad7921fc38891dc4ee09b57c96d32100f19f;p=emacs.git

Fix focus restoration upon x_mouse_leave again

* src/xterm.c (x_mouse_leave): Call xi_handle_focus_change after
changing the implicit focus.
---

diff --git a/src/xterm.c b/src/xterm.c
index 12234351a32..48502f12d8d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13213,8 +13213,13 @@ x_mouse_leave (struct x_display_info *dpyinfo)
 
       device = xi_device_from_id (dpyinfo, dpyinfo->client_pointer_device);
 
-      if (device)
-	device->focus_implicit_frame = NULL;
+      if (device && device->focus_implicit_frame)
+	{
+	  device->focus_implicit_frame = NULL;
+
+	  /* The focus might have changed; compute the new focus.  */
+	  xi_handle_focus_change (dpyinfo);
+	}
     }
 #endif
 }