martin/emacs-doom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "patches: add 0009 resource safety hardening + update 0007/0008"

Browse Source 
This reverts commit acc2a2985e.
This commit is contained in:
Martin Sukany
2026-02-28 19:05:02 +01:00
parent acc2a2985e
commit 98b3d04597
3 changed files with 26 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/0007-ns-announce-overlay-completion-candidates-for-VoiceO.patch
View File

@@ -1,7 +1,7 @@
From 8712cf8f567f3b0c02cc70a93aff931faa3a2df3 Mon Sep 17 00:00:00 2001
From 6e907a1000a8b138976d6a906e40449fdf1a61c5 Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 14:46:25 +0100
Subject: [PATCH 1/3] ns: announce overlay completion candidates for VoiceOver
Subject: [PATCH 1/2] ns: announce overlay completion candidates for VoiceOver
Completion frameworks such as Vertico, Ivy, and Icomplete render
candidates via overlay before-string/after-string properties rather
@@ -52,8 +52,8 @@ Independent overlay branch, BUF_CHARS_MODIFF gating, candidate
announcement with overlay Zoom rect storage.
---
src/nsterm.h | 3 +
src/nsterm.m | 333 +++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 300 insertions(+), 36 deletions(-)
src/nsterm.m | 331 +++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 298 insertions(+), 36 deletions(-)
diff --git a/src/nsterm.h b/src/nsterm.h
index 51c30ca..5c15639 100644
@@ -77,7 +77,7 @@ index 51c30ca..5c15639 100644
BOOL font_panel_active;
NSFont *font_panel_result;
diff --git a/src/nsterm.m b/src/nsterm.m
index 1780194..c1fc3cb 100644
index 1780194..143e784 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3258,7 +3258,12 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
@@ -403,7 +403,7 @@ index 1780194..c1fc3cb 100644
self.cachedPoint = point;
NSDictionary *change = @{
@@ -8789,16 +8938,128 @@ ns_ax_completion_text_for_span (EmacsAccessibilityBuffer *elem,
@@ -8789,16 +8938,126 @@ ns_ax_completion_text_for_span (EmacsAccessibilityBuffer *elem,
BOOL markActive = !NILP (BVAR (b, mark_active));
/* --- Text changed (edit) --- */
@@ -428,8 +428,7 @@ index 1780194..c1fc3cb 100644
+ if (chars_modiff != self.cachedCharsModiff)
+ {
+ self.cachedCharsModiff = chars_modiff;
+ if (self.emacsView)
+ self.emacsView->overlayZoomActive = NO;
+ self.emacsView->overlayZoomActive = NO;
+ [self postTextChangedNotification:point];
+ textDidChange = YES;
+ }
@@ -517,8 +516,7 @@ index 1780194..c1fc3cb 100644
+ (minibuffer exit, C-g, etc.) or overlay has no
+ recognizable selection face. Return Zoom to the
+ text cursor. */
+ if (self.emacsView)
+ self.emacsView->overlayZoomActive = NO;
+ self.emacsView->overlayZoomActive = NO;
+ }
}
@@ -536,7 +534,7 @@ index 1780194..c1fc3cb 100644
{
ptrdiff_t oldPoint = self.cachedPoint;
BOOL oldMarkActive = self.cachedMarkActive;
@@ -8966,7 +9227,7 @@ ns_ax_completion_text_for_span (EmacsAccessibilityBuffer *elem,
@@ -8966,7 +9225,7 @@ ns_ax_completion_text_for_span (EmacsAccessibilityBuffer *elem,
/* ===================================================================
@@ -545,7 +543,7 @@ index 1780194..c1fc3cb 100644
=================================================================== */
/* Scan visible range of window W for interactive spans.
@@ -9157,7 +9418,7 @@ ns_ax_scan_interactive_spans (struct window *w,
@@ -9157,7 +9416,7 @@ ns_ax_scan_interactive_spans (struct window *w,
- (BOOL) isAccessibilityFocused
{
/* Read the cached point stored by EmacsAccessibilityBuffer on the main
@@ -554,7 +552,7 @@ index 1780194..c1fc3cb 100644
EmacsAccessibilityBuffer *pb = self.parentBuffer;
if (!pb)
return NO;
@@ -9174,7 +9435,7 @@ ns_ax_scan_interactive_spans (struct window *w,
@@ -9174,7 +9433,7 @@ ns_ax_scan_interactive_spans (struct window *w,
dispatch_async (dispatch_get_main_queue (), ^{
/* lwin is a Lisp_Object captured by value. This is GC-safe
because Lisp_Objects are tagged integers/pointers that
@@ -563,7 +561,7 @@ index 1780194..c1fc3cb 100644
Emacs. The WINDOW_LIVE_P check below guards against the
window being deleted between capture and execution. */
if (!WINDOWP (lwin) || NILP (Fwindow_live_p (lwin)))
@@ -9200,7 +9461,7 @@ ns_ax_scan_interactive_spans (struct window *w,
@@ -9200,7 +9459,7 @@ ns_ax_scan_interactive_spans (struct window *w,
@end
@@ -572,7 +570,7 @@ index 1780194..c1fc3cb 100644
Methods are kept here (same .m file) so they access the ivars
declared in the @interface ivar block. */
@implementation EmacsAccessibilityBuffer (InteractiveSpans)
@@ -11922,7 +12183,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
@@ -11922,7 +12181,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
if (WINDOW_LEAF_P (w))
{
@@ -581,7 +579,7 @@ index 1780194..c1fc3cb 100644
EmacsAccessibilityBuffer *elem
= [existing objectForKey:[NSValue valueWithPointer:w]];
if (!elem)
@@ -11956,7 +12217,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
@@ -11956,7 +12215,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
}
else
{
@@ -590,7 +588,7 @@ index 1780194..c1fc3cb 100644
Lisp_Object child = w->contents;
while (!NILP (child))
{
@@ -12068,7 +12329,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
@@ -12068,7 +12327,7 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
accessibilityUpdating = YES;
/* Detect window tree change (split, delete, new buffer). Compare
@@ -599,7 +597,7 @@ index 1780194..c1fc3cb 100644
Lisp_Object curRoot = FRAME_ROOT_WINDOW (emacsframe);
if (!EQ (curRoot, lastRootWindow))
{
@@ -12077,12 +12338,12 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
@@ -12077,12 +12336,12 @@ ns_ax_collect_windows (Lisp_Object window, EmacsView *view,
}
/* If tree is stale, rebuild FIRST so we don't iterate freed