From 6f459339715866be3822c1a68b71cf34379f41ff Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Fri, 19 Apr 2024 15:44:55 -0700 Subject: [PATCH] Fix various warnings --- src/main.rs | 9 ++------- src/wayland/buffer.rs | 7 +++++-- src/wayland/capture.rs | 2 +- src/wayland/screencopy.rs | 22 +++++----------------- src/widgets/mod.rs | 2 ++ src/widgets/visibility_wrapper.rs | 1 - 6 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/main.rs b/src/main.rs index 0742ab7..58642db 100644 --- a/src/main.rs +++ b/src/main.rs @@ -114,7 +114,6 @@ enum Msg { WaylandEvent(WaylandEvent), Wayland(wayland::Event), Close, - Closed(SurfaceId), ActivateWorkspace(zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1), #[allow(dead_code)] CloseWorkspace(zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1), @@ -183,16 +182,13 @@ enum DragSurface { } struct Conf { - cosmic_comp_config: cosmic_config::Config, workspace_config: cosmic_comp_config::workspace::WorkspaceConfig, config: CosmicWorkspacesConfig, } impl Default for Conf { fn default() -> Self { - let cosmic_comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap(); Self { - cosmic_comp_config, workspace_config: Default::default(), config: Default::default(), } @@ -492,7 +488,6 @@ impl Application for App { Msg::Close => { return self.hide(); } - Msg::Closed(_) => {} Msg::ActivateWorkspace(workspace_handle) => { let workspace_manager = self.workspace_manager.as_ref().unwrap(); workspace_handle.activate(); @@ -715,8 +710,8 @@ impl Application for App { text("workspaces").into() } - fn on_close_requested(&self, id: SurfaceId) -> Option { - Some(Msg::Closed(id)) + fn on_close_requested(&self, _id: SurfaceId) -> Option { + None } fn core(&self) -> &cosmic::app::Core { diff --git a/src/wayland/buffer.rs b/src/wayland/buffer.rs index 66e7301..7001d07 100644 --- a/src/wayland/buffer.rs +++ b/src/wayland/buffer.rs @@ -2,7 +2,7 @@ use cctk::{ screencopy::Formats, wayland_client::{ protocol::{wl_buffer, wl_shm, wl_shm_pool}, - Connection, Dispatch, QueueHandle, WEnum, + Connection, Dispatch, QueueHandle, }, }; use cosmic::cctk; @@ -223,7 +223,8 @@ impl AppData { let format = u32::from(wl_shm::Format::Abgr8888); #[cfg(not(feature = "force-shm-screencopy"))] - if let Some((_, modifiers)) = formats.dmabuf_formats.iter().find(|(f, _)| *f == format) { + if let Some((_, _modifiers)) = formats.dmabuf_formats.iter().find(|(f, _)| *f == format) { + // TODO Restrict modifiers match self.create_gbm_buffer(format, formats.buffer_size, false) { Ok(Some(buffer)) => { return buffer; @@ -241,6 +242,8 @@ impl AppData { } impl Buffer { + // Use this when dmabuf/screencopy has a way to specify node + #[allow(dead_code)] pub fn node(&self) -> Option<&Path> { self.node.as_deref() } diff --git a/src/wayland/capture.rs b/src/wayland/capture.rs index 4edf7b3..a7f171c 100644 --- a/src/wayland/capture.rs +++ b/src/wayland/capture.rs @@ -1,6 +1,6 @@ use cctk::{ cosmic_protocols::{ - screencopy::v2::client::{zcosmic_screencopy_manager_v2, zcosmic_screencopy_session_v2}, + screencopy::v2::client::zcosmic_screencopy_session_v2, toplevel_info::v1::client::zcosmic_toplevel_handle_v1, workspace::v1::client::zcosmic_workspace_handle_v1, }, diff --git a/src/wayland/screencopy.rs b/src/wayland/screencopy.rs index d5f23f1..6f2079a 100644 --- a/src/wayland/screencopy.rs +++ b/src/wayland/screencopy.rs @@ -1,14 +1,7 @@ use cosmic::cctk::{ self, - cosmic_protocols::{ - image_source::v1::client::{ - zcosmic_toplevel_image_source_manager_v1::ZcosmicToplevelImageSourceManagerV1, - zcosmic_workspace_image_source_manager_v1::ZcosmicWorkspaceImageSourceManagerV1, - }, - screencopy::v2::client::{ - zcosmic_screencopy_frame_v2, zcosmic_screencopy_manager_v2, - zcosmic_screencopy_session_v2, - }, + cosmic_protocols::screencopy::v2::client::{ + zcosmic_screencopy_frame_v2, zcosmic_screencopy_manager_v2, zcosmic_screencopy_session_v2, }, screencopy::{ capture, Formats, Frame, ScreencopyFrameData, ScreencopyFrameDataExt, ScreencopyHandler, @@ -45,16 +38,11 @@ impl ScreencopySession { .as_ref() .unwrap() .create_source(toplevel, qh, ()), - CaptureSource::Workspace(workspace, output) => screencopy_state + CaptureSource::Workspace(workspace, _output) => screencopy_state .workspace_source_manager .as_ref() .unwrap() - .create_source( - workspace, - // output, - qh, - (), - ), + .create_source(workspace, qh, ()), }; let udata = SessionData { @@ -167,7 +155,7 @@ impl ScreencopyHandler for AppData { conn: &Connection, qh: &QueueHandle, screencopy_frame: &zcosmic_screencopy_frame_v2::ZcosmicScreencopyFrameV2, - frame: Frame, + _frame: Frame, ) { let session = &screencopy_frame.data::().unwrap().session; let Some(capture) = Capture::for_session(session) else { diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs index 41a966b..b5ad66a 100644 --- a/src/widgets/mod.rs +++ b/src/widgets/mod.rs @@ -22,6 +22,8 @@ pub use toplevels::toplevels; mod visibility_wrapper; pub use visibility_wrapper::visibility_wrapper; +// Widget for debugging +#[allow(dead_code)] pub fn layout_wrapper<'a, Msg, T: Into>>( inner: T, ) -> LayoutWrapper<'a, Msg> { diff --git a/src/widgets/visibility_wrapper.rs b/src/widgets/visibility_wrapper.rs index e4ec09c..3b48843 100644 --- a/src/widgets/visibility_wrapper.rs +++ b/src/widgets/visibility_wrapper.rs @@ -106,5 +106,4 @@ impl<'a, Msg: 'a> From> for cosmic::Element<'a, Msg> fn from(widget: VisibilityWrapper<'a, Msg>) -> Self { cosmic::Element::new(widget) } - }