aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-11-25 19:35:14 +0800
committerPo Lu2022-11-26 08:47:25 +0800
commit123e90f6d349ca8882973db74007cb5d9067305c (patch)
treee6881d32a47bb08f77b6c25ac28e6eb742c1a2f4 /src
parent2389158a31b4a126a328146399fe7ef304c97fef (diff)
downloademacs-123e90f6d349ca8882973db74007cb5d9067305c.tar.gz
emacs-123e90f6d349ca8882973db74007cb5d9067305c.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c8
1 files changed, 6 insertions, 2 deletions
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,
21430 if (!NILP (tab_bar_arg)) 21430 if (!NILP (tab_bar_arg))
21431 inev.ie.arg = tab_bar_arg; 21431 inev.ie.arg = tab_bar_arg;
21432 } 21432 }
21433 if (FRAME_X_EMBEDDED_P (f)) 21433
21434 if (FRAME_X_EMBEDDED_P (f)
21435 && !FRAME_NO_ACCEPT_FOCUS (f))
21434 xembed_send_message (f, event->xbutton.time, 21436 xembed_send_message (f, event->xbutton.time,
21435 XEMBED_REQUEST_FOCUS, 0, 0, 0); 21437 XEMBED_REQUEST_FOCUS, 0, 0, 0);
21436 } 21438 }
@@ -23198,7 +23200,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
23198 if (!NILP (tab_bar_arg)) 23200 if (!NILP (tab_bar_arg))
23199 inev.ie.arg = tab_bar_arg; 23201 inev.ie.arg = tab_bar_arg;
23200 } 23202 }
23201 if (FRAME_X_EMBEDDED_P (f)) 23203
23204 if (FRAME_X_EMBEDDED_P (f)
23205 && !FRAME_NO_ACCEPT_FOCUS (f))
23202 xembed_send_message (f, xev->time, 23206 xembed_send_message (f, xev->time,
23203 XEMBED_REQUEST_FOCUS, 0, 0, 0); 23207 XEMBED_REQUEST_FOCUS, 0, 0, 0);
23204 } 23208 }