isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

magnifier: Request window-relative coordinates for focus/caret events

Browse Source 
Absolute screen coordinates are impossible for Wayland clients to
provide, because the clients don't know where the window is positioned.
Some clients, such as the ones using GTK 3 were providing window
relative coordinates even when screen coordinates were requested,
while others, such as GTK 4 clients, were just returning an error for
caret events or also window-relative coordinates for focus events.

So for this to work on Wayland we have to request window-relative
coordinates and translate them to the current focus window.

To ensure the correct coordinates, we have to only consider events
coming from the current focus window. All other events are filtered out
now. As a side effect this also fixes the magnifier always jumping
to a terminal cursor whenever there was some output, even if the window
was not focused.

This also needs some special handling for events coming from the shell
itself, which should not be translated to the focus window either. As
another side effect this fixes another bug that was caused by these
events already including scaling and getting scaled again.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5509
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2301>
This commit is contained in:
Sebastian Keller 2022-05-23 23:01:23 +02:00 committed by Marge Bot
parent 2bd8dd385e
commit 8b5d027724
1 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
js/ui/magnifier.js
View File

@ -804,22 +804,80 @@ var ZoomRegion = class ZoomRegion {
}
}
_convertExtentsToScreenSpace(accessible, extents) {
const toplevelWindowTypes = new Set([
Atspi.Role.FRAME,
Atspi.Role.DIALOG,
Atspi.Role.WINDOW,
]);
try {
let app = null;
let parentWindow = null;
let iter = accessible;
while (iter) {
if (iter.get_role() === Atspi.Role.APPLICATION) {
app = iter;
/* This is the last Accessible we are interested in */
break;
} else if (toplevelWindowTypes.has(iter.get_role())) {
parentWindow = iter;
}
iter = iter.get_parent();
}
/* We don't want to translate our own events to the focus window.
* They are also already scaled by clutter before being sent, so
* we don't need to do that here either. */
if (app && app.get_name() === 'gnome-shell')
return extents;
/* Only events from the focused widget of the focused window. Some
* widgets seem to claim to have focus when the window does not so
* check both. */
const windowActive = parentWindow &&
parentWindow.get_state_set().contains(Atspi.StateType.ACTIVE);
const accessibleFocused =
accessible.get_state_set().contains(Atspi.StateType.FOCUSED);
if (!windowActive || !accessibleFocused)
return null;
} catch (e) {
throw new Error(`Failed to validate parent window: ${e}`);
}
const focusWindowRect = global.display.focus_window?.get_frame_rect();
if (!focusWindowRect)
return null;
const scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
const screenSpaceExtents = new Atspi.Rect({
x: focusWindowRect.x + (scaleFactor * extents.x),
y: focusWindowRect.y + (scaleFactor * extents.y),
width: scaleFactor * extents.width,
height: scaleFactor * extents.height,
});
return screenSpaceExtents;
}
_updateFocus(caller, event) {
let component = event.source.get_component_iface();
if (!component || event.detail1 != 1)
return;
let extents;
try {
extents = component.get_extents(Atspi.CoordType.SCREEN);
extents = component.get_extents(Atspi.CoordType.WINDOW);
extents = this._convertExtentsToScreenSpace(event.source, extents);
if (!extents)
return;
} catch (e) {
log(`Failed to read extents of focused component: ${e.message}`);
return;
}
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
const [xFocus, yFocus] = [
(extents.x + (extents.width / 2)) * scaleFactor,
(extents.y + (extents.height / 2)) * scaleFactor,
extents.x + (extents.width / 2),
extents.y + (extents.height / 2),
];
if (this._xFocus !== xFocus || this._yFocus !== yFocus) {
@ -834,14 +892,17 @@ var ZoomRegion = class ZoomRegion {
return;
let extents;
try {
extents = text.get_character_extents(text.get_caret_offset(), 0);
extents = text.get_character_extents(text.get_caret_offset(),
Atspi.CoordType.WINDOW);
extents = this._convertExtentsToScreenSpace(text, extents);
if (!extents)
return;
} catch (e) {
log(`Failed to read extents of text caret: ${e.message}`);
return;
}
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
let [xCaret, yCaret] = [extents.x * scaleFactor, extents.y * scaleFactor];
const [xCaret, yCaret] = [extents.x, extents.y];
// Ignore event(s) if the caret size is none (0x0). This happens a lot if
// the cursor offset can't be translated into a location. This is a work