diff --git a/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch b/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch index 3a213af..799fbab 100644 --- a/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch +++ b/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch @@ -1,8 +1,7 @@ -From 8564e4989f5f358092bd1494c3894a42974ee6e1 Mon Sep 17 00:00:00 2001 +From 846e2fa3f856138127bdc7a475e066003cc76904 Mon Sep 17 00:00:00 2001 From: Martin Sukany Date: Sat, 28 Feb 2026 16:01:29 +0100 -Subject: [PATCH 2/2] ns: announce child frame completion candidates for - VoiceOver +Subject: [PATCH] ns: announce child frame completion candidates for VoiceOver Completion frameworks such as Corfu, Company-box, and similar render candidates in a child frame rather than as overlay strings @@ -43,8 +42,8 @@ childFrameCompletionActive flag. refocus parent buffer element when child frame closes. --- src/nsterm.h | 2 + - src/nsterm.m | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 278 insertions(+), 3 deletions(-) + src/nsterm.m | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 276 insertions(+), 3 deletions(-) diff --git a/src/nsterm.h b/src/nsterm.h index 5c15639..8b34300 100644 @@ -67,7 +66,7 @@ index 5c15639..8b34300 100644 @end diff --git a/src/nsterm.m b/src/nsterm.m -index 143e784..da1a319 100644 +index 143e784..37918a4 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -7066,6 +7066,110 @@ ns_ax_selected_overlay_text (struct buffer *b, @@ -181,11 +180,29 @@ index 143e784..da1a319 100644 /* Build accessibility text for window W, skipping invisible text. Populates *OUT_START with the buffer start charpos. Populates *OUT_RUNS with an array of visible runs and *OUT_NRUNS -@@ -12311,6 +12415,122 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, +@@ -12311,6 +12415,120 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, The existing elements carry cached state (modiff, point) from the previous redisplay cycle. Rebuilding first would create fresh elements with current values, making change detection impossible. */ + ++/* Child frame completion dedup state. File-scope so that ++ lastChildFrameBuffer can be staticpro'd against GC. */ ++static Lisp_Object lastChildFrameBuffer; ++static EMACS_INT lastChildFrameModiff; ++static char *lastChildFrameCandidate; ++ ++/* Reset the re-entrance guard when unwinding past ++ postAccessibilityUpdates due to a Lisp signal (longjmp). ++ Without this, a signal during Lisp calls (e.g. Fget_char_property ++ in overlay or child frame scanning) would leave ++ accessibilityUpdating = YES permanently, suppressing all future ++ accessibility notifications. */ ++static void ++ns_ax_reset_accessibility_updating (void *view) ++{ ++ ((EmacsView *)view)->accessibilityUpdating = NO; ++} ++ +/* Announce the selected candidate in a child frame completion popup. + Handles Corfu, Company-box, and similar frameworks that render + candidates in a separate child frame rather than as overlay strings @@ -194,8 +211,6 @@ index 143e784..da1a319 100644 + after the parent's draw_window_cursor. */ +- (void)announceChildFrameCompletion +{ -+ -+ + /* Validate frame state --- child frames may be partially + initialized during creation. */ + if (!WINDOWP (emacsframe->selected_window)) @@ -282,29 +297,11 @@ index 143e784..da1a319 100644 + kUAZoomFocusTypeInsertionPoint); + } +} -+ -+/* Child frame completion dedup state. File-scope so that -+ lastChildFrameBuffer can be staticpro'd against GC. */ -+static Lisp_Object lastChildFrameBuffer; -+static EMACS_INT lastChildFrameModiff; -+static char *lastChildFrameCandidate; -+ -+/* Reset the re-entrance guard when unwinding past -+ postAccessibilityUpdates due to a Lisp signal (longjmp). -+ Without this, a signal during Lisp calls (e.g. Fget_char_property -+ in overlay or child frame scanning) would leave -+ accessibilityUpdating = YES permanently, suppressing all future -+ accessibility notifications. */ -+static void -+ns_ax_reset_accessibility_updating (void *view) -+{ -+ ((EmacsView *)view)->accessibilityUpdating = NO; -+} + - (void)postAccessibilityUpdates { NSTRACE ("[EmacsView postAccessibilityUpdates]"); -@@ -12321,10 +12541,60 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, +@@ -12321,10 +12539,60 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, /* Re-entrance guard: VoiceOver callbacks during notification posting can trigger redisplay, which calls ns_update_end, which calls us @@ -366,7 +363,7 @@ index 143e784..da1a319 100644 /* Detect window tree change (split, delete, new buffer). Compare FRAME_ROOT_WINDOW --- if it changed, the tree structure changed. */ -@@ -12355,7 +12625,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, +@@ -12355,7 +12623,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, NSAccessibilityFocusedUIElementChangedNotification); lastSelectedWindow = emacsframe->selected_window; @@ -375,7 +372,7 @@ index 143e784..da1a319 100644 return; } -@@ -12399,7 +12669,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, +@@ -12399,7 +12667,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view, NSAccessibilityFocusedUIElementChangedNotification); } @@ -384,7 +381,7 @@ index 143e784..da1a319 100644 } /* ---- Cursor position for Zoom (via accessibilityBoundsForRange:) ---- -@@ -14341,6 +14611,9 @@ syms_of_nsterm (void) +@@ -14341,6 +14609,9 @@ syms_of_nsterm (void) DEFSYM (Qns_ax_completion, "completion"); DEFSYM (Qns_ax_completions_highlight, "completions-highlight"); DEFSYM (Qns_ax_backtab, "backtab");