fix(wayland): remove wayland crate pinning
This commit is contained in:
@@ -33,8 +33,6 @@ slog = "2.7.0"
|
|||||||
slog-stdlog = "4.1.1"
|
slog-stdlog = "4.1.1"
|
||||||
xkbcommon = { version = "0.5.0", default-features = false }
|
xkbcommon = { version = "0.5.0", default-features = false }
|
||||||
stardust-xr = "0.5.2"
|
stardust-xr = "0.5.2"
|
||||||
wayland-backend = "=0.1.0-beta.9"
|
|
||||||
wayland-scanner = "=0.30.0-beta.9"
|
|
||||||
directories = "4.0.1"
|
directories = "4.0.1"
|
||||||
serde = { version = "1.0.145", features = ["derive"] }
|
serde = { version = "1.0.145", features = ["derive"] }
|
||||||
|
|
||||||
|
|||||||
@@ -22,10 +22,7 @@ use smithay::{
|
|||||||
use std::os::unix::prelude::AsRawFd;
|
use std::os::unix::prelude::AsRawFd;
|
||||||
use std::{
|
use std::{
|
||||||
ffi::c_void,
|
ffi::c_void,
|
||||||
os::unix::{
|
os::unix::{net::UnixListener, prelude::FromRawFd},
|
||||||
net::UnixListener,
|
|
||||||
prelude::{FromRawFd, RawFd},
|
|
||||||
},
|
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
};
|
};
|
||||||
use stereokit as sk;
|
use stereokit as sk;
|
||||||
@@ -114,7 +111,7 @@ impl Wayland {
|
|||||||
let listen_async =
|
let listen_async =
|
||||||
AsyncUnixListener::from_std(unsafe { UnixListener::from_raw_fd(socket.as_raw_fd()) })?;
|
AsyncUnixListener::from_std(unsafe { UnixListener::from_raw_fd(socket.as_raw_fd()) })?;
|
||||||
|
|
||||||
let dispatch_poll_fd: RawFd = display.lock().backend().poll_fd();
|
let dispatch_poll_fd = display.lock().backend().poll_fd().try_clone_to_owned()?;
|
||||||
let dispatch_poll_listener = AsyncFd::new(dispatch_poll_fd)?;
|
let dispatch_poll_listener = AsyncFd::new(dispatch_poll_fd)?;
|
||||||
|
|
||||||
let dh1 = display.lock().handle();
|
let dh1 = display.lock().handle();
|
||||||
|
|||||||
@@ -28,8 +28,7 @@ impl XdgShellHandler for WaylandState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn new_toplevel(&mut self, surface: ToplevelSurface) {
|
fn new_toplevel(&mut self, surface: ToplevelSurface) {
|
||||||
self.output
|
self.output.enter(surface.wl_surface());
|
||||||
.enter(&self.display_handle, surface.wl_surface());
|
|
||||||
surface.with_pending_state(|state| {
|
surface.with_pending_state(|state| {
|
||||||
state.states.set(State::Maximized);
|
state.states.set(State::Maximized);
|
||||||
state.states.set(State::Activated);
|
state.states.set(State::Activated);
|
||||||
|
|||||||
Reference in New Issue
Block a user