wayland: remove Object::num_requests

src/ifs/wl_seat/wl_keyboard.rs

@@ -110,16 +110,12 @@ impl WlKeyboard {
 }
 
 object_base! {
-    WlKeyboard;
+    self = WlKeyboard;
 
-    RELEASE => release,
+    RELEASE => release if self.seat.version >= 3,
 }
 
-impl Object for WlKeyboard {
-    fn num_requests(&self) -> u32 {
-        RELEASE + 1
-    }
-}
+impl Object for WlKeyboard {}
 
 simple_add_obj!(WlKeyboard);
 

src/ifs/wl_seat/wl_pointer.rs

@@ -214,17 +214,13 @@ impl WlPointer {
 }
 
 object_base! {
-    WlPointer;
+    self = WlPointer;
 
     SET_CURSOR => set_cursor,
-    RELEASE => release,
+    RELEASE => release if self.seat.version >= 3,
 }
 
-impl Object for WlPointer {
-    fn num_requests(&self) -> u32 {
-        RELEASE + 1
-    }
-}
+impl Object for WlPointer {}
 
 dedicated_add_obj!(WlPointer, WlPointerId, pointers);
 

src/ifs/wl_seat/wl_touch.rs

@@ -49,16 +49,12 @@ impl WlTouch {
 }
 
 object_base! {
-    WlTouch;
+    self = WlTouch;
 
-    RELEASE => release,
+    RELEASE => release if self.seat.version >= 3,
 }
 
-impl Object for WlTouch {
-    fn num_requests(&self) -> u32 {
-        RELEASE + 1
-    }
-}
+impl Object for WlTouch {}
 
 simple_add_obj!(WlTouch);
 

src/ifs/wl_seat/zwp_pointer_constraints_v1.rs

@@ -278,18 +278,14 @@ impl Global for ZwpPointerConstraintsV1Global {
 simple_add_global!(ZwpPointerConstraintsV1Global);
 
 object_base! {
-    ZwpPointerConstraintsV1;
+    self = ZwpPointerConstraintsV1;
 
     DESTROY => destroy,
     LOCK_POINTER => lock_pointer,
     CONFINE_POINTER => confine_pointer,
 }
 
-impl Object for ZwpPointerConstraintsV1 {
-    fn num_requests(&self) -> u32 {
-        CONFINE_POINTER + 1
-    }
-}
+impl Object for ZwpPointerConstraintsV1 {}
 
 simple_add_obj!(ZwpPointerConstraintsV1);
 

src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_confined_pointer_v1.rs

@@ -47,17 +47,13 @@ impl ConstraintOwner for ZwpConfinedPointerV1 {
 }
 
 object_base! {
-    ZwpConfinedPointerV1;
+    self = ZwpConfinedPointerV1;
 
     DESTROY => destroy,
     SET_REGION => set_region,
 }
 
 impl Object for ZwpConfinedPointerV1 {
-    fn num_requests(&self) -> u32 {
-        SET_REGION + 1
-    }
-
     fn break_loops(&self) {
         self.constraint.detach();
     }

src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_locked_pointer_v1.rs

@@ -53,7 +53,7 @@ impl ConstraintOwner for ZwpLockedPointerV1 {
 }
 
 object_base! {
-    ZwpLockedPointerV1;
+    self = ZwpLockedPointerV1;
 
     DESTROY => destroy,
     SET_CURSOR_POSITION_HINT => set_cursor_position_hint,
@@ -61,10 +61,6 @@ object_base! {
 }
 
 impl Object for ZwpLockedPointerV1 {
-    fn num_requests(&self) -> u32 {
-        SET_REGION + 1
-    }
-
     fn break_loops(&self) {
         self.constraint.detach();
     }

src/ifs/wl_seat/zwp_relative_pointer_manager_v1.rs

@@ -89,17 +89,13 @@ impl ZwpRelativePointerManagerV1 {
 }
 
 object_base! {
-    ZwpRelativePointerManagerV1;
+    self = ZwpRelativePointerManagerV1;
 
     DESTROY => destroy,
     GET_RELATIVE_POINTER => get_relative_pointer,
 }
 
-impl Object for ZwpRelativePointerManagerV1 {
-    fn num_requests(&self) -> u32 {
-        GET_RELATIVE_POINTER + 1
-    }
-}
+impl Object for ZwpRelativePointerManagerV1 {}
 
 simple_add_obj!(ZwpRelativePointerManagerV1);
 

src/ifs/wl_seat/zwp_relative_pointer_v1.rs

@@ -48,16 +48,12 @@ impl ZwpRelativePointerV1 {
 }
 
 object_base! {
-    ZwpRelativePointerV1;
+    self = ZwpRelativePointerV1;
 
     DESTROY => destroy,
 }
 
-impl Object for ZwpRelativePointerV1 {
-    fn num_requests(&self) -> u32 {
-        DESTROY + 1
-    }
-}
+impl Object for ZwpRelativePointerV1 {}
 
 simple_add_obj!(ZwpRelativePointerV1);