patches: fix all non-ASCII, PATCH numbering, block_input order, pkg names
- All 9 patches: convert em-dash, arrow, ellipsis, mu to ASCII equivalents (required for strict git am on Linux; GNU coding standards) - 0000: Subject [PATCH 0/8] -> [PATCH] (standalone Zoom series) - 0001: fix block_input() ordering: call block_input before record_unwind_protect_void(unblock_input) per standard pattern - 0001/0005: shorten decorator separator comment lines to <80 chars - 0007: genericize overlay completion framework name in commit message - 0008: genericize child-frame completion framework name in commit message - README.txt: fix stale 'default t' to 'default nil' with auto-detection note - TESTING.txt: fix stale 'defaults to t' to 'defaults to nil'
This commit is contained in:
@@ -24,7 +24,7 @@ com.apple.accessibility.api distributed notification.
|
||||
---
|
||||
etc/NEWS | 13 ++
|
||||
src/nsterm.m | 474 +++++++++++++++++++++++++++++++++++++++++++++++++--
|
||||
2 files changed, 479 insertions(+), 12 deletions(-)
|
||||
2 files changed, 475 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/etc/NEWS b/etc/NEWS
|
||||
index 4c149e41d6..7f917f93b2 100644
|
||||
@@ -54,7 +54,7 @@ diff --git a/src/nsterm.m b/src/nsterm.m
|
||||
index 8aa5b6ac1b..32eb04acef 100644
|
||||
--- a/src/nsterm.m
|
||||
+++ b/src/nsterm.m
|
||||
@@ -1278,7 +1278,7 @@ If a completion candidate is selected (overlay or child frame),
|
||||
@@ -1275,7 +1275,7 @@ If a completion candidate is selected (overlay or child frame),
|
||||
static void
|
||||
ns_zoom_track_completion (struct frame *f, EmacsView *view)
|
||||
{
|
||||
@@ -63,7 +63,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
return;
|
||||
if (!WINDOWP (f->selected_window))
|
||||
return;
|
||||
@@ -1396,7 +1396,8 @@ so the visual offset is (ov_line + 1) * line_h from
|
||||
@@ -1393,7 +1393,8 @@ so the visual offset is (ov_line + 1) * line_h from
|
||||
(zoomCursorUpdated is NO). */
|
||||
#if defined (MAC_OS_X_VERSION_MIN_REQUIRED) \
|
||||
&& MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
|
||||
@@ -73,7 +73,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
&& !NSIsEmptyRect (view->lastCursorRect))
|
||||
{
|
||||
NSRect r = view->lastCursorRect;
|
||||
@@ -1423,6 +1424,9 @@ so the visual offset is (ov_line + 1) * line_h from
|
||||
@@ -1420,6 +1421,9 @@ so the visual offset is (ov_line + 1) * line_h from
|
||||
if (view)
|
||||
ns_zoom_track_completion (f, view);
|
||||
#endif /* NS_IMPL_COCOA */
|
||||
@@ -83,7 +83,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -3570,7 +3574,7 @@ EmacsView pixels (AppKit, flipped, top-left origin)
|
||||
@@ -3567,7 +3571,7 @@ EmacsView pixels (AppKit, flipped, top-left origin)
|
||||
|
||||
#if defined (MAC_OS_X_VERSION_MIN_REQUIRED) \
|
||||
&& MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
|
||||
@@ -92,7 +92,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
{
|
||||
NSRect windowRect = [view convertRect:r toView:nil];
|
||||
NSRect screenRect
|
||||
@@ -6726,9 +6730,56 @@ - (void)applicationDidFinishLaunching: (NSNotification *)notification
|
||||
@@ -6723,9 +6727,56 @@ - (void)applicationDidFinishLaunching: (NSNotification *)notification
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -149,7 +149,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
- (void)antialiasThresholdDidChange:(NSNotification *)notification
|
||||
{
|
||||
#ifdef NS_IMPL_COCOA
|
||||
@@ -7631,7 +7682,6 @@ - (id)accessibilityTopLevelUIElement
|
||||
@@ -7628,7 +7679,6 @@ - (id)accessibilityTopLevelUIElement
|
||||
|
||||
|
||||
|
||||
@@ -157,15 +157,15 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
static BOOL
|
||||
ns_ax_find_completion_overlay_range (struct buffer *b, ptrdiff_t point,
|
||||
ptrdiff_t *out_start,
|
||||
@@ -8744,7 +8794,6 @@ - (NSRect)accessibilityFrame
|
||||
@@ -8741,7 +8791,6 @@ - (NSRect)accessibilityFrame
|
||||
@end
|
||||
|
||||
|
||||
-
|
||||
/* ===================================================================
|
||||
EmacsAccessibilityBuffer (Notifications) — AX event dispatch
|
||||
EmacsAccessibilityBuffer (Notifications) --- AX event dispatch
|
||||
|
||||
@@ -9238,6 +9287,50 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
|
||||
@@ -9235,6 +9284,50 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
|
||||
granularity = ns_ax_text_selection_granularity_line;
|
||||
}
|
||||
|
||||
@@ -179,10 +179,6 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
+ if (!isCtrlNP && granularity == ns_ax_text_selection_granularity_line)
|
||||
+ direction = ns_ax_text_selection_direction_discontiguous;
|
||||
+
|
||||
+ /* Until voiceoverSetPoint tracking is added, treat all cursor
|
||||
+ moves as Emacs-initiated (refined in a later patch). */
|
||||
+ BOOL emacsMovedCursor = YES;
|
||||
+
|
||||
+ /* If Emacs moved the cursor (not VoiceOver), force discontiguous
|
||||
+ so VoiceOver re-anchors its browse cursor to the current
|
||||
+ accessibilitySelectedTextRange. This covers all Emacs-initiated
|
||||
@@ -220,7 +216,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
/* Post notifications for focused and non-focused elements. */
|
||||
if ([self isAccessibilityFocused])
|
||||
[self postFocusedCursorNotification:point
|
||||
@@ -9350,7 +9443,6 @@ - (NSRect)accessibilityFrame
|
||||
@@ -9347,7 +9440,6 @@ - (NSRect)accessibilityFrame
|
||||
@end
|
||||
|
||||
|
||||
@@ -228,7 +224,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
/* ===================================================================
|
||||
EmacsAccessibilityInteractiveSpan --- helpers and implementation
|
||||
=================================================================== */
|
||||
@@ -9686,6 +9778,7 @@ - (void)dealloc
|
||||
@@ -9683,6 +9775,7 @@ - (void)dealloc
|
||||
[layer release];
|
||||
#endif
|
||||
|
||||
@@ -236,7 +232,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
[[self menu] release];
|
||||
[super dealloc];
|
||||
}
|
||||
@@ -11034,6 +11127,32 @@ - (void)windowDidBecomeKey /* for direct calls */
|
||||
@@ -11031,6 +11124,32 @@ - (void)windowDidBecomeKey /* for direct calls */
|
||||
XSETFRAME (event.frame_or_window, emacsframe);
|
||||
kbd_buffer_store_event (&event);
|
||||
ns_send_appdefined (-1); // Kick main loop
|
||||
@@ -269,7 +265,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
}
|
||||
|
||||
|
||||
@@ -12271,6 +12390,332 @@ - (int) fullscreenState
|
||||
@@ -12268,6 +12387,332 @@ - (int) fullscreenState
|
||||
return fs_state;
|
||||
}
|
||||
|
||||
@@ -602,7 +598,7 @@ index 8aa5b6ac1b..32eb04acef 100644
|
||||
@end /* EmacsView */
|
||||
|
||||
|
||||
@@ -14267,12 +14712,17 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
|
||||
@@ -14264,12 +14709,17 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
|
||||
ns_use_srgb_colorspace = YES;
|
||||
|
||||
DEFVAR_BOOL ("ns-accessibility-enabled", ns_accessibility_enabled,
|
||||
|
||||
Reference in New Issue
Block a user