Upgrade smithay-client-toolkit to 0.19

closes: wez#5781
saep · Jul 14, 2024 · 94e3b1d · 94e3b1d
1 parent dd1a0de
commit 94e3b1d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/window/Cargo.toml b/window/Cargo.toml
@@ -81,8 +81,8 @@ xcb-imdkit = { version="0.3", git="https://github.com/wez/xcb-imdkit-rs.git", re
 zbus = "4.2"
 zvariant = "4.0"
 
-smithay-client-toolkit = {version = "0.18", default-features=false, optional=true}
-wayland-protocols = {version="0.31", optional=true}
+smithay-client-toolkit = {version = "0.19", default-features=false, optional=true}
+wayland-protocols = {version="0.32", optional=true}
 wayland-client = {version="0.31", optional=true}
 wayland-egl = {version="0.32", optional=true}
 

diff --git a/window/src/os/wayland/data_device.rs b/window/src/os/wayland/data_device.rs
@@ -4,6 +4,7 @@ use smithay_client_toolkit::data_device_manager::data_source::DataSourceHandler;
 use smithay_client_toolkit::data_device_manager::WritePipe;
 use smithay_client_toolkit::reexports::client::protocol::wl_data_device::WlDataDevice;
 use wayland_client::protocol::wl_data_device_manager::DndAction;
+use wayland_client::protocol::wl_surface::WlSurface;
 use wayland_client::Proxy;
 
 use crate::wayland::drag_and_drop::SurfaceAndOffer;
@@ -23,6 +24,9 @@ impl DataDeviceHandler for WaylandState {
         _conn: &wayland_client::Connection,
         _qh: &wayland_client::QueueHandle<Self>,
         data_device: &WlDataDevice,
+        _x: f64,
+        _y: f64,
+        _surface: &WlSurface,
     ) {
         let data = match self.data_device {
             Some(ref dv) if dv.inner() == data_device => dv.data(),
@@ -86,6 +90,8 @@ impl DataDeviceHandler for WaylandState {
         _conn: &wayland_client::Connection,
         _qh: &wayland_client::QueueHandle<Self>,
         _data_device: &WlDataDevice,
+        _x: f64,
+        _y: f64,
     ) {
     }
 

diff --git a/window/src/os/wayland/window.rs b/window/src/os/wayland/window.rs
@@ -1314,6 +1314,24 @@ impl CompositorHandler for WaylandState {
     ) {
         // TODO: do we need to do anything here?
     }
+
+    fn surface_enter(
+        &mut self,
+        _conn: &WConnection,
+        _qh: &wayland_client::QueueHandle<Self>,
+        _surface: &wayland_client::protocol::wl_surface::WlSurface,
+        _output: &wayland_client::protocol::wl_output::WlOutput,
+    ) {
+    }
+
+    fn surface_leave(
+        &mut self,
+        _conn: &WConnection,
+        _qh: &wayland_client::QueueHandle<Self>,
+        _surface: &wayland_client::protocol::wl_surface::WlSurface,
+        _output: &wayland_client::protocol::wl_output::WlOutput,
+    ) {
+    }
 }
 
 impl WindowHandler for WaylandState {