From: Po Lu <luangruo@yahoo.com>
Date: Fri, 25 Nov 2022 11:35:14 +0000 (+0800)
Subject: Fix no-accept-focus handling for embedded frames
X-Git-Tag: emacs-29.0.90~1501
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=123e90f6d349ca8882973db74007cb5d9067305c;p=emacs.git

Fix no-accept-focus handling for embedded frames

* src/xterm.c (handle_one_xevent): Don't focus embedded frames
on click if they have `no-accept-focus' set.
---

diff --git a/src/xterm.c b/src/xterm.c
index 7d855c92ccb..ec605f5e914 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -21430,7 +21430,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 		  if (!NILP (tab_bar_arg))
 		    inev.ie.arg = tab_bar_arg;
                 }
-            if (FRAME_X_EMBEDDED_P (f))
+
+            if (FRAME_X_EMBEDDED_P (f)
+		&& !FRAME_NO_ACCEPT_FOCUS (f))
               xembed_send_message (f, event->xbutton.time,
                                    XEMBED_REQUEST_FOCUS, 0, 0, 0);
           }
@@ -23198,7 +23200,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 			if (!NILP (tab_bar_arg))
 			  inev.ie.arg = tab_bar_arg;
 		      }
-		  if (FRAME_X_EMBEDDED_P (f))
+
+		  if (FRAME_X_EMBEDDED_P (f)
+		      && !FRAME_NO_ACCEPT_FOCUS (f))
 		    xembed_send_message (f, xev->time,
 					 XEMBED_REQUEST_FOCUS, 0, 0, 0);
 		}