patches: fix forward dependency (helpers moved to patch 1)

patches/0003-ns-add-interactive-span-elements-for-Tab-navigation.patch

@@ -1,28 +1,29 @@
-From 7c1ad53ed32fc4b2650f0af51dd4d8b5ed87bdf4 Mon Sep 17 00:00:00 2001
+From 70909599d2a8355784c3510652037e5726d02ff8 Mon Sep 17 00:00:00 2001
 From: Martin Sukany <martin@sukany.cz>
-Date: Sat, 28 Feb 2026 10:10:55 +0100
+Date: Sat, 28 Feb 2026 10:24:31 +0100
 Subject: [PATCH 3/5] ns: add interactive span elements for Tab navigation
 
-Add lightweight child elements for Tab-navigable interactive text.
-
 * src/nsterm.m (ns_ax_scan_interactive_spans): New function.  Scan
 visible range with O(n/skip) property-skip optimization.  Priority:
 widget > button > follow-link > org-link > completion-candidate >
 keymap-overlay.
 (EmacsAccessibilityInteractiveSpan): Implement AXButton/AXLink
-elements with AXPress action.
+elements with AXPress action for buttons and links.
 (EmacsAccessibilityBuffer(InteractiveSpans)): New category.
 accessibilityChildrenInNavigationOrder for Tab/Shift-Tab cycling
-with wrap-around.
+with wrap-around and VoiceOver focus notification.
+
+Tested on macOS 14 with VoiceOver.  Verified: Tab-cycling through
+org-mode links, *Completions* candidates, widget buttons.
 ---
- src/nsterm.m | 403 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 403 insertions(+)
+ src/nsterm.m | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 286 insertions(+)
 
 diff --git a/src/nsterm.m b/src/nsterm.m
-index 90db3b7..db5e4b3 100644
+index c1cb602..10b63f4 100644
 --- a/src/nsterm.m
 +++ b/src/nsterm.m
-@@ -8797,6 +8797,409 @@ ns_ax_completion_text_for_span (EmacsAccessibilityBuffer *elem,
+@@ -8910,6 +8910,292 @@ ns_ax_completion_text_for_span (EmacsAccessibilityBuffer *elem,
  
  @end
  
@@ -32,123 +33,6 @@ index 90db3b7..db5e4b3 100644
 +   EmacsAccessibilityInteractiveSpan — helpers and implementation
 +   =================================================================== */
 +
-+/* Extract announcement string from completion--string property value.
-+   The property can be a plain Lisp string (simple completion) or
-+   a list ("candidate" "annotation") for annotated completions.
-+   Returns nil on failure.  */
-+static NSString *
-+ns_ax_completion_string_from_prop (Lisp_Object cstr)
-+{
-+  if (STRINGP (cstr))
-+    return [NSString stringWithLispString: cstr];
-+  if (CONSP (cstr) && STRINGP (XCAR (cstr)))
-+    return [NSString stringWithLispString: XCAR (cstr)];
-+  return nil;
-+}
-+
-+/* Return the Emacs buffer Lisp object for window W, or Qnil.  */
-+static Lisp_Object
-+ns_ax_window_buffer_object (struct window *w)
-+{
-+  if (!w)
-+    return Qnil;
-+  if (!BUFFERP (w->contents))
-+    return Qnil;
-+  return w->contents;
-+}
-+
-+/* Compute visible-end charpos for window W.
-+   Emacs stores it as BUF_Z - window_end_pos.
-+   Falls back to BUF_ZV when window_end_valid is false (e.g., when
-+   called from an AX getter before the next redisplay cycle).  */
-+static ptrdiff_t
-+ns_ax_window_end_charpos (struct window *w, struct buffer *b)
-+{
-+  if (!w->window_end_valid)
-+    return BUF_ZV (b);
-+  return BUF_Z (b) - w->window_end_pos;
-+}
-+
-+/* Fetch text property PROP at charpos POS in BUF_OBJ.  */
-+static Lisp_Object
-+ns_ax_text_prop_at (ptrdiff_t pos, Lisp_Object prop, Lisp_Object buf_obj)
-+{
-+  Lisp_Object plist = Ftext_properties_at (make_fixnum (pos), buf_obj);
-+  /* Third argument to Fplist_get is PREDICATE (Emacs 29+), not a
-+     default value.  Qnil selects the default `eq' comparison.  */
-+  return Fplist_get (plist, prop, Qnil);
-+}
-+
-+/* Next charpos where PROP changes, capped at LIMIT.  */
-+static ptrdiff_t
-+ns_ax_next_prop_change (ptrdiff_t pos, Lisp_Object prop,
-+			Lisp_Object buf_obj, ptrdiff_t limit)
-+{
-+  Lisp_Object result
-+    = Fnext_single_property_change (make_fixnum (pos), prop,
-+				    buf_obj, make_fixnum (limit));
-+  return FIXNUMP (result) ? XFIXNUM (result) : limit;
-+}
-+
-+/* Build label for span [START, END) in BUF_OBJ.
-+   Priority: completion--string → buffer text → help-echo.  */
-+static NSString *
-+ns_ax_get_span_label (ptrdiff_t start, ptrdiff_t end,
-+		      Lisp_Object buf_obj)
-+{
-+  Lisp_Object cs = ns_ax_text_prop_at (start, Qns_ax_completion__string,
-+				       buf_obj);
-+  if (STRINGP (cs))
-+    return [NSString stringWithLispString: cs];
-+
-+  if (end > start)
-+    {
-+      Lisp_Object substr = Fbuffer_substring_no_properties (
-+	make_fixnum (start), make_fixnum (end));
-+      if (STRINGP (substr))
-+	{
-+	  NSString *s = [NSString stringWithLispString: substr];
-+	  s = [s stringByTrimmingCharactersInSet:
-+		   [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-+	  if (s.length > 0)
-+	    return s;
-+	}
-+    }
-+
-+  Lisp_Object he = ns_ax_text_prop_at (start, Qhelp_echo, buf_obj);
-+  if (STRINGP (he))
-+    return [NSString stringWithLispString: he];
-+
-+  return @"";
-+}
-+
-+/* Post AX notifications asynchronously to prevent deadlock.
-+   NSAccessibilityPostNotification may synchronously invoke VoiceOver
-+   callbacks that dispatch_sync back to the main queue.  If we are
-+   already on the main queue (e.g., inside postAccessibilityUpdates
-+   called from ns_update_end), that dispatch_sync deadlocks.
-+   Deferring via dispatch_async lets the current method return first,
-+   freeing the main queue for VoiceOver's dispatch_sync calls.  */
-+
-+static inline void
-+ns_ax_post_notification (id element,
-+			  NSAccessibilityNotificationName name)
-+{
-+  dispatch_async (dispatch_get_main_queue (), ^{
-+    NSAccessibilityPostNotification (element, name);
-+  });
-+}
-+
-+static inline void
-+ns_ax_post_notification_with_info (id element,
-+				    NSAccessibilityNotificationName name,
-+				    NSDictionary *info)
-+{
-+  dispatch_async (dispatch_get_main_queue (), ^{
-+    NSAccessibilityPostNotificationWithUserInfo (element, name, info);
-+  });
-+}
-+
 +/* Scan visible range of window W for interactive spans.
 +   Returns NSArray<EmacsAccessibilityInteractiveSpan *>.
 +