Separate conversation drafts and voice view state, add native settings and restricted CSS themes, implement validated avatar cropping, and refresh dependencies with documented desktop compatibility backports.
210 lines
7 KiB
Diff
210 lines
7 KiB
Diff
--- a/accesskit_unix/Cargo.toml
|
|
+++ b/accesskit_unix/Cargo.toml
|
|
@@ -99,6 +99,6 @@
|
|
optional = true
|
|
|
|
[dependencies.zbus]
|
|
-version = "5.5"
|
|
-features = ["async-io"]
|
|
+version = "6.1"
|
|
+features = ["default-rt", "proxy", "service", "object-manager"]
|
|
default-features = false
|
|
--- a/accesskit_unix/src/atspi/bus.rs
|
|
+++ b/accesskit_unix/src/atspi/bus.rs
|
|
@@ -6,7 +6,6 @@
|
|
use crate::{
|
|
atspi::{ObjectId, cache_path, interfaces::*},
|
|
context::get_or_init_app_context,
|
|
- executor::{Executor, Task},
|
|
};
|
|
use accesskit_atspi_common::{
|
|
NodeId, NodeIdOrRoot, ObjectEvent, PlatformNode, PlatformRoot, Property, WindowEvent,
|
|
@@ -24,12 +23,11 @@
|
|
Address, Connection, Result,
|
|
connection::Builder,
|
|
names::{BusName, InterfaceName, MemberName, OwnedUniqueName},
|
|
- zvariant::{Str, Value},
|
|
+ wire::{Str, Variant as Value},
|
|
};
|
|
|
|
pub(crate) struct Bus {
|
|
conn: Connection,
|
|
- _task: Task<()>,
|
|
socket_proxy: SocketProxy<'static>,
|
|
desktop: Arc<OnceLock<ObjectRefOwned>>,
|
|
}
|
|
@@ -37,30 +35,17 @@
|
|
impl Bus {
|
|
pub(crate) async fn new(
|
|
session_bus: &Connection,
|
|
- executor: &Executor<'_>,
|
|
) -> zbus::Result<Self> {
|
|
let address = match var("AT_SPI_BUS_ADDRESS") {
|
|
Ok(address) if !address.is_empty() => address,
|
|
_ => BusProxy::new(session_bus).await?.get_address().await?,
|
|
};
|
|
let address: Address = address.as_str().try_into()?;
|
|
- let conn = Builder::address(address)?
|
|
- .internal_executor(false)
|
|
- .build()
|
|
- .await?;
|
|
- let conn_copy = conn.clone();
|
|
- let _task = executor.spawn(
|
|
- async move {
|
|
- loop {
|
|
- conn_copy.executor().tick().await;
|
|
- }
|
|
- },
|
|
- "accesskit_atspi_bus_task",
|
|
- );
|
|
+ // zbus 6 selects and drives its maintained default runtime.
|
|
+ let conn = Builder::address(address).build().await?;
|
|
let socket_proxy = SocketProxy::new(&conn).await?;
|
|
let mut bus = Bus {
|
|
conn,
|
|
- _task,
|
|
socket_proxy,
|
|
desktop: Arc::new(OnceLock::new()),
|
|
};
|
|
@@ -81,6 +66,7 @@
|
|
.object_server()
|
|
.at(path.clone(), ApplicationInterface(node.clone()))
|
|
.await?
|
|
+ .is_none()
|
|
{
|
|
let desktop = self
|
|
.socket_proxy
|
|
@@ -174,7 +160,7 @@
|
|
map_or_ignoring_recoverable_error(
|
|
self.conn.object_server().at(path, interface).await,
|
|
false,
|
|
- |result| result,
|
|
+ |result| result.is_none(),
|
|
)
|
|
}
|
|
|
|
@@ -412,7 +398,7 @@
|
|
|
|
async fn emit_cache_signal<B>(&self, signal_name: &str, body: &B) -> Result<()>
|
|
where
|
|
- B: serde::Serialize + zbus::zvariant::DynamicType,
|
|
+ B: serde::Serialize + zbus::wire::DynamicType,
|
|
{
|
|
map_or_ignoring_recoverable_error(
|
|
self.conn
|
|
--- a/accesskit_unix/src/atspi/object_address.rs
|
|
+++ b/accesskit_unix/src/atspi/object_address.rs
|
|
@@ -7,7 +7,7 @@
|
|
use serde::{Deserialize, Serialize};
|
|
use zbus::{
|
|
names::UniqueName,
|
|
- zvariant::{ObjectPath, OwnedObjectPath, OwnedValue, Type, Value},
|
|
+ wire::{ObjectPath, OwnedObjectPath, OwnedVariant as OwnedValue, Type, Variant as Value},
|
|
};
|
|
|
|
// https://gnome.pages.gitlab.gnome.org/at-spi2-core/libatspi/const.DBUS_PATH_NULL.html
|
|
--- a/accesskit_unix/src/atspi/object_id.rs
|
|
+++ b/accesskit_unix/src/atspi/object_id.rs
|
|
@@ -8,7 +8,7 @@
|
|
use serde::{Serialize, Serializer};
|
|
use zbus::{
|
|
names::UniqueName,
|
|
- zvariant::{ObjectPath, OwnedObjectPath, Signature, Structure, Type},
|
|
+ wire::{ObjectPath, OwnedObjectPath, Signature, Structure, Type},
|
|
};
|
|
|
|
const ACCESSIBLE_PATH_PREFIX: &str = "/org/a11y/atspi/accessible/";
|
|
--- a/accesskit_unix/src/context.rs
|
|
+++ b/accesskit_unix/src/context.rs
|
|
@@ -26,7 +26,6 @@
|
|
use crate::{
|
|
adapter::{AdapterState, Callback, Message},
|
|
atspi::{Bus, map_or_ignoring_recoverable_error, zbus_error_is_unrecoverable},
|
|
- executor::Executor,
|
|
util::block_on,
|
|
};
|
|
|
|
@@ -53,19 +52,17 @@
|
|
let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
|
|
|
|
thread::spawn(|| {
|
|
- let executor = Executor::new();
|
|
- block_on(executor.run(async {
|
|
- if let Ok(session_bus) = Builder::session() {
|
|
- if let Ok(session_bus) = session_bus.internal_executor(false).build().await
|
|
- {
|
|
- if let Err(error) = run_event_loop(&executor, session_bus, rx).await {
|
|
- if zbus_error_is_unrecoverable(&error) {
|
|
- panic!("Accessibility event loop failed: {error}");
|
|
- }
|
|
+ // zbus 6's default runtime drives its connection tasks itself.
|
|
+ // Only this AccessKit event loop remains on our dedicated thread.
|
|
+ block_on(async {
|
|
+ if let Ok(session_bus) = Builder::session().build().await {
|
|
+ if let Err(error) = run_event_loop(session_bus, rx).await {
|
|
+ if zbus_error_is_unrecoverable(&error) {
|
|
+ panic!("Accessibility event loop failed: {error}");
|
|
}
|
|
}
|
|
}
|
|
- }))
|
|
+ })
|
|
});
|
|
|
|
tx
|
|
@@ -142,14 +139,13 @@
|
|
async fn bus_after_status_change(
|
|
change: Option<PropertyChanged<'_, bool>>,
|
|
session_bus: &Connection,
|
|
- executor: &Executor<'_>,
|
|
) -> zbus::Result<Option<Bus>> {
|
|
let enabled = match change {
|
|
Some(change) => change.get().await?,
|
|
None => false,
|
|
};
|
|
if enabled {
|
|
- map_or_ignoring_recoverable_error(Bus::new(session_bus, executor).await, None, Some)
|
|
+ map_or_ignoring_recoverable_error(Bus::new(session_bus).await, None, Some)
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
@@ -167,20 +163,9 @@
|
|
}
|
|
|
|
async fn run_event_loop(
|
|
- executor: &Executor<'_>,
|
|
session_bus: Connection,
|
|
rx: Receiver<Message>,
|
|
) -> zbus::Result<()> {
|
|
- let session_bus_copy = session_bus.clone();
|
|
- let _session_bus_task = executor.spawn(
|
|
- async move {
|
|
- loop {
|
|
- session_bus_copy.executor().tick().await;
|
|
- }
|
|
- },
|
|
- "accesskit_session_bus_task",
|
|
- );
|
|
-
|
|
let status = StatusProxy::new(&session_bus).await?;
|
|
let changes = status.receive_is_enabled_changed().await.fuse();
|
|
pin!(changes);
|
|
@@ -197,7 +182,7 @@
|
|
loop {
|
|
select! {
|
|
change = changes.next() => {
|
|
- atspi_bus = bus_after_status_change(change, &session_bus, executor).await?;
|
|
+ atspi_bus = bus_after_status_change(change, &session_bus).await?;
|
|
sync_adapters(&mut adapters, &atspi_bus);
|
|
|
|
}
|
|
--- a/accesskit_unix/src/lib.rs
|
|
+++ b/accesskit_unix/src/lib.rs
|
|
@@ -21,7 +21,6 @@
|
|
mod adapter;
|
|
mod atspi;
|
|
mod context;
|
|
-mod executor;
|
|
mod util;
|
|
|
|
pub use adapter::Adapter;
|