leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland: Remove atspi protocol

Browse source 
If we want to use the `org.freedesktop.a11y.KeyboardMonitor` protocol on
Pop!_OS, there is no need to support the Cosmic-specific protocol that
requires an `at-spi2-core` patch.
This commit is contained in:
Ian Douglas Scott 2025-11-14 14:45:36 -08:00 • committed by Ian Douglas Scott
parent f065143d3e
commit a3904af03c
9 changed files with 8 additions and 519 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/input/mod.rs
View file

@ -1592,9 +1592,6 @@ impl State {
.unwrap_or(false)
});
self.common
.atspi_ei
.input(modifiers, &handle, event.state(), event.time() * 1000);
self.common
.a11y_keyboard_monitor_state
.key_event(modifiers, &handle, event.state());
@ -1762,12 +1759,7 @@ impl State {
}
if event.state() == KeyState::Released {
let mut removed = self
.common
.atspi_ei
.active_virtual_mods
.remove(&event.key_code());
removed |= self
let removed = self
.common
.a11y_keyboard_monitor_state
.remove_active_virtual_mod(handle.modified_sym());
@ -1797,27 +1789,20 @@ impl State {
);
}
} else if event.state() == KeyState::Pressed
&& (self
&& self
.common
.atspi_ei
.virtual_mods
.contains(&event.key_code())
|| self
.common
.a11y_keyboard_monitor_state
.has_virtual_mod(handle.modified_sym()))
.a11y_keyboard_monitor_state
.has_virtual_mod(handle.modified_sym())
{
self.common
.atspi_ei
.active_virtual_mods
.insert(event.key_code());
self.common
.a11y_keyboard_monitor_state
.add_active_virtual_mod(handle.modified_sym());
tracing::debug!(
"active virtual mods: {:?}",
self.common.atspi_ei.active_virtual_mods
self.common
.a11y_keyboard_monitor_state
.active_virtual_mods()
);
seat.supressed_keys().add(&handle, None);
@ -1848,12 +1833,7 @@ impl State {
return FilterResult::Intercept(None);
}
if self.common.atspi_ei.has_keyboard_grab()
|| self.common.a11y_keyboard_monitor_state.has_keyboard_grab()
|| self
.common
.atspi_ei
.has_key_grab(modifiers.serialized.layout_effective, event.key_code())
if self.common.a11y_keyboard_monitor_state.has_keyboard_grab()
|| self
.common
.a11y_keyboard_monitor_state