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

162
src/wayland/protocols/atspi.rs
View file

@ -1,162 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use cosmic_protocols::atspi::v1::server::cosmic_atspi_manager_v1;
use smithay::{
backend::input::Keycode,
reexports::wayland_server::{
Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, backend::GlobalId,
},
};
use std::os::unix::{io::AsFd, net::UnixStream};
use wayland_backend::server::ClientId;
pub trait AtspiHandler {
fn client_connected(
&mut self,
manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1,
key_event_socket: UnixStream,
);
fn client_disconnected(&mut self, manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1);
fn add_key_grab(
&mut self,
manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1,
mods: u32,
virtual_mods: Vec<Keycode>,
key: Keycode,
);
fn remove_key_grab(
&mut self,
manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1,
mods: u32,
virtual_mods: Vec<Keycode>,
key: Keycode,
);
fn grab_keyboard(&mut self, manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1);
fn ungrab_keyboard(&mut self, manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1);
}
#[derive(Debug)]
pub struct AtspiState {
global: GlobalId,
}
impl AtspiState {
pub fn new<D, F>(dh: &DisplayHandle, client_filter: F) -> AtspiState
where
D: GlobalDispatch<cosmic_atspi_manager_v1::CosmicAtspiManagerV1, AtspiGlobalData> + 'static,
F: for<'a> Fn(&'a Client) -> bool + Send + Sync + 'static,
{
let global = dh.create_global::<D, cosmic_atspi_manager_v1::CosmicAtspiManagerV1, _>(
1,
AtspiGlobalData {
filter: Box::new(client_filter),
},
);
AtspiState { global }
}
pub fn global_id(&self) -> GlobalId {
self.global.clone()
}
}
pub struct AtspiGlobalData {
filter: Box<dyn for<'a> Fn(&'a Client) -> bool + Send + Sync>,
}
impl<D> GlobalDispatch<cosmic_atspi_manager_v1::CosmicAtspiManagerV1, AtspiGlobalData, D>
for AtspiState
where
D: GlobalDispatch<cosmic_atspi_manager_v1::CosmicAtspiManagerV1, AtspiGlobalData>
+ Dispatch<cosmic_atspi_manager_v1::CosmicAtspiManagerV1, ()>
+ AtspiHandler
+ 'static,
{
fn bind(
state: &mut D,
_dh: &DisplayHandle,
_client: &Client,
resource: New<cosmic_atspi_manager_v1::CosmicAtspiManagerV1>,
_global_data: &AtspiGlobalData,
data_init: &mut DataInit<'_, D>,
) {
let instance = data_init.init(resource, ());
let (client_socket, server_socket) = UnixStream::pair().unwrap();
state.client_connected(&instance, server_socket);
instance.key_events_eis(client_socket.as_fd());
}
fn can_view(client: Client, global_data: &AtspiGlobalData) -> bool {
(global_data.filter)(&client)
}
}
impl<D> Dispatch<cosmic_atspi_manager_v1::CosmicAtspiManagerV1, (), D> for AtspiState
where
D: Dispatch<cosmic_atspi_manager_v1::CosmicAtspiManagerV1, ()> + AtspiHandler + 'static,
{
fn request(
state: &mut D,
_client: &Client,
manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1,
request: cosmic_atspi_manager_v1::Request,
_data: &(),
_dh: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
match request {
cosmic_atspi_manager_v1::Request::AddKeyGrab {
mods,
virtual_mods,
key,
} => {
let virtual_mods = virtual_mods
.chunks_exact(4)
.map(|x| (u32::from_ne_bytes(<[u8; 4]>::try_from(x).unwrap()) + 8).into())
.collect();
state.add_key_grab(manager, mods, virtual_mods, (key + 8).into());
}
cosmic_atspi_manager_v1::Request::RemoveKeyGrab {
mods,
virtual_mods,
key,
} => {
let virtual_mods = virtual_mods
.chunks_exact(4)
.map(|x| (u32::from_ne_bytes(<[u8; 4]>::try_from(x).unwrap()) + 8).into())
.collect();
state.remove_key_grab(manager, mods, virtual_mods, (key + 8).into());
}
cosmic_atspi_manager_v1::Request::GrabKeyboard => {
state.grab_keyboard(manager);
}
cosmic_atspi_manager_v1::Request::UngrabKeyboard => {
state.ungrab_keyboard(manager);
}
cosmic_atspi_manager_v1::Request::Destroy => {}
_ => unreachable!(),
}
}
fn destroyed(
state: &mut D,
_client: ClientId,
manager: &cosmic_atspi_manager_v1::CosmicAtspiManagerV1,
_data: &(),
) {
state.client_disconnected(manager);
}
}
macro_rules! delegate_atspi {
($(@<$( $lt:tt $( : $clt:tt $(+ $dlt:tt )* )? ),+>)? $ty: ty) => {
smithay::reexports::wayland_server::delegate_global_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
cosmic_protocols::atspi::v1::server::cosmic_atspi_manager_v1::CosmicAtspiManagerV1: $crate::wayland::protocols::atspi::AtspiGlobalData
] => $crate::wayland::protocols::atspi::AtspiState);
smithay::reexports::wayland_server::delegate_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
cosmic_protocols::atspi::v1::server::cosmic_atspi_manager_v1::CosmicAtspiManagerV1: ()
] => $crate::wayland::protocols::atspi::AtspiState);
};
}
pub(crate) use delegate_atspi;

1
src/wayland/protocols/mod.rs
View file

@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
pub mod a11y;
pub mod atspi;
pub mod corner_radius;
pub mod drm;
pub mod image_capture_source;