leyoda/cosmic-workspaces
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Bufffer::new to AppData::create_buffer

Browse source 
Will be needed to add support for dmabuf buffers. Also slightly cleaner
in general.
This commit is contained in:
Ian Douglas Scott 2023-11-08 15:05:45 -08:00
parent 6fc90b6f2c
commit c567cb30d3
2 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/wayland/buffer.rs
View file

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

18
src/wayland/screencopy.rs
View file

@ -1,10 +1,10 @@
use cctk::{ use cctk::{
cosmic_protocols::screencopy::v1::client::zcosmic_screencopy_session_v1, cosmic_protocols::screencopy::v1::client::zcosmic_screencopy_session_v1,
screencopy::{BufferInfo, ScreencopyHandler, ScreencopyState}, 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 { impl ScreencopyHandler for AppData {
fn screencopy_state(&mut self) -> &mut ScreencopyState { fn screencopy_state(&mut self) -> &mut ScreencopyState {
@ -14,7 +14,7 @@ impl ScreencopyHandler for AppData {
fn init_done( fn init_done(
&mut self, &mut self,
conn: &Connection, conn: &Connection,
qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
session: &zcosmic_screencopy_session_v1::ZcosmicScreencopySessionV1, session: &zcosmic_screencopy_session_v1::ZcosmicScreencopySessionV1,
buffer_infos: &[BufferInfo], buffer_infos: &[BufferInfo],
) { ) {
@ -24,21 +24,13 @@ impl ScreencopyHandler for AppData {
return; 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(); let mut buffer = capture.buffer.lock().unwrap();
// Create new buffer if none, or different format // Create new buffer if none, or different format
if !buffer if !buffer
.as_ref() .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(); let buffer = buffer.as_ref().unwrap();