Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid interference between child frame deletion and recentering

Browse source 
* src/frame.c (delete_frame) [HAVE_X_WINDOWS]: Block input while
child frame is displayed, and process the X events triggered by
that later.  Patch by Byakuren (https://web.liminal.cafe/~byakuren/).
(Bug#76186)

Copyright-paperwork-exempt: yes
This commit is contained in:
Eli Zaretskii 2026-01-29 13:38:22 +02:00
parent 80551807d4
commit 792097d747
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/frame.c
View file

@ -2887,6 +2887,15 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
promise that the terminal of the frame must be valid until we
have called the window-system-dependent frame destruction
routine. */
/* Remember if this was a GUI child frame, so we can
process pending window system events after destruction. */
bool was_gui_child_frame = FRAME_WINDOW_P (f) && FRAME_PARENT_FRAME (f);
#ifdef HAVE_X_WINDOWS
/* Save the X display before the frame is destroyed, so we can
sync with the X server afterwards. */
Display *child_frame_display = (was_gui_child_frame && FRAME_X_P (f)
? FRAME_X_DISPLAY (f) : NULL);
#endif
{
struct terminal *terminal;
block_input ();
@ -2896,6 +2905,24 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
f->terminal = 0; /* Now the frame is dead. */
unblock_input ();
/* When a GUI child frame is deleted, the window system may
generate events that affect the parent frame (e.g.
ConfigureNotify, Expose, etc.). We need to sync with the
X server to ensure all events from the frame destruction
have been received, then process them to ensure subsequent
operations like `recenter' see up-to-date window state.
(Bug#76186) */
#ifdef HAVE_X_WINDOWS
if (child_frame_display)
{
block_input ();
XSync (child_frame_display, False);
unblock_input ();
}
#endif
if (was_gui_child_frame)
swallow_events (false);
/* Clear markers and overlays set by F on behalf of an input
method. */
#ifdef HAVE_TEXT_CONVERSION