Move Bufffer::new to AppData::create_buffer

Will be needed to add support for dmabuf buffers. Also slightly cleaner
in general.

src/wayland/buffer.rs

@@ -1,9 +1,10 @@
 use cctk::{
+    cosmic_protocols::screencopy::v1::client::zcosmic_screencopy_session_v1::BufferType,
     screencopy::BufferInfo,
-    sctk::{globals::ProvidesBoundGlobal, shm::raw::RawPool},
+    sctk::shm::raw::RawPool,
     wayland_client::{
         protocol::{wl_buffer, wl_shm},
-        Connection, Dispatch, QueueHandle,
+        Connection, Dispatch, QueueHandle, WEnum,
     },
 };
 use cosmic::iced::widget::image;
@@ -16,15 +17,22 @@ pub struct Buffer {
     pub buffer_info: BufferInfo,
 }
 
-impl Buffer {
-    pub fn new(
-        buffer_info: BufferInfo,
-        shm: &impl ProvidesBoundGlobal<wl_shm::WlShm, 1>,
-        qh: &QueueHandle<AppData>,
-    ) -> Self {
+impl AppData {
+    pub fn create_buffer(&self, buffer_infos: &[BufferInfo]) -> Buffer {
+        // XXX Handle other formats?
+        let format = wl_shm::Format::Abgr8888.into();
+
+        let buffer_info = buffer_infos
+            .iter()
+            .find(|x| x.type_ == WEnum::Value(BufferType::WlShm) && x.format == format)
+            .unwrap();
+
         // Assume format is already known to be valid
-        let mut pool =
-            RawPool::new((buffer_info.stride * buffer_info.height) as usize, shm).unwrap();
+        let mut pool = RawPool::new(
+            (buffer_info.stride * buffer_info.height) as usize,
+            &self.shm_state,
+        )
+        .unwrap();
         let format = wl_shm::Format::try_from(buffer_info.format).unwrap();
         let buffer = pool.create_buffer(
             0,
@@ -33,15 +41,17 @@ impl Buffer {
             buffer_info.stride as i32,
             format,
             (),
-            qh,
+            &self.qh,
         );
-        Self {
+        Buffer {
             pool,
             buffer,
-            buffer_info,
+            buffer_info: buffer_info.clone(),
         }
     }
+}
 
+impl Buffer {
     // Buffer must be released by server for safety
     #[allow(clippy::wrong_self_convention)]
     pub unsafe fn to_image(&mut self) -> image::Handle {

src/wayland/screencopy.rs

@@ -1,10 +1,10 @@
 use cctk::{
     cosmic_protocols::screencopy::v1::client::zcosmic_screencopy_session_v1,
     screencopy::{BufferInfo, ScreencopyHandler, ScreencopyState},
-    wayland_client::{protocol::wl_shm, Connection, QueueHandle, WEnum},
+    wayland_client::{Connection, QueueHandle, WEnum},
 };
 
-use super::{AppData, Buffer, Capture, CaptureSource, Event};
+use super::{AppData, Capture, CaptureSource, Event};
 
 impl ScreencopyHandler for AppData {
     fn screencopy_state(&mut self) -> &mut ScreencopyState {
@@ -14,7 +14,7 @@ impl ScreencopyHandler for AppData {
     fn init_done(
         &mut self,
         conn: &Connection,
-        qh: &QueueHandle<Self>,
+        _qh: &QueueHandle<Self>,
         session: &zcosmic_screencopy_session_v1::ZcosmicScreencopySessionV1,
         buffer_infos: &[BufferInfo],
     ) {
@@ -24,21 +24,13 @@ impl ScreencopyHandler for AppData {
             return;
         }
 
-        let buffer_info = buffer_infos
-            .iter()
-            .find(|x| {
-                x.type_ == WEnum::Value(zcosmic_screencopy_session_v1::BufferType::WlShm)
-                    && x.format == wl_shm::Format::Abgr8888.into()
-            })
-            .unwrap();
-
         let mut buffer = capture.buffer.lock().unwrap();
         // Create new buffer if none, or different format
         if !buffer
             .as_ref()
-            .map_or(false, |x| &x.buffer_info == buffer_info)
+            .map_or(false, |x| buffer_infos.contains(&x.buffer_info))
         {
-            *buffer = Some(Buffer::new(buffer_info.clone(), &self.shm_state, qh));
+            *buffer = Some(self.create_buffer(buffer_infos));
         }
         let buffer = buffer.as_ref().unwrap();