treewide: update dependencies to latest version
This commit is contained in:
parent
67f6538a8b
commit
9ce953ef09
4 changed files with 12 additions and 14 deletions
12
Cargo.toml
12
Cargo.toml
|
|
@ -5,26 +5,26 @@ edition = "2018"
|
||||||
license = "GPL-3.0-only"
|
license = "GPL-3.0-only"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
ashpd = { version = "0.9", features = ["wayland"] }
|
ashpd = { version = "0.10", features = ["wayland"] }
|
||||||
fontconfig = "0.9"
|
fontconfig = "0.9"
|
||||||
# Disable freetype-sys, as it vendors libfreetype2 while fontconfig dynamically
|
# Disable freetype-sys, as it vendors libfreetype2 while fontconfig dynamically
|
||||||
# links to it. Large dependencies should not be duplicated.
|
# links to it. Large dependencies should not be duplicated.
|
||||||
freetype = { version = "0.7", default-features = false }
|
freetype = { version = "0.7", default-features = false }
|
||||||
imgref = "1.10"
|
imgref = "1.11"
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
memmap2 = "0.9"
|
memmap2 = "0.9"
|
||||||
polling = "3.7"
|
polling = "3.7"
|
||||||
reis = "0.3"
|
reis = "0.4"
|
||||||
rgb = "0.8"
|
rgb = "0.8"
|
||||||
tokio = { version = "1.40", features = ["macros", "rt"] }
|
tokio = { version = "1.41", features = ["macros", "rt"] }
|
||||||
wayland-backend = "0.3"
|
wayland-backend = "0.3"
|
||||||
wayland-client = "0.31"
|
wayland-client = "0.31"
|
||||||
wayland-protocols = { version = "0.32", features = ["client", "staging", "unstable"] }
|
wayland-protocols = { version = "0.32", features = ["client", "staging", "unstable"] }
|
||||||
wayland-protocols-wlr = { version = "0.3", features = ["client"] }
|
wayland-protocols-wlr = { version = "0.3", features = ["client"] }
|
||||||
wayland-scanner = "0.31"
|
wayland-scanner = "0.31"
|
||||||
xkeysym = "0.2"
|
xkeysym = "0.2"
|
||||||
yaml-rust2 = "0.8"
|
yaml-rust2 = "0.9"
|
||||||
zbus = { version = "4.4", default-features = false, features = ["tokio"] }
|
zbus = { version = "5.1", default-features = false, features = ["tokio"] }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
bindgen = "0.70.1"
|
bindgen = "0.70.1"
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,10 @@ use wayland_client::protocol::wl_buffer::WlBuffer;
|
||||||
use wayland_client::protocol::wl_shm_pool::WlShmPool;
|
use wayland_client::protocol::wl_shm_pool::WlShmPool;
|
||||||
use wayland_client::protocol::wl_surface::WlSurface;
|
use wayland_client::protocol::wl_surface::WlSurface;
|
||||||
use zbus::Connection;
|
use zbus::Connection;
|
||||||
use zbus::InterfaceRef;
|
|
||||||
use zbus::Result;
|
use zbus::Result;
|
||||||
use zbus::SignalContext;
|
|
||||||
use zbus::interface;
|
use zbus::interface;
|
||||||
|
use zbus::object_server::InterfaceRef;
|
||||||
|
use zbus::object_server::SignalEmitter;
|
||||||
|
|
||||||
pub struct OSK0<T: Dispatch<WlBuffer, u32>
|
pub struct OSK0<T: Dispatch<WlBuffer, u32>
|
||||||
+ Dispatch<WlShmPool, u32>
|
+ Dispatch<WlShmPool, u32>
|
||||||
|
|
@ -31,7 +31,7 @@ pub struct OSK0<T: Dispatch<WlBuffer, u32>
|
||||||
+ 'static> {
|
+ 'static> {
|
||||||
visible: AtomicBool,
|
visible: AtomicBool,
|
||||||
gfx: Arc<Mutex<Graphics<Surface<T>>>>,
|
gfx: Arc<Mutex<Graphics<Surface<T>>>>,
|
||||||
sigctx: SignalContext<'static>,
|
sigctx: SignalEmitter<'static>,
|
||||||
conn_wl: Arc<wayland_client::Connection>,
|
conn_wl: Arc<wayland_client::Connection>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -83,7 +83,7 @@ impl<T: Dispatch<WlBuffer, u32>
|
||||||
conn_wl: Arc<wayland_client::Connection>)
|
conn_wl: Arc<wayland_client::Connection>)
|
||||||
-> Result<InterfaceRef<OSK0<T>>>
|
-> Result<InterfaceRef<OSK0<T>>>
|
||||||
{
|
{
|
||||||
let sigctx = SignalContext::new(conn, "/sm/puri/OSK0")?;
|
let sigctx = SignalEmitter::new(conn, "/sm/puri/OSK0")?;
|
||||||
|
|
||||||
let visible = AtomicBool::new(false);
|
let visible = AtomicBool::new(false);
|
||||||
let osk = OSK0 { visible, gfx, sigctx, conn_wl };
|
let osk = OSK0 { visible, gfx, sigctx, conn_wl };
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ use std::sync::Arc;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
use tokio::task;
|
use tokio::task;
|
||||||
use wayland_client::globals;
|
use wayland_client::globals;
|
||||||
use zbus::InterfaceRef;
|
use zbus::object_server::InterfaceRef;
|
||||||
|
|
||||||
pub struct VisibilityManager(InterfaceRef<OSK0<Dispatcher>>);
|
pub struct VisibilityManager(InterfaceRef<OSK0<Dispatcher>>);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ mod core;
|
||||||
// mod libei;
|
// mod libei;
|
||||||
mod wayland;
|
mod wayland;
|
||||||
|
|
||||||
use ashpd::WindowIdentifier;
|
|
||||||
use ashpd::desktop::PersistMode;
|
use ashpd::desktop::PersistMode;
|
||||||
use ashpd::desktop::remote_desktop::DeviceType;
|
use ashpd::desktop::remote_desktop::DeviceType;
|
||||||
use ashpd::desktop::remote_desktop::RemoteDesktop;
|
use ashpd::desktop::remote_desktop::RemoteDesktop;
|
||||||
|
|
@ -50,14 +49,13 @@ async fn main()
|
||||||
let mut events = Events::new();
|
let mut events = Events::new();
|
||||||
let poller = Poller::new().unwrap();
|
let poller = Poller::new().unwrap();
|
||||||
|
|
||||||
let wi = WindowIdentifier::default();
|
|
||||||
let rd = RemoteDesktop::new().await.unwrap();
|
let rd = RemoteDesktop::new().await.unwrap();
|
||||||
let session = rd.create_session().await.unwrap();
|
let session = rd.create_session().await.unwrap();
|
||||||
rd.select_devices(&session,
|
rd.select_devices(&session,
|
||||||
DeviceType::Keyboard.into(),
|
DeviceType::Keyboard.into(),
|
||||||
None,
|
None,
|
||||||
PersistMode::DoNot).await.unwrap();
|
PersistMode::DoNot).await.unwrap();
|
||||||
rd.start(&session, &wi).await.unwrap();
|
rd.start(&session, None).await.unwrap();
|
||||||
let eifd = rd.connect_to_eis(&session).await.unwrap();
|
let eifd = rd.connect_to_eis(&session).await.unwrap();
|
||||||
let ei_ctx = Context::new(eifd.into()).unwrap();
|
let ei_ctx = Context::new(eifd.into()).unwrap();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue