109 lines
3.5 KiB
Rust
109 lines
3.5 KiB
Rust
//! A presentation barrier, not an event-loop or client-commit blocker.
|
|
//! Presentation properties bind to the configure they actually depend on. A serial identifies readiness even for cell-grid clients whose
|
|
//! committed size is smaller than the configure, and after rapid reversals.
|
|
use std::time::Duration;
|
|
|
|
use smithay::utils::{Logical, Rectangle, Serial};
|
|
|
|
const DEADLINE: Duration = Duration::from_millis(300);
|
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub(crate) struct ResizeTransaction {
|
|
serial: Serial,
|
|
started: Duration,
|
|
source_geometry: Option<Rectangle<i32, Logical>>,
|
|
column_width: Option<(f64, f64)>,
|
|
}
|
|
|
|
impl ResizeTransaction {
|
|
pub(crate) fn new(serial: Serial, started: Duration) -> Self {
|
|
Self {
|
|
serial,
|
|
started,
|
|
source_geometry: None,
|
|
column_width: None,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn deadline(self) -> Duration {
|
|
self.started + DEADLINE
|
|
}
|
|
|
|
// A replacement configure changes readiness, not the bound on an
|
|
// uninterrupted wait. Clearing the transaction starts a fresh interaction.
|
|
pub(crate) fn superseded_by(self, mut replacement: Self) -> Self {
|
|
replacement.started = self.started;
|
|
replacement
|
|
}
|
|
|
|
pub(crate) fn serial(self) -> Serial {
|
|
self.serial
|
|
}
|
|
|
|
pub(crate) fn with_column_width(mut self, source: Option<f64>, target: Option<f64>) -> Self {
|
|
self.column_width = source.zip(target);
|
|
self
|
|
}
|
|
|
|
pub(crate) fn column_width(self) -> Option<(f64, f64)> {
|
|
self.column_width
|
|
}
|
|
|
|
pub(crate) fn width_changes(self) -> bool {
|
|
self.column_width
|
|
.is_some_and(|(source, target)| (source - target).abs() > 0.001)
|
|
}
|
|
|
|
pub(crate) fn with_source_geometry(mut self, geometry: Rectangle<i32, Logical>) -> Self {
|
|
self.source_geometry = Some(geometry);
|
|
self
|
|
}
|
|
|
|
pub(crate) fn source_geometry(self) -> Option<Rectangle<i32, Logical>> {
|
|
self.source_geometry
|
|
}
|
|
|
|
pub(crate) fn accepts(self, committed: Option<Serial>) -> bool {
|
|
committed.is_some_and(|serial| serial >= self.serial)
|
|
}
|
|
|
|
pub(crate) fn expired(self, now: Duration) -> bool {
|
|
now.saturating_sub(self.started) >= DEADLINE
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn acknowledgement_alone_or_stale_commit_does_not_release_resize() {
|
|
let transaction = ResizeTransaction::new(12.into(), Duration::ZERO);
|
|
assert!(!transaction.accepts(None));
|
|
assert!(!transaction.accepts(Some(11.into())));
|
|
assert!(transaction.accepts(Some(12.into())));
|
|
assert!(transaction.accepts(Some(13.into())));
|
|
}
|
|
|
|
#[test]
|
|
fn serial_comparison_handles_wraparound() {
|
|
let transaction = ResizeTransaction::new(u32::MAX.into(), Duration::ZERO);
|
|
assert!(transaction.accepts(Some(0.into())));
|
|
assert!(!transaction.accepts(Some((u32::MAX - 1).into())));
|
|
}
|
|
|
|
#[test]
|
|
fn unresponsive_client_has_bounded_wait() {
|
|
let transaction = ResizeTransaction::new(1.into(), Duration::from_millis(10));
|
|
assert!(!transaction.expired(Duration::from_millis(309)));
|
|
assert!(transaction.expired(Duration::from_millis(310)));
|
|
}
|
|
|
|
#[test]
|
|
fn shrinking_commit_retains_the_previous_full_frame_geometry() {
|
|
let source = Rectangle::new((4, 8).into(), (1200, 800).into());
|
|
let transaction = ResizeTransaction::new(1.into(), Duration::ZERO).with_source_geometry(source);
|
|
assert_eq!(transaction.source_geometry(), Some(source));
|
|
}
|
|
}
|