Update calloop and wayland-rs to the latest versions

Suggested-by: Ian Douglas Scott <[email protected]> Fixes #402.
Smithay · Sep 16, 2023 · 0038f1d · 0038f1d
1 parent a85f977
commit 0038f1d
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 67 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,21 +24,22 @@ log = "0.4"
 memmap2 = "0.7.0"
 nix = { version = "0.26.1", default-features = false, features = ["fs", "mman"] }
 thiserror = "1.0.30"
-wayland-backend = "0.1.0"
-wayland-client = "0.30.2"
-wayland-cursor = "0.30.0"
-wayland-protocols = { version = "0.30.1", features = ["client", "staging", "unstable"] }
-wayland-protocols-wlr = { version = "0.1.0", features = ["client"] }
-wayland-scanner = "0.30.0"
-wayland-csd-frame = { version = "0.2.2", default-features = false, features = ["wayland-backend_0_1"] }
+wayland-backend = "0.3.0"
+wayland-client = "0.31.0"
+wayland-cursor = "0.31.0"
+wayland-protocols = { version = "0.31.0", features = ["client", "staging", "unstable"] }
+wayland-protocols-wlr = { version = "0.2.0", features = ["client"] }
+wayland-scanner = "0.31.0"
+wayland-csd-frame = "0.3.0"
+calloop-wayland-source = { git = "https://github.com/DJMcNab/calloop-wayland-source", branch = "update-deps" }
 
 xkbcommon = { version = "0.5.0", optional = true, features = ["wayland"] }
-calloop = { version = "0.10.5", optional = true }
+calloop = { version = "0.12.0", optional = true }
 xkeysym = "0.2.0"
 
 [features]
 default = ["calloop", "xkbcommon"]
-calloop = ["dep:calloop", "wayland-client/calloop"]
+calloop = ["dep:calloop"]
 xkbcommon = ["dep:xkbcommon", "bytemuck", "pkg-config", "xkeysym/bytemuck"]
 
 [build-dependencies]

diff --git a/examples/data_device.rs b/examples/data_device.rs
@@ -1,11 +1,13 @@
 use std::{
     convert::TryInto,
-    fs::File,
+    fs::{self, File},
     io::{BufRead, BufReader, Write},
+    os::unix::io::OwnedFd,
     time::Duration,
 };
 
-use calloop::{EventLoop, LoopHandle, RegistrationToken};
+use smithay_client_toolkit::reexports::calloop::{EventLoop, LoopHandle, RegistrationToken};
+use smithay_client_toolkit::reexports::calloop_wayland_source::WaylandSource;
 use smithay_client_toolkit::{
     compositor::{CompositorHandler, CompositorState},
     data_device_manager::{
@@ -43,7 +45,6 @@ use smithay_client_toolkit::{
         Shm, ShmHandler,
     },
 };
-use wayland_backend::io_lifetimes::OwnedFd;
 use wayland_client::{
     globals::registry_queue_init,
     protocol::{
@@ -55,7 +56,7 @@ use wayland_client::{
         wl_seat::{self, WlSeat},
         wl_shm, wl_surface,
     },
-    Connection, QueueHandle, WaylandSource,
+    Connection, QueueHandle,
 };
 use wayland_protocols::wp::primary_selection::zv1::client::{
     zwp_primary_selection_device_v1::ZwpPrimarySelectionDeviceV1,
@@ -652,6 +653,8 @@ impl DataDeviceHandler for DataDeviceWindow {
                     (o, d, Some(t)) => (o, d, t),
                     _ => return,
                 };
+                // SAFETY: it's safe as long as we don't close the underlying file.
+                let f: &mut fs::File = unsafe { f.get_mut() };
                 let mut reader = BufReader::new(f);
                 let consumed = match reader.fill_buf() {
                     Ok(buf) => {
@@ -727,6 +730,8 @@ impl DataDeviceHandler for DataDeviceWindow {
                     (o, d, Some(t)) => (o, d, t),
                     _ => return,
                 };
+                // SAFETY: it's safe as long as we don't close the underlying file.
+                let f: &mut fs::File = unsafe { f.get_mut() };
                 let mut reader = BufReader::new(f);
                 let consumed = match reader.fill_buf() {
                     Ok(buf) => {
@@ -921,6 +926,8 @@ impl PrimarySelectionDeviceHandler for DataDeviceWindow {
                     (o, d, Some(t)) => (o, d, t),
                     _ => return,
                 };
+                // SAFETY: it's safe as long as we don't close the underlying file.
+                let f: &mut fs::File = unsafe { f.get_mut() };
                 let mut reader = BufReader::new(f);
                 let consumed = match reader.fill_buf() {
                     Ok(buf) => {

diff --git a/examples/simple_window.rs b/examples/simple_window.rs
@@ -1,6 +1,7 @@
 use std::{convert::TryInto, time::Duration};
 
-use calloop::{EventLoop, LoopHandle};
+use smithay_client_toolkit::reexports::calloop::{EventLoop, LoopHandle};
+use smithay_client_toolkit::reexports::calloop_wayland_source::WaylandSource;
 use smithay_client_toolkit::{
     compositor::{CompositorHandler, CompositorState},
     delegate_compositor, delegate_keyboard, delegate_output, delegate_pointer, delegate_registry,
@@ -28,7 +29,7 @@ use smithay_client_toolkit::{
 use wayland_client::{
     globals::registry_queue_init,
     protocol::{wl_keyboard, wl_output, wl_pointer, wl_seat, wl_shm, wl_surface},
-    Connection, QueueHandle, WaylandSource,
+    Connection, QueueHandle,
 };
 
 fn main() {

diff --git a/src/compositor.rs b/src/compositor.rs
@@ -1,4 +1,5 @@
 use std::mem;
+use std::os::unix::io::OwnedFd;
 use std::sync::MutexGuard;
 use std::sync::{
     atomic::{AtomicI32, Ordering},
@@ -421,10 +422,7 @@ impl wayland_client::backend::ObjectData for RegionData {
     fn event(
         self: Arc<Self>,
         _: &wayland_client::backend::Backend,
-        _: wayland_client::backend::protocol::Message<
-            wayland_client::backend::ObjectId,
-            wayland_backend::io_lifetimes::OwnedFd,
-        >,
+        _: wayland_client::backend::protocol::Message<wayland_client::backend::ObjectId, OwnedFd>,
     ) -> Option<Arc<(dyn wayland_client::backend::ObjectData + 'static)>> {
         unreachable!("wl_region has no events");
     }

diff --git a/src/data_device_manager/data_offer.rs b/src/data_device_manager/data_offer.rs
@@ -1,6 +1,6 @@
 use std::{
     ops::{Deref, DerefMut},
-    os::unix::prelude::{FromRawFd, RawFd},
+    os::unix::prelude::{BorrowedFd, FromRawFd, RawFd},
     sync::{Arc, Mutex},
 };
 
@@ -407,7 +407,7 @@ pub fn receive(offer: &WlDataOffer, mime_type: String) -> std::io::Result<ReadPi
     // create a pipe
     let (readfd, writefd) = pipe2(OFlag::O_CLOEXEC)?;
 
-    offer.receive(mime_type, writefd);
+    offer.receive(mime_type, unsafe { BorrowedFd::borrow_raw(writefd) });
 
     if let Err(err) = close(writefd) {
         log::warn!("Failed to close write pipe: {}", err);
@@ -434,7 +434,7 @@ pub fn receive(offer: &WlDataOffer, mime_type: String) -> std::io::Result<ReadPi
 pub unsafe fn receive_to_fd(offer: &WlDataOffer, mime_type: String, writefd: RawFd) {
     use nix::unistd::close;
 
-    offer.receive(mime_type, writefd);
+    offer.receive(mime_type, unsafe { BorrowedFd::borrow_raw(writefd) });
 
     if let Err(err) = close(writefd) {
         log::warn!("Failed to close write pipe: {}", err);

diff --git a/src/data_device_manager/read_pipe.rs b/src/data_device_manager/read_pipe.rs
@@ -1,8 +1,7 @@
 use std::{
     fs, io,
-    os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
+    os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd},
 };
-use wayland_backend::io_lifetimes::{AsFd, OwnedFd};
 
 /// If the `calloop` cargo feature is enabled, this can be used
 /// as an `EventSource` in a calloop event loop.
@@ -18,7 +17,7 @@ pub struct ReadPipe {
 #[cfg(feature = "calloop")]
 impl io::Read for ReadPipe {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.file.file.read(buf)
+        unsafe { self.file.get_mut().read(buf) }
     }
 }
 
@@ -72,14 +71,14 @@ impl From<OwnedFd> for ReadPipe {
 #[cfg(feature = "calloop")]
 impl AsRawFd for ReadPipe {
     fn as_raw_fd(&self) -> RawFd {
-        self.file.file.as_raw_fd()
+        self.file.get_ref().as_raw_fd()
     }
 }
 
 #[cfg(feature = "calloop")]
 impl AsFd for ReadPipe {
-    fn as_fd(&self) -> wayland_backend::io_lifetimes::BorrowedFd<'_> {
-        self.file.file.as_fd()
+    fn as_fd(&self) -> BorrowedFd<'_> {
+        self.file.get_ref().as_fd()
     }
 }
 
@@ -92,22 +91,22 @@ impl AsRawFd for ReadPipe {
 #[cfg(not(feature = "calloop"))]
 
 impl AsFd for ReadPipe {
-    fn as_fd(&self) -> wayland_backend::io_lifetimes::BorrowedFd<'_> {
+    fn as_fd(&self) -> BorrowedFd<'_> {
         self.file.as_fd()
     }
 }
 
 #[cfg(feature = "calloop")]
 impl IntoRawFd for ReadPipe {
     fn into_raw_fd(self) -> RawFd {
-        self.file.file.into_raw_fd()
+        self.file.unwrap().as_raw_fd()
     }
 }
 
 #[cfg(feature = "calloop")]
 impl From<ReadPipe> for OwnedFd {
     fn from(read_pipe: ReadPipe) -> Self {
-        read_pipe.file.file.into()
+        read_pipe.file.unwrap().into()
     }
 }
 
@@ -129,7 +128,7 @@ impl From<ReadPipe> for OwnedFd {
 impl calloop::EventSource for ReadPipe {
     type Event = ();
     type Error = std::io::Error;
-    type Metadata = fs::File;
+    type Metadata = calloop::generic::NoIoDrop<fs::File>;
     type Ret = ();
 
     fn process_events<F>(
@@ -139,7 +138,7 @@ impl calloop::EventSource for ReadPipe {
         mut callback: F,
     ) -> std::io::Result<calloop::PostAction>
     where
-        F: FnMut((), &mut fs::File),
+        F: FnMut((), &mut calloop::generic::NoIoDrop<fs::File>),
     {
         self.file.process_events(readiness, token, |_, file| {
             callback((), file);

diff --git a/src/data_device_manager/write_pipe.rs b/src/data_device_manager/write_pipe.rs
@@ -1,8 +1,7 @@
 use std::{
     fs, io,
-    os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
+    os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd},
 };
-use wayland_backend::io_lifetimes::{AsFd, OwnedFd};
 
 /// If the `calloop` cargo feature is enabled, this can be used
 /// as an `EventSource` in a calloop event loop.
@@ -18,11 +17,11 @@ pub struct WritePipe {
 #[cfg(feature = "calloop")]
 impl io::Write for WritePipe {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.file.file.write(buf)
+        unsafe { self.file.get_mut().write(buf) }
     }
 
     fn flush(&mut self) -> io::Result<()> {
-        self.file.file.flush()
+        unsafe { self.file.get_mut().flush() }
     }
 }
 
@@ -80,14 +79,14 @@ impl From<OwnedFd> for WritePipe {
 #[cfg(feature = "calloop")]
 impl AsRawFd for WritePipe {
     fn as_raw_fd(&self) -> RawFd {
-        self.file.file.as_raw_fd()
+        self.file.get_ref().as_raw_fd()
     }
 }
 
 #[cfg(feature = "calloop")]
 impl AsFd for WritePipe {
-    fn as_fd(&self) -> wayland_backend::io_lifetimes::BorrowedFd<'_> {
-        self.file.file.as_fd()
+    fn as_fd(&self) -> BorrowedFd {
+        self.file.get_ref().as_fd()
     }
 }
 
@@ -100,22 +99,22 @@ impl AsRawFd for WritePipe {
 #[cfg(not(feature = "calloop"))]
 
 impl AsFd for WritePipe {
-    fn as_fd(&self) -> wayland_backend::io_lifetimes::BorrowedFd<'_> {
+    fn as_fd(&self) -> BorrowedFd<'_> {
         self.file.as_fd()
     }
 }
 
 #[cfg(feature = "calloop")]
 impl IntoRawFd for WritePipe {
     fn into_raw_fd(self) -> RawFd {
-        self.file.file.into_raw_fd()
+        self.file.unwrap().into_raw_fd()
     }
 }
 
 #[cfg(feature = "calloop")]
 impl From<WritePipe> for OwnedFd {
     fn from(write_pipe: WritePipe) -> Self {
-        write_pipe.file.file.into()
+        write_pipe.file.unwrap().into()
     }
 }
 
@@ -137,7 +136,7 @@ impl From<WritePipe> for OwnedFd {
 impl calloop::EventSource for WritePipe {
     type Event = ();
     type Error = std::io::Error;
-    type Metadata = fs::File;
+    type Metadata = calloop::generic::NoIoDrop<fs::File>;
     type Ret = ();
 
     fn process_events<F>(
@@ -147,7 +146,7 @@ impl calloop::EventSource for WritePipe {
         mut callback: F,
     ) -> std::io::Result<calloop::PostAction>
     where
-        F: FnMut((), &mut fs::File),
+        F: FnMut((), &mut calloop::generic::NoIoDrop<fs::File>),
     {
         self.file.process_events(readiness, token, |_, file| {
             callback((), file);

diff --git a/src/lib.rs b/src/lib.rs
@@ -10,6 +10,8 @@
 pub mod reexports {
     #[cfg(feature = "calloop")]
     pub use calloop;
+    #[cfg(feature = "calloop")]
+    pub use calloop_wayland_source;
     pub use wayland_client as client;
     pub use wayland_csd_frame as csd_frame;
     pub use wayland_protocols as protocols;

diff --git a/src/primary_selection/offer.rs b/src/primary_selection/offer.rs
@@ -1,5 +1,5 @@
 use std::{
-    os::unix::io::{FromRawFd, RawFd},
+    os::unix::io::{BorrowedFd, FromRawFd, RawFd},
     sync::Mutex,
 };
 
@@ -41,7 +41,7 @@ impl PrimarySelectionOffer {
         // create a pipe
         let (readfd, writefd) = pipe2(OFlag::O_CLOEXEC)?;
 
-        self.offer.receive(mime_type, writefd);
+        self.offer.receive(mime_type, unsafe { BorrowedFd::borrow_raw(writefd) });
 
         if let Err(err) = close(writefd) {
             log::warn!("Failed to close write pipe: {}", err);
@@ -57,7 +57,7 @@ impl PrimarySelectionOffer {
     pub unsafe fn receive_to_fd(&self, mime_type: String, writefd: RawFd) {
         use nix::unistd::close;
 
-        self.offer.receive(mime_type, writefd);
+        self.offer.receive(mime_type, unsafe { BorrowedFd::borrow_raw(writefd) });
 
         if let Err(err) = close(writefd) {
             log::warn!("Failed to close write pipe: {}", err);

diff --git a/src/shell/xdg/mod.rs b/src/shell/xdg/mod.rs
@@ -1,6 +1,7 @@
 //! ## Cross desktop group (XDG) shell
 // TODO: Examples
 
+use std::os::unix::io::OwnedFd;
 use std::sync::{Arc, Mutex};
 
 use crate::reexports::client::globals::{BindError, GlobalList};
@@ -203,10 +204,7 @@ impl wayland_client::backend::ObjectData for PositionerData {
     fn event(
         self: Arc<Self>,
         _: &wayland_client::backend::Backend,
-        _: wayland_client::backend::protocol::Message<
-            wayland_client::backend::ObjectId,
-            wayland_backend::io_lifetimes::OwnedFd,
-        >,
+        _: wayland_client::backend::protocol::Message<wayland_client::backend::ObjectId, OwnedFd>,
     ) -> Option<Arc<(dyn wayland_client::backend::ObjectData + 'static)>> {
         unreachable!("xdg_positioner has no events");
     }

diff --git a/src/shm/multi.rs b/src/shm/multi.rs
@@ -65,6 +65,7 @@
 
 use std::borrow::Borrow;
 use std::io;
+use std::os::unix::io::OwnedFd;
 
 use std::sync::{
     atomic::{AtomicBool, Ordering},
@@ -404,10 +405,7 @@ impl wayland_client::backend::ObjectData for BufferObjectData {
     fn event(
         self: Arc<Self>,
         _backend: &wayland_backend::client::Backend,
-        msg: wayland_backend::protocol::Message<
-            wayland_backend::client::ObjectId,
-            wayland_backend::io_lifetimes::OwnedFd,
-        >,
+        msg: wayland_backend::protocol::Message<wayland_backend::client::ObjectId, OwnedFd>,
     ) -> Option<Arc<dyn wayland_backend::client::ObjectData>> {
         debug_assert!(wayland_client::backend::protocol::same_interface(
             msg.sender_id.interface(),