wayland: implement wp-drm-lease-v1

src/tasks/connector.rs

@@ -175,6 +175,7 @@ impl ConnectorHandler {
             connector: self.data.clone(),
             monitor_info: info,
             node: Some(on.clone()),
+            lease_connectors: Default::default(),
         });
         self.state.outputs.set(self.id, output_data);
         on.schedule_update_render_data();
@@ -293,9 +294,6 @@ impl ConnectorHandler {
                 seat.set_position((tpos.x1() + tpos.x2()) / 2, (tpos.y1() + tpos.y2()) / 2);
             }
         }
-        if let Some(dev) = &self.data.drm_dev {
-            dev.connectors.remove(&self.id);
-        }
         self.state
             .remove_output_scale(on.global.persistent.scale.get());
         let _ = self.state.remove_global(&*global);
@@ -308,8 +306,26 @@ impl ConnectorHandler {
             connector: self.data.clone(),
             monitor_info,
             node: None,
+            lease_connectors: Default::default(),
         });
-        self.state.outputs.set(self.id, output_data);
+        self.state.outputs.set(self.id, output_data.clone());
+        let advertise = || {
+            if let Some(dev) = &self.data.drm_dev {
+                for binding in dev.lease_global.bindings.lock().values() {
+                    binding.create_connector(&output_data);
+                    binding.send_done();
+                }
+            }
+        };
+        let withdraw = || {
+            for (_, con) in output_data.lease_connectors.lock().drain() {
+                con.send_withdrawn();
+                if !con.device.destroyed.get() {
+                    con.device.send_done();
+                }
+            }
+        };
+        advertise();
         if let Some(config) = self.state.config.get() {
             config.connector_connected(self.id);
         }
@@ -317,13 +333,14 @@ impl ConnectorHandler {
             while let Some(event) = self.data.connector.event() {
                 match event {
                     ConnectorEvent::Disconnected => break 'outer,
-                    ConnectorEvent::Available => {}
-                    ConnectorEvent::Unavailable => {}
+                    ConnectorEvent::Available => advertise(),
+                    ConnectorEvent::Unavailable => withdraw(),
                     ev => unreachable!("received unexpected event {:?}", ev),
                 }
             }
             self.data.async_event.triggered().await;
         }
+        withdraw();
         self.state.outputs.remove(&self.id);
         if let Some(config) = self.state.config.get() {
             config.connector_disconnected(self.id);

src/tasks/drmdev.rs

@@ -1,6 +1,7 @@
 use {
     crate::{
         backend::{BackendDrmDevice, DrmDeviceId, DrmEvent},
+        ifs::wp_drm_lease_device_v1::WpDrmLeaseDeviceV1Global,
         state::{DrmDevData, State},
         tasks::udev_utils::udev_props,
         utils::asyncevent::AsyncEvent,
@@ -11,6 +12,12 @@ use {
 pub fn handle(state: &Rc<State>, dev: Rc<dyn BackendDrmDevice>) {
     let id = dev.id();
     let props = udev_props(dev.dev_t(), 1);
+    let lease_global = Rc::new(WpDrmLeaseDeviceV1Global {
+        name: state.globals.name(),
+        device: id,
+        bindings: Default::default(),
+    });
+    state.add_global(&lease_global);
     let data = Rc::new(DrmDevData {
         dev: dev.clone(),
         handler: Cell::new(None),
@@ -20,6 +27,7 @@ pub fn handle(state: &Rc<State>, dev: Rc<dyn BackendDrmDevice>) {
         vendor: props.vendor,
         model: props.model,
         pci_id: props.pci_id,
+        lease_global,
     });
     let oh = DrvDevHandler {
         id,
@@ -66,6 +74,8 @@ impl DrvDevHandler {
         if let Some(config) = self.state.config.get() {
             config.del_drm_dev(self.id);
         }
+        self.data.lease_global.bindings.clear();
+        let _ = self.state.remove_global(&*self.data.lease_global);
         self.data.handler.set(None);
         self.state.drm_devs.remove(&self.id);
     }