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

refactor: use jiff instead of time

Browse source
This commit is contained in:
Vukašin Vojinović 2026-03-17 16:31:19 +01:00 • committed by Victoria Brekenfeld
parent 2ca99c670a
commit 89a50197d2
4 changed files with 8 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/state.rs
View file

@ -115,7 +115,6 @@ use smithay::{
},
xwayland::XWaylandClientData,
};
use time::UtcOffset;
use tracing::warn;
#[cfg(feature = "systemd")]
@ -242,7 +241,7 @@ pub struct Common {
pub clock: Clock<Monotonic>,
pub startup_done: Arc<AtomicBool>,
pub should_stop: bool,
pub local_offset: time::UtcOffset,
pub gesture_state: Option<GestureState>,
pub kiosk_child: Option<Child>,
@ -635,7 +634,6 @@ impl State {
.with_context(|| "Failed to load languages")
.unwrap();
let local_offset = UtcOffset::current_local_offset().expect("No yet multithreaded");
let clock = Clock::new();
let config = Config::load(&handle);
let compositor_state = CompositorState::new::<Self>(dh);
@ -749,8 +747,6 @@ impl State {
popups: PopupManager::default(),
shell,
local_offset,
clock,
startup_done: Arc::new(AtomicBool::new(false)),
should_stop: false,

22
src/utils/screenshot.rs
View file

@ -22,11 +22,7 @@ use crate::{
};
pub fn screenshot_window(state: &mut State, surface: &CosmicSurface) {
fn render_window<R>(
renderer: &mut R,
window: &CosmicSurface,
offset: &time::UtcOffset,
) -> anyhow::Result<()>
fn render_window<R>(renderer: &mut R, window: &CosmicSurface) -> anyhow::Result<()>
where
R: Renderer + ImportAll + Offscreen<GlesRenderbuffer> + ExportMem,
R::TextureId: Clone + 'static,
@ -65,17 +61,13 @@ pub fn screenshot_window(state: &mut State, surface: &CosmicSurface) {
let gl_data = renderer.map_texture(&mapping)?;
if let Ok(Some(path)) = xdg_user::pictures() {
let local_timestamp = time::OffsetDateTime::now_utc().to_offset(*offset);
let local_timestamp = jiff::Zoned::now();
let mut title = window.title();
title.truncate(227); // 255 - time - png
let name = sanitize_filename::sanitize(format!(
"{}_{}.png",
title,
local_timestamp
.format(time::macros::format_description!(
"[year]-[month]-[day]_[hour]:[minute]:[second]_[subsecond digits:4]"
))
.unwrap(),
local_timestamp.strftime("%Y-%m-%d_%H:%M:%S_%4f"),
));
let file = std::fs::File::create(path.join(name))?;
@ -108,12 +100,8 @@ pub fn screenshot_window(state: &mut State, surface: &CosmicSurface) {
})
.with_context(|| "Failed to get renderer for screenshot")
.and_then(|renderer| match renderer {
RendererRef::Glow(renderer) => {
render_window(renderer, surface, &state.common.local_offset)
}
RendererRef::GlMulti(mut renderer) => {
render_window(&mut renderer, surface, &state.common.local_offset)
}
RendererRef::Glow(renderer) => render_window(renderer, surface),
RendererRef::GlMulti(mut renderer) => render_window(&mut renderer, surface),
});
if let Err(err) = res {
warn!(?err, "Failed to take screenshot")