Re: [PATCH] On the nasty "ghost key" problem on NS

[Kai Ma <justksqsf@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]



> On Nov 4, 2022, at 19:27, Po Lu <luangruo@yahoo.com> wrote:
> 
> Kai Ma <justksqsf@gmail.com> writes:
> 
>> +  owfi = waiting_for_input;
>> +  waiting_for_input = false;
>> +  if (WINDOWP (echo_area_window) && ! NILP (safe_call_inhibit_quit (0, Qns_in_echo_area)))
>>     win = XWINDOW (echo_area_window);
>>   else
>>     win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
>> +  waiting_for_input = owfi;
> 
> Please rename `owfi' to `was_waiting_for_input' or some other more
> descriptive name.  What happens if you just block input around safe_call
> (0, Qns_in_echo_area), instead of making an extra function that passes a
> magic flag to safe__call?

Either safe_call alone or safe_call+block_input does not fix the bug.

>> +Lisp_Object
>> +safe_call_inhibit_quit (ptrdiff_t nargs, Lisp_Object func, ...)
>> +{
>> +  Lisp_Object retval;
>> +  va_list ap;
>> +
>> +  va_start (ap, func);
>> +  retval = safe__call (true, nargs, func, ap);
>> +  va_end (ap);
>> +  return retval;
>> +}
>> +
> 
> This seems extraneous to me.


Changed to specbind(Qinhibit_quit, Qt).


[-- Attachment #2: fix-ghost-key-v3.patch --]
[-- Type: application/octet-stream, Size: 1352 bytes --]

diff --git a/src/nsterm.m b/src/nsterm.m
index 17f40dc7e3..0788442b98 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7063,16 +7063,23 @@ - (NSRect)firstRectForCharacterRange: (NSRange)theRange
   NSRect rect;
   NSPoint pt;
   struct window *win;
+  bool was_waiting_for_input;
+  specpdl_ref count = SPECPDL_INDEX ();
 
   NSTRACE ("[EmacsView firstRectForCharacterRange:]");
 
   if (NS_KEYLOG)
     NSLog (@"firstRectForCharRange request");
 
-  if (WINDOWP (echo_area_window) && ! NILP (call0 (intern ("ns-in-echo-area"))))
+  was_waiting_for_input = waiting_for_input;
+  waiting_for_input = false;
+  specbind (Qinhibit_quit, Qt);
+  if (WINDOWP (echo_area_window) && ! NILP (safe_call (true, 0, Qns_in_echo_area)))
     win = XWINDOW (echo_area_window);
   else
     win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
+  unbind_to (count, Qnil);
+  waiting_for_input = was_waiting_for_input;
 
   rect.size.width = theRange.length * FRAME_COLUMN_WIDTH (emacsframe);
   rect.size.height = FRAME_LINE_HEIGHT (emacsframe);
@@ -11012,6 +11019,7 @@ Nil means use fullscreen the old (< 10.7) way.  The old way works better with
   DEFSYM (Qcondensed, "condensed");
   DEFSYM (Qreverse_italic, "reverse-italic");
   DEFSYM (Qexpanded, "expanded");
+  DEFSYM (Qns_in_echo_area, "ns-in-echo-area");
 
 #ifdef NS_IMPL_COCOA
   Fprovide (Qcocoa, Qnil);