Support tablet-v2

src/seat/tablet_manager.rs

@@ -35,10 +35,9 @@ impl TabletManager {
         qh: &QueueHandle<D>,
     ) -> Result<ZwpTabletSeatV2, GlobalError>
     where
-        D: Dispatch<ZwpTabletSeatV2, super::tablet_seat::Data> + 'static,
+        D: Dispatch<ZwpTabletSeatV2, ()> + 'static,
     {
-        let udata = super::tablet_seat::Data { wl_seat: seat.clone() };
-        Ok(self.tablet_manager.get()?.get_tablet_seat(seat, qh, udata))
+        Ok(self.tablet_manager.get()?.get_tablet_seat(seat, qh, ()))
     }
 }
 
@@ -66,7 +65,7 @@ macro_rules! delegate_tablet {
             $crate::reexports::protocols::wp::tablet::zv2::client::zwp_tablet_manager_v2::ZwpTabletManagerV2: $crate::globals::GlobalData
         ] => $crate::seat::TabletManager);
         $crate::reexports::client::delegate_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
-            $crate::reexports::protocols::wp::tablet::zv2::client::zwp_tablet_seat_v2::ZwpTabletSeatV2: $crate::seat::tablet_seat::Data
+            $crate::reexports::protocols::wp::tablet::zv2::client::zwp_tablet_seat_v2::ZwpTabletSeatV2: ()
         ] => $crate::seat::TabletManager);
         $crate::reexports::client::delegate_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
             $crate::reexports::protocols::wp::tablet::zv2::client::zwp_tablet_v2::ZwpTabletV2: $crate::seat::tablet::Data

src/seat/tablet_seat.rs

@@ -1,6 +1,5 @@
 use wayland_client::{
     event_created_child,
-    protocol::wl_seat::WlSeat,
     Connection,
     Dispatch,
     QueueHandle,
@@ -30,7 +29,6 @@ pub trait Handler: Sized {
         conn: &Connection,
         qh: &QueueHandle<Self>,
         tablet_seat: &ZwpTabletSeatV2,
-        seat: &WlSeat,
         id: ZwpTabletV2,
     ) {}
 
@@ -42,7 +40,6 @@ pub trait Handler: Sized {
         conn: &Connection,
         qh: &QueueHandle<Self>,
         tablet_seat: &ZwpTabletSeatV2,
-        seat: &WlSeat,
         id: ZwpTabletToolV2,
     ) {}
 
@@ -54,21 +51,14 @@ pub trait Handler: Sized {
         conn: &Connection,
         qh: &QueueHandle<Self>,
         tablet_seat: &ZwpTabletSeatV2,
-        seat: &WlSeat,
         id: ZwpTabletPadV2,
     ) {}
 }
 
-#[doc(hidden)]
-#[derive(Debug)]
-pub struct Data {
-    pub(crate) wl_seat: WlSeat,
-}
-
-impl<D> Dispatch<ZwpTabletSeatV2, Data, D>
+impl<D> Dispatch<ZwpTabletSeatV2, (), D>
     for super::TabletManager
 where
-    D: Dispatch<ZwpTabletSeatV2, Data>
+    D: Dispatch<ZwpTabletSeatV2, ()>
      + Dispatch<ZwpTabletV2, super::tablet::Data>
      + Dispatch<ZwpTabletToolV2, super::tablet_tool::Data>
      + Dispatch<ZwpTabletPadV2, super::tablet_pad::Data>
@@ -85,19 +75,19 @@ where
         data: &mut D,
         tablet_seat: &ZwpTabletSeatV2,
         event: zwp_tablet_seat_v2::Event,
-        udata: &Data,
+        _udata: &(),
         conn: &Connection,
         qh: &QueueHandle<D>,
     ) {
         match event {
             zwp_tablet_seat_v2::Event::TabletAdded { id } => {
-                data.tablet_added(conn, qh, tablet_seat, &udata.wl_seat, id);
+                data.tablet_added(conn, qh, tablet_seat, id);
             },
             zwp_tablet_seat_v2::Event::ToolAdded { id } => {
-                data.tool_added(conn, qh, tablet_seat, &udata.wl_seat, id);
+                data.tool_added(conn, qh, tablet_seat, id);
             },
             zwp_tablet_seat_v2::Event::PadAdded { id } => {
-                data.pad_added(conn, qh, tablet_seat, &udata.wl_seat, id);
+                data.pad_added(conn, qh, tablet_seat, id);
             },
             _ => unreachable!(),
         }