procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix child frame focus for MPX environments

Browse source 
* src/xterm.c (handle_one_xevent): Set child frame click-to
focus on the pointer device's attachment.
This commit is contained in:
Po Lu 2022-08-22 09:50:45 +08:00
parent 15d628f196
commit e154ba196a
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/xterm.c
View file

@ -20270,7 +20270,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
{
block_input ();
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
RevertToParent, CurrentTime);
RevertToParent, event->xbutton.time);
if (FRAME_PARENT_FRAME (f))
XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
unblock_input ();
@ -21852,8 +21852,26 @@ handle_one_xevent (struct x_display_info *dpyinfo,
if (FRAME_PARENT_FRAME (f) || (hf && frame_ancestor_p (f, hf)))
{
block_input ();
#if defined HAVE_GTK3 || (!defined USE_GTK && !defined USE_X_TOOLKIT)
if (device)
{
/* This can generate XI_BadDevice if the
device's attachment was destroyed
server-side. */
x_ignore_errors_for_next_request (dpyinfo);
XISetFocus (dpyinfo->display, device->attachment,
/* Note that the input extension
only supports RevertToParent-type
behavior. */
FRAME_OUTER_WINDOW (f), xev->time);
x_stop_ignoring_errors (dpyinfo);
}
#else
/* Non-no toolkit builds without GTK 3 use core
events to handle focus. */
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
RevertToParent, CurrentTime);
RevertToParent, xev->time);
#endif
if (FRAME_PARENT_FRAME (f))
XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
unblock_input ();