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

fix: use manual y-flip instead of accessibilityConvertScreenRect:

Browse Source 
Compilation error: EmacsView does not declare NSAccessibility conformance
so accessibilityConvertScreenRect: is not visible to the compiler.
Replaced with manual coordinate conversion:
  primaryH = NSScreen.screens.first.frame.height
  cgRect.origin.y = primaryH - cgRect.origin.y - cgRect.size.height
This commit is contained in:
Daneel
2026-02-23 10:28:02 +01:00
parent 5196674d9e
commit 87003cac96
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
From 09f293daca75996e7348c89e2b0d31a16c1c2500 Mon Sep 17 00:00:00 2001 From cb2c19955d681dd5fa6e865a8ddb553efa5a9ead Mon Sep 17 00:00:00 2001
From: Daneel <daneel@sukany.cz> From: Daneel <daneel@sukany.cz>
Date: Mon, 23 Feb 2026 10:22:47 +0100 Date: Mon, 23 Feb 2026 10:27:44 +0100
Subject: [PATCH] ns: implement UAZoomChangeFocus + NSAccessibility for macOS Subject: [PATCH] ns: implement UAZoomChangeFocus + NSAccessibility for macOS
Zoom Zoom
@@ -8,33 +8,34 @@ Add full cursor tracking support for macOS Zoom 'Follow keyboard focus'
and other assistive technology tools. and other assistive technology tools.
ROOT CAUSE: NSAccessibility notifications alone are insufficient for ROOT CAUSE: NSAccessibility notifications alone are insufficient for
custom-drawn views. macOS Zoom requires an explicit call to custom-drawn views. macOS Zoom 'Follow keyboard focus' requires an
UAZoomChangeFocus() from HIServices/UniversalAccess.h. This is the explicit call to UAZoomChangeFocus() from HIServices/UniversalAccess.h.
same mechanism used by iTerm2 (PTYTextView.m:refreshAccessibility) and This is the same mechanism used by iTerm2 (PTYTextView.m:refreshAccessibility)
Chromium (render_widget_host_view_mac.mm:OnSelectionBoundsChanged). and Chromium (render_widget_host_view_mac.mm:OnSelectionBoundsChanged).
Changes to src/nsterm.h: Changes to src/nsterm.h:
- Add lastAccessibilityCursorRect ivar to EmacsView - Add lastAccessibilityCursorRect ivar to EmacsView
Changes to src/nsterm.m: Changes to src/nsterm.m:
- ns_draw_window_cursor: store cursor rect, post SelectedTextChanged, - ns_draw_window_cursor: store cursor rect, post SelectedTextChanged,
call UAZoomChangeFocus() with cursor rect in AX screen coordinates call UAZoomChangeFocus() with cursor position in AX screen coordinates
(y-flipped: UAZoomChangeFocus expects origin at top-left of screen)
- windowDidBecomeKey: post FocusedUIElementChangedNotification - windowDidBecomeKey: post FocusedUIElementChangedNotification
- EmacsView: add accessibilityIsIgnored (NO), isAccessibilityElement (YES), - EmacsView: accessibilityIsIgnored=NO, isAccessibilityElement=YES,
accessibilityFocusedUIElement (self), accessibilityRole (TextAreaRole), accessibilityFocusedUIElement=self, accessibilityRole=TextAreaRole,
accessibilityAttributeNames, accessibilityAttributeValue: (responds to accessibilityAttributeNames, accessibilityAttributeValue: for
NSAccessibilitySelectedTextRangeAttribute with {0,0}), NSAccessibilitySelectedTextRangeAttribute -> {0,0},
accessibilityBoundsForRange: (new NSAccessibilityProtocol, macOS 10.10+), accessibilityBoundsForRange: (new API, macOS 10.10+),
accessibilityParameterizedAttributeNames + old AXBoundsForRange fallback accessibilityAttributeValue:forParameter: (old AXBoundsForRange fallback)
Carbon/Carbon.h (already included in NS_IMPL_COCOA) provides UAZoomEnabled(), Carbon/Carbon.h (already included) provides UAZoomEnabled(),
UAZoomChangeFocus(), and kUAZoomFocusTypeInsertionPoint. UAZoomChangeFocus(), kUAZoomFocusTypeInsertionPoint.
See also: https://github.com/nicowillis/Ghostty/issues/4053 See also: https://github.com/nicowillis/Ghostty/issues/4053
--- ---
src/nsterm.h | 3 + src/nsterm.h | 3 +
src/nsterm.m | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/nsterm.m | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 159 insertions(+) 2 files changed, 167 insertions(+)
diff --git a/src/nsterm.h b/src/nsterm.h diff --git a/src/nsterm.h b/src/nsterm.h
index 7c1ee4cf535..6c1ff3434a3 100644 index 7c1ee4cf535..6c1ff3434a3 100644
@@ -51,10 +52,10 @@ index 7c1ee4cf535..6c1ff3434a3 100644
/* AppKit-side interface. */ /* AppKit-side interface. */
diff --git a/src/nsterm.m b/src/nsterm.m diff --git a/src/nsterm.m b/src/nsterm.m
index 932d209f56b..38d946f1d9f 100644 index 932d209f56b..a377d70c6fb 100644
--- a/src/nsterm.m --- a/src/nsterm.m
+++ b/src/nsterm.m +++ b/src/nsterm.m
@@ -3232,6 +3232,40 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors. @@ -3232,6 +3232,48 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
/* Prevent the cursor from being drawn outside the text area. */ /* Prevent the cursor from being drawn outside the text area. */
r = NSIntersectionRect (r, ns_row_rect (w, glyph_row, TEXT_AREA)); r = NSIntersectionRect (r, ns_row_rect (w, glyph_row, TEXT_AREA));
@@ -84,8 +85,16 @@ index 932d209f56b..38d946f1d9f 100644
+ { + {
+ NSRect windowRect = [view convertRect:r toView:nil]; + NSRect windowRect = [view convertRect:r toView:nil];
+ NSRect screenRect = [[view window] convertRectToScreen:windowRect]; + NSRect screenRect = [[view window] convertRectToScreen:windowRect];
+ CGRect cgRect = [view accessibilityConvertScreenRect: + CGRect cgRect = NSRectToCGRect (screenRect);
+ NSRectToCGRect (screenRect)]; +
+ /* UAZoomChangeFocus expects coordinates with origin at the
+ top-left of the primary screen (NSAccessibility coordinate
+ space). [window convertRectToScreen:] returns Quartz screen
+ coordinates with origin at the bottom-left of the primary
+ screen, so we flip the y axis manually. */
+ CGFloat primaryH = [[[NSScreen screens] firstObject] frame].size.height;
+ cgRect.origin.y = primaryH - cgRect.origin.y - cgRect.size.height;
+
+ UAZoomChangeFocus (&cgRect, &cgRect, kUAZoomFocusTypeInsertionPoint); + UAZoomChangeFocus (&cgRect, &cgRect, kUAZoomFocusTypeInsertionPoint);
+ } + }
+ } + }
@@ -95,7 +104,7 @@ index 932d209f56b..38d946f1d9f 100644
ns_focus (f, NULL, 0); ns_focus (f, NULL, 0);
NSGraphicsContext *ctx = [NSGraphicsContext currentContext]; NSGraphicsContext *ctx = [NSGraphicsContext currentContext];
@@ -8237,6 +8271,14 @@ - (void)windowDidBecomeKey /* for direct calls */ @@ -8237,6 +8279,14 @@ - (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
@@ -110,7 +119,7 @@ index 932d209f56b..38d946f1d9f 100644
} }
@@ -9474,6 +9516,120 @@ - (int) fullscreenState @@ -9474,6 +9524,120 @@ - (int) fullscreenState
return fs_state; return fs_state;
} }