screencast: implement format negotation

src/wl_usr/usr_ifs/usr_jay_compositor.rs

@@ -52,6 +52,7 @@ impl UsrJayCompositor {
             con: self.con.clone(),
             owner: Default::default(),
             version: self.version,
+            formats: Default::default(),
         });
         self.con.request(GetRenderCtx {
             self_id: self.id,

src/wl_usr/usr_ifs/usr_jay_render_ctx.rs

@@ -1,11 +1,15 @@
 use {
     crate::{
+        format::formats,
+        gfx_api::GfxFormat,
+        ifs::jay_render_ctx::FORMATS_SINCE,
         object::Version,
         utils::clonecell::CloneCell,
         wire::{jay_render_ctx::*, JayRenderCtxId},
         wl_usr::{usr_object::UsrObject, UsrCon},
     },
-    std::{convert::Infallible, rc::Rc},
+    ahash::AHashMap,
+    std::{cell::RefCell, convert::Infallible, rc::Rc},
     uapi::OwnedFd,
 };
 
@@ -14,12 +18,14 @@ pub struct UsrJayRenderCtx {
     pub con: Rc<UsrCon>,
     pub owner: CloneCell<Option<Rc<dyn UsrJayRenderCtxOwner>>>,
     pub version: Version,
+    pub formats: RefCell<AHashMap<u32, GfxFormat>>,
 }
 
 pub trait UsrJayRenderCtxOwner {
     fn no_device(&self) {}
-    fn device(&self, fd: Rc<OwnedFd>) {
+    fn device(&self, fd: Rc<OwnedFd>, server_formats: Option<AHashMap<u32, GfxFormat>>) {
         let _ = fd;
+        let _ = server_formats;
     }
 }
 
@@ -27,6 +33,7 @@ impl JayRenderCtxEventHandler for UsrJayRenderCtx {
     type Error = Infallible;
 
     fn no_device(&self, _ev: NoDevice, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        self.formats.take();
         if let Some(owner) = self.owner.get() {
             owner.no_device();
         }
@@ -34,8 +41,38 @@ impl JayRenderCtxEventHandler for UsrJayRenderCtx {
     }
 
     fn device(&self, ev: Device, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        let formats = self.formats.take();
+        let formats = (self.version >= FORMATS_SINCE).then_some(formats);
         if let Some(owner) = self.owner.get() {
-            owner.device(ev.fd);
+            owner.device(ev.fd, formats);
+        }
+        Ok(())
+    }
+
+    fn read_modifier(&self, ev: ReadModifier, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        if let Some(format) = self.formats.borrow_mut().get_mut(&ev.format) {
+            format.read_modifiers.insert(ev.modifier);
+        }
+        Ok(())
+    }
+
+    fn write_modifier(&self, ev: WriteModifier, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        if let Some(format) = self.formats.borrow_mut().get_mut(&ev.format) {
+            format.write_modifiers.insert(ev.modifier);
+        }
+        Ok(())
+    }
+
+    fn format(&self, ev: Format, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        if let Some(format) = formats().get(&ev.format) {
+            self.formats.borrow_mut().insert(
+                ev.format,
+                GfxFormat {
+                    format,
+                    read_modifiers: Default::default(),
+                    write_modifiers: Default::default(),
+                },
+            );
         }
         Ok(())
     }

src/wl_usr/usr_ifs/usr_jay_screencast.rs

@@ -8,7 +8,7 @@ use {
         wl_usr::{
             usr_ifs::{
                 usr_jay_output::UsrJayOutput, usr_jay_toplevel::UsrJayToplevel,
-                usr_jay_workspace::UsrJayWorkspace,
+                usr_jay_workspace::UsrJayWorkspace, usr_wl_buffer::UsrWlBuffer,
             },
             usr_object::UsrObject,
             UsrCon,
@@ -24,7 +24,7 @@ pub struct UsrJayScreencast {
     pub owner: CloneCell<Option<Rc<dyn UsrJayScreencastOwner>>>,
     pub version: Version,
 
-    pub pending_buffers: RefCell<PlaneVec<DmaBuf>>,
+    pub pending_buffers: RefCell<Vec<DmaBuf>>,
     pub pending_planes: RefCell<PlaneVec<DmaBufPlane>>,
 
     pub pending_config: RefCell<UsrJayScreencastServerConfig>,
@@ -37,10 +37,12 @@ pub struct UsrJayScreencastServerConfig {
     pub running: bool,
     pub use_linear_buffers: bool,
     pub allowed_workspaces: Vec<u32>,
+    pub width: i32,
+    pub height: i32,
 }
 
 pub trait UsrJayScreencastOwner {
-    fn buffers(&self, buffers: PlaneVec<DmaBuf>) {
+    fn buffers(&self, buffers: Vec<DmaBuf>) {
         let _ = buffers;
     }
 
@@ -116,6 +118,17 @@ impl UsrJayScreencast {
             idx: idx as _,
         });
     }
+
+    pub fn clear_buffers(&self) {
+        self.con.request(ClearBuffers { self_id: self.id });
+    }
+
+    pub fn add_buffer(&self, buffer: &UsrWlBuffer) {
+        self.con.request(AddBuffer {
+            self_id: self.id,
+            buffer: buffer.id,
+        });
+    }
 }
 
 impl JayScreencastEventHandler for UsrJayScreencast {
@@ -228,6 +241,12 @@ impl JayScreencastEventHandler for UsrJayScreencast {
         });
         Ok(())
     }
+
+    fn config_size(&self, ev: ConfigSize, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        self.pending_config.borrow_mut().width = ev.width;
+        self.pending_config.borrow_mut().height = ev.height;
+        Ok(())
+    }
 }
 
 usr_object_base! {