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

patches: systematic line announcement (granularity=line, all modes)

Browse Source
This commit is contained in:
Daneel
2026-02-27 11:14:30 +01:00
parent 0110670734
commit 8890e659e1
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch
View File

@@ -1,13 +1,13 @@
From 3dedb68c7f8656ecdbae18533d092a4a91f3ddb7 Mon Sep 17 00:00:00 2001 From b8ca9a5b66f8fd6f60e4f0263c620ae21be9d776 Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz> From: Martin Sukany <martin@sukany.cz>
Date: Fri, 27 Feb 2026 11:06:06 +0100 Date: Fri, 27 Feb 2026 11:14:26 +0100
Subject: [PATCH] ns: implement VoiceOver accessibility (AXBoundsForRange, line Subject: [PATCH] ns: implement VoiceOver accessibility (AXBoundsForRange, line
nav, completions, interactive spans) nav, completions, interactive spans)
--- ---
src/nsterm.h | 109 ++ src/nsterm.h | 109 ++
src/nsterm.m | 2681 +++++++++++++++++++++++++++++++++++++++++++++++--- src/nsterm.m | 2679 +++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 2641 insertions(+), 149 deletions(-) 2 files changed, 2639 insertions(+), 149 deletions(-)
diff --git a/src/nsterm.h b/src/nsterm.h diff --git a/src/nsterm.h b/src/nsterm.h
index 7c1ee4c..6c95673 100644 index 7c1ee4c..6c95673 100644
@@ -144,7 +144,7 @@ index 7c1ee4c..6c95673 100644
diff --git a/src/nsterm.m b/src/nsterm.m diff --git a/src/nsterm.m b/src/nsterm.m
index 932d209..bedbe01 100644 index 932d209..367ee50 100644
--- a/src/nsterm.m --- a/src/nsterm.m
+++ b/src/nsterm.m +++ b/src/nsterm.m
@@ -46,6 +46,7 @@ Updated by Christian Limpach (chris@nice.ch) @@ -46,6 +46,7 @@ Updated by Christian Limpach (chris@nice.ch)
@@ -205,7 +205,7 @@ index 932d209..bedbe01 100644
ns_focus (f, NULL, 0); ns_focus (f, NULL, 0);
NSGraphicsContext *ctx = [NSGraphicsContext currentContext]; NSGraphicsContext *ctx = [NSGraphicsContext currentContext];
@@ -6849,219 +6886,2242 @@ - (BOOL)fulfillService: (NSString *)name withArg: (NSString *)arg @@ -6849,219 +6886,2240 @@ - (BOOL)fulfillService: (NSString *)name withArg: (NSString *)arg
/* ========================================================================== /* ==========================================================================
@@ -1986,31 +1986,31 @@ index 932d209..bedbe01 100644
+ NSAccessibilitySelectedTextChangedNotification, + NSAccessibilitySelectedTextChangedNotification,
+ moveInfo); + moveInfo);
+ +
+ /* C-n/C-p (`next-line' / `previous-line') can diverge from + /* Emit an explicit announcement whenever point lands on a new line.
+ arrow-down/up command paths in some major modes (completion list, + Triggering on granularity=line covers ALL line-motion commands
+ Dired, etc.). Emit an explicit line announcement for this basic + in ALL modes (next-line, dired-next-line, next-completion, …)
+ line-motion path so VoiceOver tracks the Emacs point reliably. */ + without enumerating command names. Character and word moves
+ (granularity ≠ line) are left to VoiceOver's default behaviour.
+
+ For buffers using horizontal multi-column completion layout
+ (completion-list-mode) we read the completion--string text
+ property at point rather than the whole line, which would
+ otherwise announce two candidates at once. */
+ if ([self isAccessibilityFocused] + if ([self isAccessibilityFocused]
+ && cachedText + && cachedText
+ && (isCtrlNP || ns_ax_command_is_basic_line_move ()) + && granularity == ns_ax_text_selection_granularity_line)
+ && (direction == ns_ax_text_selection_direction_next
+ || direction == ns_ax_text_selection_direction_previous))
+ { + {
+ /* In completion-list-mode, prefer the completion--string
+ text property over the raw line text. The horizontal
+ layout places two candidates per line; reading the whole
+ line would announce both at once. */
+ NSString *announceText = nil; + NSString *announceText = nil;
+ +
+ struct buffer *cb = XBUFFER (w->contents); + /* 1. completion--string at point (completion-list-mode). */
+ Lisp_Object cs_sym = intern ("completion--string");
+ Lisp_Object cstr = Fget_char_property (make_fixnum (point), + Lisp_Object cstr = Fget_char_property (make_fixnum (point),
+ cs_sym, Qnil); + intern ("completion--string"),
+ Qnil);
+ announceText = ns_ax_completion_string_from_prop (cstr); + announceText = ns_ax_completion_string_from_prop (cstr);
+ +
+ /* 2. Fallback: full line text. */
+ if (!announceText) + if (!announceText)
+ { + {
+ /* Fallback: read full line (non-completion buffers). */
+ NSUInteger point_idx = [self accessibilityIndexForCharpos:point]; + NSUInteger point_idx = [self accessibilityIndexForCharpos:point];
+ if (point_idx <= [cachedText length]) + if (point_idx <= [cachedText length])
+ { + {
@@ -2018,10 +2018,9 @@ index 932d209..bedbe01 100644
+ NSRange lineRange = [self accessibilityRangeForLine:lineNum]; + NSRange lineRange = [self accessibilityRangeForLine:lineNum];
+ if (lineRange.location != NSNotFound + if (lineRange.location != NSNotFound
+ && lineRange.length > 0 + && lineRange.length > 0
+ && lineRange.location + lineRange.length <= [cachedText length]) + && lineRange.location + lineRange.length
+ { + <= [cachedText length])
+ announceText = [cachedText substringWithRange:lineRange]; + announceText = [cachedText substringWithRange:lineRange];
+ }
+ } + }
+ } + }
+ +
@@ -2041,7 +2040,6 @@ index 932d209..bedbe01 100644
+ annInfo); + annInfo);
+ } + }
+ } + }
+ (void) cb;
+ } + }
+ +
+ /* --- Completions announcement --- + /* --- Completions announcement ---
@@ -2597,7 +2595,7 @@ index 932d209..bedbe01 100644
unsigned fnKeysym = 0; unsigned fnKeysym = 0;
static NSMutableArray *nsEvArray; static NSMutableArray *nsEvArray;
unsigned int flags = [theEvent modifierFlags]; unsigned int flags = [theEvent modifierFlags];
@@ -8237,6 +10297,28 @@ - (void)windowDidBecomeKey /* for direct calls */ @@ -8237,6 +10295,28 @@ - (void)windowDidBecomeKey /* for direct calls */
XSETFRAME (event.frame_or_window, emacsframe); XSETFRAME (event.frame_or_window, emacsframe);
kbd_buffer_store_event (&event); kbd_buffer_store_event (&event);
ns_send_appdefined (-1); // Kick main loop ns_send_appdefined (-1); // Kick main loop
@@ -2626,7 +2624,7 @@ index 932d209..bedbe01 100644
} }
@@ -9474,6 +11556,307 @@ - (int) fullscreenState @@ -9474,6 +11554,307 @@ - (int) fullscreenState
return fs_state; return fs_state;
} }