From 048fb7307fb50828657b7fe3e4ef866c0a8764ed Mon Sep 17 00:00:00 2001 From: Aaron Jensen Date: Sat, 16 Oct 2021 11:03:50 -0400 Subject: [PATCH] Ignore events in input-pending-p * keyboard.c (while_no_input_ignored_event): New predicate function. (kbd_buffer_store_buffered_event): Use `while_no_input_ignored_event'. (readable_events): Use `while_no_input_ignored_event' if `READABLE_EVENTS_FILTER_EVENTS' is set. Disregard `USE_TOOLKIT_SCROLL_BARS' when considering whether or not to ignore events as it is unclear why it was considered in the first place. --- src/keyboard.c | 56 +++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index be9fad3ac3..f6f9b5ded7 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -375,6 +375,7 @@ #define READABLE_EVENTS_IGNORE_SQUEEZABLES (1 << 2) static void deliver_user_signal (int); static char *find_user_signal_name (int); static void store_user_signal_events (void); +static bool while_no_input_ignored_event (union buffered_input_event *event); /* Advance or retreat a buffered input event pointer. */ @@ -3460,12 +3461,8 @@ readable_events (int flags) do { - if (!( -#ifdef USE_TOOLKIT_SCROLL_BARS - (flags & READABLE_EVENTS_FILTER_EVENTS) && -#endif - (event->kind == FOCUS_IN_EVENT - || event->kind == FOCUS_OUT_EVENT)) + if (!((flags & READABLE_EVENTS_FILTER_EVENTS) + && while_no_input_ignored_event (event)) #ifdef USE_TOOLKIT_SCROLL_BARS && !((flags & READABLE_EVENTS_IGNORE_SQUEEZABLES) && (event->kind == SCROLL_BAR_CLICK_EVENT @@ -3647,29 +3644,10 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event, #endif /* subprocesses */ } - Lisp_Object ignore_event; - - switch (event->kind) - { - case FOCUS_IN_EVENT: ignore_event = Qfocus_in; break; - case FOCUS_OUT_EVENT: ignore_event = Qfocus_out; break; - case HELP_EVENT: ignore_event = Qhelp_echo; break; - case ICONIFY_EVENT: ignore_event = Qiconify_frame; break; - case DEICONIFY_EVENT: ignore_event = Qmake_frame_visible; break; - case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break; -#ifdef USE_FILE_NOTIFY - case FILE_NOTIFY_EVENT: ignore_event = Qfile_notify; break; -#endif -#ifdef HAVE_DBUS - case DBUS_EVENT: ignore_event = Qdbus_event; break; -#endif - default: ignore_event = Qnil; break; - } - /* If we're inside while-no-input, and this event qualifies as input, set quit-flag to cause an interrupt. */ if (!NILP (Vthrow_on_input) - && NILP (Fmemq (ignore_event, Vwhile_no_input_ignore_events))) + && !while_no_input_ignored_event (event)) Vquit_flag = Vthrow_on_input; } @@ -11627,6 +11605,32 @@ init_while_no_input_ignore_events (void) return events; } +static bool +while_no_input_ignored_event (union buffered_input_event *event) +{ + Lisp_Object ignore_event; + + switch (event->kind) + { + case FOCUS_IN_EVENT: ignore_event = Qfocus_in; break; + case FOCUS_OUT_EVENT: ignore_event = Qfocus_out; break; + case HELP_EVENT: ignore_event = Qhelp_echo; break; + case ICONIFY_EVENT: ignore_event = Qiconify_frame; break; + case DEICONIFY_EVENT: ignore_event = Qmake_frame_visible; break; + case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break; +#ifdef USE_FILE_NOTIFY + case FILE_NOTIFY_EVENT: ignore_event = Qfile_notify; break; +#endif +#ifdef HAVE_DBUS + case DBUS_EVENT: ignore_event = Qdbus_event; break; +#endif + default: ignore_event = Qnil; break; + } + + + return !NILP (Fmemq (ignore_event, Vwhile_no_input_ignore_events)); +} + static void syms_of_keyboard_for_pdumper (void); void -- 2.33.0