mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Prevent freezes on macOS (bug#69561)

Browse source 
* src/nsterm.m (ns_select_1): Store pending input_events. Always call
[NSApp run].
This commit is contained in:
Gerd Möllmann 2024-03-09 15:06:29 +01:00
parent 6b40d557c4
commit 4ac4cec652
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/nsterm.m
View file

@ -4739,12 +4739,15 @@ ns_select_1 (int nfds, fd_set *readfds, fd_set *writefds,
check_native_fs ();
#endif
if (hold_event_q.nr > 0 && !run_loop_only)
/* If there are input events pending, store them so that Emacs can
recognize C-g. (And we must make sure [NSApp run] is called in
this function, so that C-g has a chance to land in
hold_event_q.) */
if (hold_event_q.nr > 0)
{
/* We already have events pending. */
raise (SIGIO);
errno = EINTR;
return -1;
for (int i = 0; i < hold_event_q.nr; ++i)
kbd_buffer_store_event_hold (&hold_event_q.q[i], NULL);
hold_event_q.nr = 0;
}
eassert (nfds <= FD_SETSIZE);
@ -4757,8 +4760,8 @@ ns_select_1 (int nfds, fd_set *readfds, fd_set *writefds,
if (NSApp == nil
|| ![NSThread isMainThread]
|| (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0))
return thread_select (pselect, nfds, readfds, writefds,
exceptfds, timeout, sigmask);
thread_select (pselect, nfds, readfds, writefds,
exceptfds, timeout, sigmask);
else
{
struct timespec t = {0, 0};