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

chore: update smithay + switch to tracing

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-02-24 17:41:52 +01:00
parent 844ed552b9
commit 35de500c00
35 changed files with 622 additions and 754 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/wayland/protocols/drm.rs
View file

@ -34,6 +34,7 @@ use smithay::{
dmabuf::{DmabufGlobal, DmabufHandler, ImportError},
},
};
use tracing::trace;
use std::{convert::TryFrom, path::PathBuf, sync::Arc};
@ -44,7 +45,6 @@ pub struct DrmGlobalData {
filter: Box<dyn for<'a> Fn(&'a Client) -> bool + Send + Sync>,
formats: Arc<Vec<Fourcc>>,
device_path: PathBuf,
_logger: slog::Logger,
dmabuf_global: DmabufGlobal,
}
@ -165,9 +165,7 @@ where
Ok(_) => {
// import was successful
data_init.init(id, dmabuf);
slog_scope::trace!(
"Created a new validated dma wl_buffer via wl_drm."
);
trace!("Created a new validated dma wl_buffer via wl_drm.");
}
Err(ImportError::InvalidFormat) => {
@ -246,7 +244,6 @@ impl WlDrmState {
formats,
device_path,
dmabuf_global: dmabuf_global.clone(),
_logger: slog_scope::logger().new(slog::o!("cosmic_module" => "wayland_drm")),
};
display.create_global::<D, wl_drm::WlDrm, _>(2, data)

5
src/wayland/protocols/screencopy.rs
View file

@ -24,6 +24,7 @@ use smithay::{
},
utils::{user_data::UserDataMap, Buffer, IsAlive, Physical, Point, Rectangle, Size, Transform},
};
use tracing::warn;
use wayland_backend::{
protocol::WEnum,
server::{GlobalId, ObjectId},
@ -540,7 +541,7 @@ fn check_cursor(
match cursor.into_result() {
Ok(mode) => {
if !supported.contains(&mode) {
slog_scope::warn!("Client did send unsupported cursor mode: {:?}", mode);
warn!(?mode, "Client did send unsupported cursor mode");
resource.post_error(
zcosmic_screencopy_manager_v1::Error::InvalidCursorMode,
"Unsupported cursor mode",
@ -550,7 +551,7 @@ fn check_cursor(
Some(mode)
}
Err(err) => {
slog_scope::warn!("Client did send unknown cursor mode: {}", err);
warn!(?err, "Client did send unknown cursor mode");
resource.post_error(
zcosmic_screencopy_manager_v1::Error::InvalidCursorMode,
"Unknown cursor mode, wrong protocol version?",