feat(client): redesign native UI, themes, settings and avatars

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.
This commit is contained in:
Loki 2026-10-24 14:23:48 +02:00
parent 44d284a568
commit 8e5ab56611
Signed by: boba
GPG key ID: 253067914055423B
276 changed files with 53546 additions and 3399 deletions

View file

@ -0,0 +1,35 @@
--- a/accesskit_atspi_common/Cargo.toml
+++ b/accesskit_atspi_common/Cargo.toml
@@ -57,6 +57,8 @@
[dependencies.serde]
version = "1.0"
-[dependencies.zvariant]
-version = "5.4"
+
+[dependencies.zbus]
+version = "6.1"
default-features = false
+features = ["default-rt", "proxy", "service", "object-manager"]
--- a/accesskit_atspi_common/src/action.rs
+++ b/accesskit_atspi_common/src/action.rs
@@ -4,7 +4,7 @@
// the LICENSE-MIT file), at your option.
use serde::{Deserialize, Serialize};
-use zvariant::Type;
+use zbus::wire::Type;
#[derive(Deserialize, Serialize, Type)]
pub struct Action {
--- a/accesskit_atspi_common/src/rect.rs
+++ b/accesskit_atspi_common/src/rect.rs
@@ -4,7 +4,7 @@
// the LICENSE-MIT file), at your option.
use serde::{Deserialize, Serialize};
-use zvariant::{OwnedValue, Type, Value};
+use zbus::wire::{OwnedVariant as OwnedValue, Type, Variant as Value};
#[derive(
Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, OwnedValue, Type, Value,

View file

@ -0,0 +1,210 @@
--- 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;

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,303 @@
--- a/atspi-proxies/Cargo.toml
+++ b/atspi-proxies/Cargo.toml
@@ -63,8 +63,8 @@
default-features = false
[dependencies.zbus]
-version = "5.5"
-features = ["async-io"]
+version = "6.1"
+features = ["default-rt", "proxy", "service", "object-manager"]
default-features = false
[dev-dependencies.atspi-common]
--- a/atspi-proxies/src/accessible.rs
+++ b/atspi-proxies/src/accessible.rs
@@ -296,8 +296,8 @@
let path = self.path();
AccessibleProxy::builder(conn)
- .destination(name)?
- .path(path)?
+ .destination(name)
+ .path(path)
.cache_properties(zbus::proxy::CacheProperties::No)
.build()
.await
@@ -318,8 +318,8 @@
let path = self.path();
AccessibleProxy::builder(conn)
- .destination(name)?
- .path(path)?
+ .destination(name)
+ .path(path)
.cache_properties(zbus::proxy::CacheProperties::No)
.build()
.await
--- a/atspi-proxies/src/collection.rs
+++ b/atspi-proxies/src/collection.rs
@@ -63,7 +63,7 @@
/// [`TreeTraversalType`]: atspi_common::TreeTraversalType
fn get_matches_from(
&self,
- current_object: &zbus::zvariant::ObjectPath<'_>,
+ current_object: &zbus::wire::ObjectPath<'_>,
rule: ObjectMatchRule,
sortby: SortOrder,
tree: TreeTraversalType,
@@ -90,7 +90,7 @@
#[allow(clippy::too_many_arguments)]
fn get_matches_to(
&self,
- current_object: &zbus::zvariant::ObjectPath<'_>,
+ current_object: &zbus::wire::ObjectPath<'_>,
rule: ObjectMatchRule,
sortby: SortOrder,
tree: TreeTraversalType,
--- a/atspi-proxies/src/device_event_controller.rs
+++ b/atspi-proxies/src/device_event_controller.rs
@@ -11,7 +11,7 @@
//!
use serde::{Deserialize, Serialize};
-use zbus::zvariant::Type;
+use zbus::wire::Type;
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
#[repr(u32)]
@@ -77,14 +77,14 @@
/// `DeregisterDeviceEventListener` method
fn deregister_device_event_listener(
&self,
- listener: &zbus::zvariant::ObjectPath<'_>,
+ listener: &zbus::wire::ObjectPath<'_>,
types: EventType,
) -> zbus::Result<()>;
/// `DeregisterKeystrokeListener` method
fn deregister_keystroke_listener(
&self,
- listener: &zbus::zvariant::ObjectPath<'_>,
+ listener: &zbus::wire::ObjectPath<'_>,
keys: &[KeyDefinition<'_>],
mask: u32,
type_: EventType,
@@ -110,14 +110,14 @@
/// `RegisterDeviceEventListener` method
fn register_device_event_listener(
&self,
- listener: &zbus::zvariant::ObjectPath<'_>,
+ listener: &zbus::wire::ObjectPath<'_>,
types: EventType,
) -> zbus::Result<bool>;
/// `RegisterKeystrokeListener` method
fn register_keystroke_listener(
&self,
- listener: &zbus::zvariant::ObjectPath<'_>,
+ listener: &zbus::wire::ObjectPath<'_>,
keys: &[KeyDefinition<'_>],
mask: u32,
type_: &[EventType],
--- a/atspi-proxies/src/proxy_ext.rs
+++ b/atspi-proxies/src/proxy_ext.rs
@@ -44,8 +44,8 @@
if self.interfaces.contains(Interface::Action) {
Ok(ActionProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -62,8 +62,8 @@
if self.interfaces.contains(Interface::Application) {
Ok(ApplicationProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -80,8 +80,8 @@
if self.interfaces.contains(Interface::Cache) {
Ok(CacheProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -98,8 +98,8 @@
if self.interfaces.contains(Interface::Collection) {
Ok(CollectionProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -116,8 +116,8 @@
if self.interfaces.contains(Interface::Component) {
Ok(ComponentProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -134,8 +134,8 @@
if self.interfaces.contains(Interface::Document) {
Ok(DocumentProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -152,8 +152,8 @@
if self.interfaces.contains(Interface::EditableText) {
Ok(EditableTextProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -170,8 +170,8 @@
if self.interfaces.contains(Interface::Hyperlink) {
Ok(HyperlinkProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -188,8 +188,8 @@
if self.interfaces.contains(Interface::Hypertext) {
Ok(HypertextProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -206,8 +206,8 @@
if self.interfaces.contains(Interface::Image) {
Ok(ImageProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -224,8 +224,8 @@
if self.interfaces.contains(Interface::Selection) {
Ok(SelectionProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -242,8 +242,8 @@
if self.interfaces.contains(Interface::Table) {
Ok(TableProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -260,8 +260,8 @@
if self.interfaces.contains(Interface::TableCell) {
Ok(TableCellProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -278,8 +278,8 @@
if self.interfaces.contains(Interface::Text) {
Ok(TextProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
@@ -296,8 +296,8 @@
if self.interfaces.contains(Interface::Value) {
Ok(ValueProxy::builder(self.proxy.connection())
.cache_properties(zbus::proxy::CacheProperties::No)
- .destination(self.proxy.destination())?
- .path(self.proxy.path())?
+ .destination(self.proxy.destination())
+ .path(self.proxy.path())
.build()
.await?)
} else {
--- a/atspi-proxies/src/socket.rs
+++ b/atspi-proxies/src/socket.rs
@@ -31,11 +31,11 @@
/// * The registry sets the "Id" property on the org.a11y.atspi.Application interface on the @plug object.
/// * The Embed method returns with the bus name and object path for the registry's root object.
/// Returns: the bus name and object path of the registry's root object.
- fn embed(&self, plug: &(&str, zbus::zvariant::ObjectPath<'_>)) -> zbus::Result<ObjectRefOwned>;
+ fn embed(&self, plug: &(&str, zbus::wire::ObjectPath<'_>)) -> zbus::Result<ObjectRefOwned>;
/// This method is called by a socket to inform the plug that it is being
/// embedded. The plug should register the embedding socket as its parent.
- fn embedded(&self, path: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>;
+ fn embedded(&self, path: zbus::wire::ObjectPath<'_>) -> zbus::Result<()>;
/// Unembed method
/// @plug: a string for the unique bus name of the application, and an object path
@@ -44,5 +44,5 @@
/// Unregisters an application from the accesibility registry. It is not necessary to
/// call this method; the accessibility registry detects when an application
/// disconnects from the bus.
- fn unembed(&self, plug: &(&str, zbus::zvariant::ObjectPath<'_>)) -> zbus::Result<()>;
+ fn unembed(&self, plug: &(&str, zbus::wire::ObjectPath<'_>)) -> zbus::Result<()>;
}
--- a/atspi-proxies/src/text.rs
+++ b/atspi-proxies/src/text.rs
@@ -45,7 +45,7 @@
coord_type: CoordType,
x_clip_type: ClipType,
y_clip_type: ClipType,
- ) -> zbus::Result<Vec<(i32, i32, String, zbus::zvariant::OwnedValue)>>;
+ ) -> zbus::Result<Vec<(i32, i32, String, zbus::wire::OwnedVariant)>>;
/// `GetCharacterAtOffset` method
fn get_character_at_offset(&self, offset: i32) -> zbus::Result<i32>;

View file

@ -0,0 +1,31 @@
--- a/atspi/Cargo.toml
+++ b/atspi/Cargo.toml
@@ -50,6 +50,7 @@
repository = "https://github.com/odilia-app/atspi"
[features]
+zbus = []
connection = ["dep:atspi-connection"]
default = [
"connection",
@@ -80,9 +81,8 @@
optional = true
[dependencies.zbus]
-version = "5.5"
-features = ["async-io"]
-optional = true
+version = "6.1"
+features = ["default-rt", "proxy", "service", "object-manager"]
default-features = false
[dev-dependencies.criterion]
@@ -118,6 +118,6 @@
version = "0.1.1"
[dev-dependencies.zbus]
-version = "5.5"
-features = ["async-io"]
+version = "6.1"
+features = ["default-rt", "proxy", "service", "object-manager"]
default-features = false

View file

@ -0,0 +1,127 @@
--- a/i-slint-backend-winit/Cargo.toml
+++ b/i-slint-backend-winit/Cargo.toml
@@ -87,7 +87,7 @@
]
wayland = [
"winit/wayland",
- "winit/wayland-csd-adwaita",
+ "winit/wayland-csd-adwaita-crossfont",
"glutin?/wayland",
"glutin-winit?/wayland",
"dep:arboard",
@@ -261,8 +261,8 @@
version = "0.3.31"
[target.'cfg(not(any(target_family = "windows", target_vendor = "apple", target_arch = "wasm32", target_os = "android")))'.dependencies.zbus]
-version = "5.14.0"
-features = ["async-io"]
+version = "6.1"
+features = ["default-rt", "proxy", "service", "object-manager"]
default-features = false
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.accesskit]
--- a/i-slint-backend-winit/xdg_desktop_settings.rs
+++ b/i-slint-backend-winit/xdg_desktop_settings.rs
@@ -63,7 +63,7 @@
struct SettingDescriptor {
namespace: &'static str,
key: &'static str,
- apply: fn(zbus::zvariant::OwnedValue, &SettingsContext),
+ apply: fn(zbus::wire::OwnedVariant, &SettingsContext),
}
/// Every desktop setting Slint reacts to. Add a row here (and a small `apply_*`
@@ -95,7 +95,7 @@
last.parse::<f32>().ok().filter(|p| p.is_finite() && *p > 0.0)
}
-fn xdg_color_scheme_to_slint(value: zbus::zvariant::OwnedValue) -> ColorScheme {
+fn xdg_color_scheme_to_slint(value: zbus::wire::OwnedVariant) -> ColorScheme {
match value.downcast_ref::<u32>() {
Ok(1) => ColorScheme::Dark,
Ok(2) => ColorScheme::Light,
@@ -103,7 +103,7 @@
}
}
-fn xdg_accent_color_to_slint(value: zbus::zvariant::OwnedValue) -> Option<Color> {
+fn xdg_accent_color_to_slint(value: zbus::wire::OwnedVariant) -> Option<Color> {
// The accent-color setting returns a (ddd) tuple of RGB doubles in [0.0, 1.0]
let (r, g, b) = value.downcast_ref::<(f64, f64, f64)>().ok()?;
Some(Color::from_argb_f32(1.0, r as f32, g as f32, b as f32))
@@ -111,7 +111,7 @@
/// Sets the color scheme on the context and pushes the matching winit theme to
/// every mapped window so client-side decorations stay in sync.
-fn apply_color_scheme_value(value: zbus::zvariant::OwnedValue, cx: &SettingsContext) {
+fn apply_color_scheme_value(value: zbus::wire::OwnedVariant, cx: &SettingsContext) {
let scheme = xdg_color_scheme_to_slint(value);
if let Some(ctx) = cx.ctx.upgrade() {
ctx.set_color_scheme(scheme);
@@ -132,7 +132,7 @@
}
}
-fn apply_accent_value(value: zbus::zvariant::OwnedValue, cx: &SettingsContext) {
+fn apply_accent_value(value: zbus::wire::OwnedVariant, cx: &SettingsContext) {
if let Some(color) = xdg_accent_color_to_slint(value)
&& let Some(ctx) = cx.ctx.upgrade()
{
@@ -140,7 +140,7 @@
}
}
-fn apply_font_value(value: zbus::zvariant::OwnedValue, cx: &SettingsContext) {
+fn apply_font_value(value: zbus::wire::OwnedVariant, cx: &SettingsContext) {
if let Ok(name) = value.downcast_ref::<&str>()
&& let Some(points) = parse_font_points(name)
&& let Some(ctx) = cx.ctx.upgrade()
@@ -149,7 +149,7 @@
}
}
-fn apply_cursor_blink_value(value: zbus::zvariant::OwnedValue, cx: &SettingsContext) {
+fn apply_cursor_blink_value(value: zbus::wire::OwnedVariant, cx: &SettingsContext) {
if let Ok(enabled) = value.downcast_ref::<bool>()
&& let Some(shared) = cx.shared.upgrade()
{
@@ -157,7 +157,7 @@
}
}
-fn apply_cursor_blink_time_value(value: zbus::zvariant::OwnedValue, cx: &SettingsContext) {
+fn apply_cursor_blink_time_value(value: zbus::wire::OwnedVariant, cx: &SettingsContext) {
if let Ok(ms) = value.downcast_ref::<i32>()
&& ms > 0
&& let Some(shared) = cx.shared.upgrade()
@@ -183,7 +183,7 @@
async fn read_setting(
settings_proxy: &zbus::Proxy<'_>,
setting: &SettingDescriptor,
-) -> zbus::Result<zbus::zvariant::OwnedValue> {
+) -> zbus::Result<zbus::wire::OwnedVariant> {
let args = (setting.namespace, setting.key);
#[cfg_attr(slint_nightly_test, allow(non_exhaustive_omitted_patterns))]
match settings_proxy.call("ReadOne", &args).await {
@@ -219,9 +219,9 @@
let connection = zbus::Connection::session().await?;
let settings_proxy: zbus::Proxy = zbus::proxy::Builder::new(&connection)
- .interface("org.freedesktop.portal.Settings")?
- .path("/org/freedesktop/portal/desktop")?
- .destination("org.freedesktop.portal.Desktop")?
+ .interface("org.freedesktop.portal.Settings")
+ .path("/org/freedesktop/portal/desktop")
+ .destination("org.freedesktop.portal.Desktop")
.build()
.await?;
@@ -238,7 +238,7 @@
while let Some(message) = settings_stream.next().await {
let Ok((namespace, key, value)) =
- message.body().deserialize::<(String, String, zbus::zvariant::OwnedValue)>()
+ message.body().deserialize::<(String, String, zbus::wire::OwnedVariant)>()
else {
continue;
};

View file

@ -0,0 +1,68 @@
--- a/sctk-adwaita/Cargo.toml
+++ b/sctk-adwaita/Cargo.toml
@@ -26,7 +26,7 @@
optional = true
[dependencies.crossfont]
-version = "0.8.0"
+version = "0.9"
optional = true
[dependencies.log]
--- a/sctk-adwaita/src/parts.rs
+++ b/sctk-adwaita/src/parts.rs
@@ -128,7 +128,7 @@
Self { parts }
}
- pub fn parts(&self) -> std::iter::Enumerate<std::slice::Iter<Part>> {
+ pub fn parts(&self) -> std::iter::Enumerate<std::slice::Iter<'_, Part>> {
self.parts.iter().enumerate()
}
--- a/sctk-adwaita/src/theme.rs
+++ b/sctk-adwaita/src/theme.rs
@@ -99,7 +99,7 @@
}
impl ColorMap {
- pub(crate) fn headerbar_paint(&self) -> Paint {
+ pub(crate) fn headerbar_paint(&self) -> Paint<'_> {
Paint {
shader: Shader::SolidColor(self.headerbar),
anti_alias: true,
@@ -107,7 +107,7 @@
}
}
- pub(crate) fn button_idle_paint(&self) -> Paint {
+ pub(crate) fn button_idle_paint(&self) -> Paint<'_> {
Paint {
shader: Shader::SolidColor(self.button_idle),
anti_alias: true,
@@ -115,7 +115,7 @@
}
}
- pub(crate) fn button_hover_paint(&self) -> Paint {
+ pub(crate) fn button_hover_paint(&self) -> Paint<'_> {
Paint {
shader: Shader::SolidColor(self.button_hover),
anti_alias: true,
@@ -123,14 +123,14 @@
}
}
- pub(crate) fn button_icon_paint(&self) -> Paint {
+ pub(crate) fn button_icon_paint(&self) -> Paint<'_> {
Paint {
shader: Shader::SolidColor(self.button_icon),
..Default::default()
}
}
- pub(crate) fn border_paint(&self) -> Paint {
+ pub(crate) fn border_paint(&self) -> Paint<'_> {
Paint {
shader: Shader::SolidColor(self.border_color),
..Default::default()

View file

@ -0,0 +1,42 @@
--- a/zbus-lockstep-macros/Cargo.toml
+++ b/zbus-lockstep-macros/Cargo.toml
@@ -56,10 +56,13 @@
version = "0.5.2"
[dependencies.zbus_xml]
-version = "5.0.2"
+version = "6"
-[dependencies.zvariant]
-version = "5.1"
[dev-dependencies.version-sync]
version = "0.9"
+
+[dependencies.zbus]
+version = "6.1"
+default-features = false
+features = ["default-rt", "proxy", "service", "object-manager"]
--- a/zbus-lockstep-macros/src/lib.rs
+++ b/zbus-lockstep-macros/src/lib.rs
@@ -86,9 +86,9 @@
/// # Examples
///
/// ```rust
-/// use zvariant::OwnedObjectPath;
+/// use zbus::wire::OwnedObjectPath;
/// use zbus_lockstep_macros::validate;
-/// use zvariant::Type;
+/// use zbus::wire::Type;
///
/// #[validate(xml: "xml", interface: "org.example.Node", signal: "RemoveNode")]
/// #[derive(Type)]
@@ -258,7 +258,7 @@
#[cfg(test)]
#[test]
fn #test_name() {
- use zvariant::Type;
+ use zbus::wire::Type;
let xml_file = std::fs::File::open(#xml_file_path).expect("\"#xml_file_path\" expected to be a valid file path." );
let item_signature_from_xml = zbus_lockstep::get_signal_body_type(

View file

@ -0,0 +1,187 @@
--- a/zbus-lockstep/Cargo.toml
+++ b/zbus-lockstep/Cargo.toml
@@ -49,13 +49,16 @@
path = "src/lib.rs"
[dependencies.zbus_xml]
-version = "5.0.2"
+version = "6"
-[dependencies.zvariant]
-version = "5.1"
[dev-dependencies.tempfile]
version = "3"
[dev-dependencies.version-sync]
version = "0.9"
+
+[dependencies.zbus]
+version = "6.1"
+default-features = false
+features = ["default-rt", "proxy", "service", "object-manager"]
--- a/zbus-lockstep/src/lib.rs
+++ b/zbus-lockstep/src/lib.rs
@@ -32,7 +32,7 @@
ArgDirection::{In, Out},
Node,
};
-use zvariant::Signature;
+use zbus::wire::Signature;
use LockstepError::{ArgumentNotFound, InterfaceNotFound, MemberNotFound, PropertyNotFound};
type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
@@ -55,7 +55,7 @@
/// # use std::fs::File;
/// # use std::io::{Seek, SeekFrom, Write};
/// # use tempfile::tempfile;
-/// use zvariant::{Signature, Type, OwnedObjectPath};
+/// use zbus::wire::{Signature, Type, OwnedObjectPath};
/// use zbus_lockstep::get_signal_body_type;
///
/// let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
@@ -99,9 +99,8 @@
.find(|iface| iface.name() == interface_name)
.ok_or(InterfaceNotFound(interface_name.to_owned()))?;
- let signals = interface.signals();
+ let mut signals = interface.signals();
let signal = signals
- .iter()
.find(|signal| signal.name() == member_name)
.ok_or(MemberNotFound(member_name.to_owned()))?;
@@ -132,7 +131,7 @@
/// use std::fs::File;
/// use std::io::{Seek, SeekFrom, Write};
/// use tempfile::tempfile;
-/// use zvariant::Type;
+/// use zbus::wire::Type;
/// use zbus_lockstep::get_property_type;
///
/// #[derive(Debug, PartialEq, Type)]
@@ -169,9 +168,8 @@
.find(|iface| iface.name() == interface_name)
.ok_or(InterfaceNotFound(interface_name.to_string()))?;
- let properties = interface.properties();
+ let mut properties = interface.properties();
let property = properties
- .iter()
.find(|property| property.name() == property_name)
.ok_or(PropertyNotFound(property_name.to_owned()))?;
@@ -191,7 +189,7 @@
/// use std::fs::File;
/// use std::io::{Seek, SeekFrom, Write};
/// use tempfile::tempfile;
-/// use zvariant::Type;
+/// use zbus::wire::Type;
/// use zbus_lockstep::get_method_return_type;
///
/// #[derive(Debug, PartialEq, Type)]
@@ -237,9 +235,8 @@
.find(|iface| iface.name() == interface_name)
.ok_or(InterfaceNotFound(interface_name.to_string()))?;
- let methods = interface.methods();
+ let mut methods = interface.methods();
let method = methods
- .iter()
.find(|method| method.name() == member_name)
.ok_or(MemberNotFound(member_name.to_string()))?;
@@ -278,7 +275,7 @@
/// use std::collections::HashMap;
/// use std::io::{Seek, SeekFrom, Write};
/// use tempfile::tempfile;
-/// use zvariant::{Type, Value};
+/// use zbus::wire::{Type, Variant as Value};
/// use zbus_lockstep::get_method_args_type;
///
/// let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
@@ -335,9 +332,8 @@
.find(|iface| iface.name() == interface_name)
.ok_or(InterfaceNotFound(interface_name.to_owned()))?;
- let methods = interface.methods();
+ let mut methods = interface.methods();
let method = methods
- .iter()
.find(|method| method.name() == member_name)
.ok_or(member_name.to_owned())?;
@@ -364,7 +360,7 @@
use std::io::{Seek, SeekFrom, Write};
use tempfile::tempfile;
- use zvariant::{OwnedObjectPath, Type};
+ use zbus::wire::{OwnedObjectPath, Type};
use crate::get_signal_body_type;
--- a/zbus-lockstep/src/macros.rs
+++ b/zbus-lockstep/src/macros.rs
@@ -143,7 +143,7 @@
let entry = entry.expect("Failed to read entry");
// Skip directories and non-XML files.
- if entry.path().is_dir() || entry.path().extension().unwrap() != "xml" {
+ if entry.path().is_dir() || entry.path().extension() != Some(std::ffi::OsStr::new("xml")) {
continue;
}
@@ -236,7 +236,7 @@
/// ```rust
/// use std::str::FromStr;
/// use zbus_lockstep::method_return_signature;
-/// use zvariant::Signature;
+/// use zbus::wire::Signature;
///
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
///
@@ -356,7 +356,7 @@
/// ```rust
/// use std::str::FromStr;
/// use zbus_lockstep::method_args_signature;
-/// use zvariant::Signature;
+/// use zbus::wire::Signature;
///
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
///
@@ -473,7 +473,7 @@
/// ```rust
/// use std::str::FromStr;
/// use zbus_lockstep::signal_body_type_signature;
-/// use zvariant::Signature;
+/// use zbus::wire::Signature;
///
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
///
@@ -591,7 +591,7 @@
/// ```rust
/// use std::str::FromStr;
/// use zbus_lockstep::property_type_signature;
-/// use zvariant::Signature;
+/// use zbus::wire::Signature;
///
/// std::env::set_var("LOCKSTEP_XML_PATH", "../xml");
///
@@ -662,7 +662,7 @@
mod test {
use std::str::FromStr;
- use zvariant::Signature;
+ use zbus::wire::Signature;
use crate::signal_body_type_signature;
@@ -675,7 +675,7 @@
let sig = crate::signal_body_type_signature!("AddNode");
assert_eq!(
&sig,
- &zvariant::Signature::from_str("(so)").expect("Valid signature pattern")
+ &zbus::wire::Signature::from_str("(so)").expect("Valid signature pattern")
);
}