From: Po Lu <luangruo@yahoo.com>
Date: Wed, 21 Sep 2022 06:23:13 +0000 (+0800)
Subject: Fix minor thinko in focus tracking logic
X-Git-Tag: emacs-29.0.90~1856^2~340
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df79a23da7ac5664ae83b8a05dc725f0a3f20ac3;p=emacs.git

Fix minor thinko in focus tracking logic

* src/xterm.c (xi_handle_focus_change): Prefer explicit focus to
implicit focus.
---

diff --git a/src/xterm.c b/src/xterm.c
index 59cde718d09..97c070736c2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12647,9 +12647,11 @@ xi_handle_focus_change (struct x_display_info *dpyinfo)
 	  else
 	    dpyinfo->client_pointer_device = device->device_id;
 	}
-
-      if (device->focus_implicit_frame
-	  && device->focus_implicit_time > time)
+      /* Even if the implicit focus was set after the explicit focus
+	 on this specific device, the explicit focus is what really
+	 matters.  So use it instead.  */
+      else if (device->focus_implicit_frame
+	       && device->focus_implicit_time > time)
 	{
 	  new = device->focus_implicit_frame;
 	  time = device->focus_implicit_time;