Revert patch 0003 granularity change -- patch 0008 already has this fix
Patch 0008 modifies postFocusedCursorNotification to add '&& direction != discontiguous' to the isCharMove guard, which IS the cursor sync fix. Changing patch 0003 independently broke patch 0008's context match. Restore patch 0003 to original.
This commit is contained in:
@@ -29,7 +29,7 @@ diff --git a/src/nsterm.m b/src/nsterm.m
|
|||||||
index 3e1ac74..d3015e2 100644
|
index 3e1ac74..d3015e2 100644
|
||||||
--- a/src/nsterm.m
|
--- a/src/nsterm.m
|
||||||
+++ b/src/nsterm.m
|
+++ b/src/nsterm.m
|
||||||
@@ -8758,6 +8758,554 @@ - (NSRect)accessibilityFrame
|
@@ -8758,6 +8758,552 @@ - (NSRect)accessibilityFrame
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@@ -107,13 +107,11 @@ index 3e1ac74..d3015e2 100644
|
|||||||
+ = @(ns_ax_text_state_change_selection_move);
|
+ = @(ns_ax_text_state_change_selection_move);
|
||||||
+ moveInfo[@"AXTextSelectionDirection"] = @(direction);
|
+ moveInfo[@"AXTextSelectionDirection"] = @(direction);
|
||||||
+ moveInfo[@"AXTextChangeElement"] = self;
|
+ moveInfo[@"AXTextChangeElement"] = self;
|
||||||
+ /* Always include granularity so VoiceOver can advance its browse
|
+ /* Omit granularity for character moves so VoiceOver does not
|
||||||
+ cursor by the correct unit (character, word, or line). Without
|
+ derive its own speech (it would read the wrong character
|
||||||
+ granularity, VO leaves its browse cursor at the previous position
|
+ for evil block-cursor mode). Include it for word/line/
|
||||||
+ for character moves, breaking Emacs-cursor -> VO-cursor sync.
|
+ selection so VoiceOver reads the appropriate text. */
|
||||||
+ For character moves, the explicit AnnouncementRequested below
|
+ if (!isCharMove)
|
||||||
+ (High priority) overrides VO's auto-speech, so evil block-cursor
|
|
||||||
+ mode still reads the correct character. */
|
|
||||||
+ moveInfo[@"AXTextSelectionGranularity"] = @(granularity);
|
+ moveInfo[@"AXTextSelectionGranularity"] = @(granularity);
|
||||||
+
|
+
|
||||||
+ ns_ax_post_notification_with_info (
|
+ ns_ax_post_notification_with_info (
|
||||||
|
|||||||
Reference in New Issue
Block a user