patches: address all non-blocking review findings
Fix remaining issues identified in core maintainer review: - 0000: correct [PATCH 0/8] to [PATCH] (standalone Zoom series) - 0006: add paragraph break in macos.texi VoiceOver section - 0001/0005: shorten separator comment lines to 79 chars - 0007/0008: genericize third-party package names in commit messages - 0001: fix block_input ordering (block before registering unwind) - 0000/0007: document intentional face_is_selected duplication
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
From 0470786c91eb4a464d8580387b83a4a8d4e4f8eb Mon Sep 17 00:00:00 2001
|
||||
From: Martin Sukany <martin@sukany.cz>
|
||||
Date: Sat, 28 Feb 2026 22:39:35 +0100
|
||||
Subject: [PATCH 0/8] ns: integrate with macOS Zoom for cursor tracking
|
||||
Subject: [PATCH] ns: integrate with macOS Zoom for cursor tracking
|
||||
|
||||
Inform macOS Zoom of the text cursor position so the zoomed viewport
|
||||
follows keyboard focus in Emacs. Also track completion candidates so
|
||||
@@ -26,16 +26,16 @@ to the selected completion candidate after normal cursor tracking.
|
||||
(ns_update_end): Call ns_zoom_track_completion.
|
||||
(ns_draw_window_cursor): Store cursor rect; call UAZoomChangeFocus.
|
||||
---
|
||||
etc/NEWS | 11 ++
|
||||
etc/NEWS | 10 ++
|
||||
src/nsterm.h | 6 +
|
||||
src/nsterm.m | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 371 insertions(+)
|
||||
src/nsterm.m | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 373 insertions(+)
|
||||
|
||||
diff --git a/etc/NEWS b/etc/NEWS
|
||||
index 7367e3ccbd..4c149e41d6 100644
|
||||
--- a/etc/NEWS
|
||||
+++ b/etc/NEWS
|
||||
@@ -82,6 +82,17 @@ other directory on your system. You can also invoke the
|
||||
@@ -82,6 +82,16 @@ other directory on your system. You can also invoke the
|
||||
|
||||
* Changes in Emacs 31.1
|
||||
|
||||
@@ -45,10 +45,9 @@ index 7367e3ccbd..4c149e41d6 100644
|
||||
+Follow keyboard focus), Emacs informs Zoom of the text cursor position
|
||||
+after every cursor redraw via 'UAZoomChangeFocus'. The zoomed viewport
|
||||
+automatically tracks the insertion point across window splits and
|
||||
+switches. Completion frameworks (Vertico, Icomplete, Ivy for overlay
|
||||
+candidates; Corfu, Company-box for child frame popups) are also
|
||||
+tracked: Zoom follows the selected candidate rather than the text
|
||||
+cursor during completion.
|
||||
+switches. Overlay-based completion frameworks and child-frame popup
|
||||
+completions are also tracked: Zoom follows the selected candidate
|
||||
+rather than the text cursor during completion.
|
||||
+
|
||||
+++
|
||||
** 'line-spacing' now supports specifying spacing above the line.
|
||||
@@ -86,7 +85,7 @@ index 932d209f56..88c9251c18 100644
|
||||
#endif
|
||||
|
||||
static EmacsMenu *dockMenu;
|
||||
@@ -1081,6 +1086,281 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
|
||||
@@ -1081,6 +1086,284 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
|
||||
}
|
||||
|
||||
|
||||
@@ -124,6 +123,9 @@ index 932d209f56..88c9251c18 100644
|
||||
+ return ns_zoom_cached_enabled;
|
||||
+}
|
||||
+
|
||||
+/* Note: ns_ax_face_is_selected in the VoiceOver series has identical
|
||||
+ logic. The duplication is intentional: both series are independent
|
||||
+ and must compile standalone. */
|
||||
+/* Identify faces that mark a selected completion candidate.
|
||||
+ Matches vertico-current, corfu-current, icomplete-selected-match,
|
||||
+ ivy-current-match, etc. by checking the face symbol name.
|
||||
@@ -368,7 +370,7 @@ index 932d209f56..88c9251c18 100644
|
||||
static void
|
||||
ns_update_end (struct frame *f)
|
||||
/* --------------------------------------------------------------------------
|
||||
@@ -1104,6 +1384,41 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
|
||||
@@ -1104,6 +1387,41 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
|
||||
|
||||
unblock_input ();
|
||||
ns_updating_frame = NULL;
|
||||
@@ -410,7 +412,7 @@ index 932d209f56..88c9251c18 100644
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -3232,6 +3547,45 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
|
||||
@@ -3232,6 +3550,45 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
|
||||
/* Prevent the cursor from being drawn outside the text area. */
|
||||
r = NSIntersectionRect (r, ns_row_rect (w, glyph_row, TEXT_AREA));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user