Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/track/focus_track.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -733,11 +733,19 @@ struct FocusRun {
// has nothing better is the ghost skipped below.
// A wrapped message moves the ghost up a line per line of text, and close to the box
// end it is too near to look like a jump, but its height is always off the line's.
// #561: a UIA caret outside its own focused element is suspect too (Prism's new-folder
// dialog, Electron, field 2026-11-10: a fixed 2070,1170 below the 1520,1022 852x86
// input on every keystroke). MSAA's caret replaces it only from inside the element.
const wind::TrackBox elemBox{ b.left, b.top, b.right, b.bottom };
const bool uiaOutside = !java && src[0] == 'u' &&
!CaretInsideElement({ rc.left, rc.top, rc.right, rc.bottom }, elemBox);
if (!java && src[0] == 'u' &&
(wind::IsLineEndGhost((int)rc.left, (int)rc.top, (int)rc.bottom, caretGhost) ||
(uiaOutside ||
wind::IsLineEndGhost((int)rc.left, (int)rc.top, (int)rc.bottom, caretGhost) ||
wind::IsOffLineHeight((int)rc.top, (int)rc.bottom, caretLine.lineH))) {
RECT m{};
if (MsaaCaret(m) && !EqualRect(&m, &rc) &&
CaretInsideElement({ m.left, m.top, m.right, m.bottom }, elemBox) &&
!wind::IsLineEndGhost((int)m.left, (int)m.top, (int)m.bottom, caretGhost)) {
if (log_.load() && !EqualRect(&m, &lastCaret))
wind::Log(wind::LogLevel::Info, "track", "uia suspect %ld,%ld %ldx%ld: msaa caret %ld,%ld instead",
Expand Down Expand Up @@ -769,9 +777,9 @@ struct FocusRun {
// In a Gecko browser (Firefox, Zen, LibreWolf...: one window class), a caret
// outside its own element is a bad report, not a place to look (a zoomed iframe,
// issue #278; its UIA caret was wrong too, so there is no source to fall back
// to): the view stays where it is. Other apps are unchanged, so no case that
// worked before can lose tracking to this rule.
if (IsGeckoWindow(fg) &&
// to): the view stays where it is. Since #561 the same holds for every UIA caret
// MSAA could not replace above (Chromium's fixed rect below Prism's dialog input).
if ((IsGeckoWindow(fg) || src[0] == 'u') &&
!CaretInsideElement({ rc.left, rc.top, rc.right, rc.bottom }, { b.left, b.top, b.right, b.bottom })) {
if (log_.load()) wind::Log(wind::LogLevel::Info, "track", "caret skipped (outside its element %ld,%ld %ldx%ld) via %s: %ld,%ld",
b.left, b.top, b.right - b.left, b.bottom - b.top, src, rc.left, rc.top);
Expand Down
6 changes: 6 additions & 0 deletions tests/test_track_filter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ TEST_CASE("caret inside its element is trusted; the field-recorded Firefox ifram
CHECK(CaretInsideElement({ 3020, 1000, 3022, 1068 }, input)); // at the right end, inside
CHECK(CaretInsideElement({ 5, 5, 6, 20 }, { 0, 0, 0, 0 })); // unknown element: trust
}
TEST_CASE("Prism dialog (#561): the fixed UIA caret below the input is outside, MSAA's is inside") {
const TrackBox input{ 1520, 1022, 2372, 1108 }; // 852x86, field 2026-11-10
CHECK_FALSE(CaretInsideElement({ 2070, 1170, 2072, 1208 }, input)); // UIA: below the input
CHECK(CaretInsideElement({ 1541, 1046, 1543, 1083 }, input)); // MSAA caret
CHECK(CaretInsideElement({ 1540, 1046, 1697, 1084 }, input)); // the selected name
}
TEST_CASE("terminal caret beside its cell stays trusted") {
CHECK(CaretInsideElement({ 332, 1692, 343, 1737 }, { 322, 1692, 346, 1737 }));
}
Expand Down
Loading