WIP use dmabuf subsurfaces

Cargo.toml

@@ -38,3 +38,15 @@ opt-level = 1
 # [patch."https://github.com/pop-os/libcosmic"]
 # libcosmic = { path = "../libcosmic" }
 # cosmic-config = { path = "../libcosmic/cosmic-config" }
+
+[patch."https://github.com/pop-os/libcosmic"]
+iced = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_runtime = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_renderer = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_core = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_widget = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_futures = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_accessibility = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_tiny_skia = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_style = { git = "https://github.com/ids1024/iced", branch = "subsurface" }
+iced_sctk = { git = "https://github.com/ids1024/iced", branch = "subsurface" }

src/view/mod.rs

@@ -12,6 +12,7 @@ use cosmic::{
         advanced::layout::flex::Axis,
         widget::{column, row},
     },
+    iced_sctk::subsurface_widget::Subsurface,
     widget,
 };
 use cosmic_comp_config::workspace::{WorkspaceAmount, WorkspaceLayout};
@@ -274,7 +275,7 @@ fn toplevel_previews<'a>(
 
 fn capture_image(image: Option<&CaptureImage>) -> cosmic::Element<'_, Msg> {
     if let Some(image) = image {
-        widget::Image::new(image.img.clone()).into()
+        Subsurface::new(image.width, image.height, &image.wl_buffer).into()
     } else {
         widget::Image::new(widget::image::Handle::from_pixels(1, 1, vec![0, 0, 0, 255])).into()
     }

src/wayland/buffer.rs

@@ -138,12 +138,11 @@ impl AppData {
         // XXX Handle other formats?
         let format = wl_shm::Format::Abgr8888.into();
 
-        /*
         if let Some(buffer_info) = buffer_infos
             .iter()
             .find(|x| x.type_ == WEnum::Value(BufferType::Dmabuf) && x.format == format)
         {
-            match self.create_gbm_backing(buffer_info, true) {
+            match self.create_gbm_backing(buffer_info, false) {
                 Ok(Some((backing, buffer))) => {
                     return Buffer {
                         backing,
@@ -155,7 +154,6 @@ impl AppData {
                 Err(err) => eprintln!("Failed to create gbm buffer: {}", err),
             }
         }
-        */
 
         // Fallback to shm buffer
         // Assume format is already known to be valid
@@ -216,7 +214,7 @@ impl Buffer {
 
 impl Drop for Buffer {
     fn drop(&mut self) {
-        self.buffer.destroy();
+        // self.buffer.destroy();
     }
 }
 

src/wayland/mod.rs

@@ -20,7 +20,7 @@ use cctk::{
     toplevel_management::ToplevelManagerState,
     wayland_client::{
         globals::registry_queue_init,
-        protocol::{wl_output, wl_seat},
+        protocol::{wl_buffer, wl_output, wl_seat},
         Connection, QueueHandle,
     },
     workspace::WorkspaceState,
@@ -83,7 +83,9 @@ pub enum Event {
 
 #[derive(Clone, Debug)]
 pub struct CaptureImage {
-    pub img: iced::widget::image::Handle,
+    pub width: u32,
+    pub height: u32,
+    pub wl_buffer: wl_buffer::WlBuffer,
 }
 
 pub fn subscription(conn: Connection) -> iced::Subscription<Event> {

src/wayland/screencopy.rs

@@ -149,11 +149,18 @@ impl ScreencopyHandler for AppData {
         session.buffers.as_mut().unwrap().rotate_left(1);
 
         // Capture again on damage
+        // XXX wait for buffer release
         session.attach_buffer_and_commit(&capture, conn);
 
         let front = session.buffers.as_mut().unwrap().first_mut().unwrap();
-        let img = unsafe { front.to_image() };
-        let image = CaptureImage { img };
+        // let img = unsafe { front.to_image() };
+        // let image = CaptureImage { img };
+        let buffer_info = &front.buffer_info;
+        let image = CaptureImage {
+            wl_buffer: front.buffer.clone(),
+            width: buffer_info.width,
+            height: buffer_info.height,
+        };
         match &capture.source {
             CaptureSource::Toplevel(toplevel) => {
                 self.send_event(Event::ToplevelCapture(toplevel.clone(), image))