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

Address various warnings

Browse source
This commit is contained in:
Ian Douglas Scott 2024-03-05 12:25:20 -08:00
parent ea0de44e42
commit 7106001179
7 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/wayland/buffer.rs
View file

@ -7,9 +7,7 @@ use cctk::{
},
};
use cosmic::cctk;
use cosmic::iced::widget::image;
use cosmic::iced_sctk::subsurface_widget::{BufferSource, Dmabuf, Plane, Shmbuf, SubsurfaceBuffer};
use memmap2::Mmap;
use cosmic::iced_sctk::subsurface_widget::{BufferSource, Dmabuf, Plane, Shmbuf};
use rustix::{io::Errno, shm::ShmOFlags};
use std::{
os::fd::{AsFd, OwnedFd},
@ -58,6 +56,7 @@ fn create_memfile() -> rustix::io::Result<OwnedFd> {
return Err(errno.into());
}
},
#[allow(unreachable_patterns)]
Err(Errno::EXIST | Errno::EXIST) => {
continue;
}
@ -66,11 +65,6 @@ fn create_memfile() -> rustix::io::Result<OwnedFd> {
}
}
enum BufferBacking {
Shm { fd: OwnedFd },
Dmabuf { fd: OwnedFd, stride: u32 },
}
pub struct Buffer {
pub backing: Arc<BufferSource>,
pub buffer: wl_buffer::WlBuffer,
@ -81,7 +75,7 @@ pub struct Buffer {
impl AppData {
fn create_shm_buffer(&self, buffer_info: &BufferInfo) -> Buffer {
let fd = create_memfile().unwrap(); // XXX?
rustix::fs::ftruncate(&fd, buffer_info.stride as u64 * buffer_info.height as u64);
rustix::fs::ftruncate(&fd, buffer_info.stride as u64 * buffer_info.height as u64).unwrap();
let pool = self.shm_state.wl_shm().create_pool(
fd.as_fd(),