mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-10-30 21:17:55 -06:00
* Issue #324: vendor winit 0.30.13 as published The crate as released on crates.io, without its asset files (docs/res/*.svg and examples/data/*.png, AGENTS.md §1). Not used yet: the next commit patches it and adds it to [patch.crates-io]. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Issue #324: on Windows 11, a window dragged to another monitor takes its scale winit 0.30.13 handles WM_DPICHANGED by checking that the new window rect is on the monitor `MonitorFromWindow` names. During a drag that is still the monitor being left, so winit nudged the window back onto it, which sent another WM_DPICHANGED: the window grew and stayed on the wrong monitor at the wrong scale. From Windows 11 (build 22000) on, apply the rect Windows suggests, as winit master does since 488c036a (rust-windowing/winit#4341); no 0.30 release has it. Windows 10 keeps the old adjustment, as on winit master. The vendored copy goes in [patch.crates-io]; a test fails if winit resolves from crates.io again or the vendored copy loses the patch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
132 lines
3.6 KiB
Rust
132 lines
3.6 KiB
Rust
use std::{error, fmt};
|
|
|
|
use crate::platform_impl;
|
|
|
|
// TODO: Rename
|
|
/// An error that may be generated when requesting Winit state
|
|
#[derive(Debug)]
|
|
pub enum ExternalError {
|
|
/// The operation is not supported by the backend.
|
|
NotSupported(NotSupportedError),
|
|
/// The operation was ignored.
|
|
Ignored,
|
|
/// The OS cannot perform the operation.
|
|
Os(OsError),
|
|
}
|
|
|
|
/// The error type for when the requested operation is not supported by the backend.
|
|
#[derive(Clone)]
|
|
pub struct NotSupportedError {
|
|
_marker: (),
|
|
}
|
|
|
|
/// The error type for when the OS cannot perform the requested operation.
|
|
#[derive(Debug)]
|
|
pub struct OsError {
|
|
line: u32,
|
|
file: &'static str,
|
|
error: platform_impl::OsError,
|
|
}
|
|
|
|
/// A general error that may occur while running the Winit event loop
|
|
#[derive(Debug)]
|
|
pub enum EventLoopError {
|
|
/// The operation is not supported by the backend.
|
|
NotSupported(NotSupportedError),
|
|
/// The OS cannot perform the operation.
|
|
Os(OsError),
|
|
/// The event loop can't be re-created.
|
|
RecreationAttempt,
|
|
/// Application has exit with an error status.
|
|
ExitFailure(i32),
|
|
}
|
|
|
|
impl From<OsError> for EventLoopError {
|
|
fn from(value: OsError) -> Self {
|
|
Self::Os(value)
|
|
}
|
|
}
|
|
|
|
impl NotSupportedError {
|
|
#[inline]
|
|
#[allow(dead_code)]
|
|
pub(crate) fn new() -> NotSupportedError {
|
|
NotSupportedError { _marker: () }
|
|
}
|
|
}
|
|
|
|
impl OsError {
|
|
#[allow(dead_code)]
|
|
pub(crate) fn new(line: u32, file: &'static str, error: platform_impl::OsError) -> OsError {
|
|
OsError { line, file, error }
|
|
}
|
|
}
|
|
|
|
#[allow(unused_macros)]
|
|
macro_rules! os_error {
|
|
($error:expr) => {{
|
|
crate::error::OsError::new(line!(), file!(), $error)
|
|
}};
|
|
}
|
|
|
|
impl fmt::Display for OsError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
|
|
f.pad(&format!("os error at {}:{}: {}", self.file, self.line, self.error))
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for ExternalError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
|
|
match self {
|
|
ExternalError::NotSupported(e) => e.fmt(f),
|
|
ExternalError::Ignored => write!(f, "Operation was ignored"),
|
|
ExternalError::Os(e) => e.fmt(f),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl fmt::Debug for NotSupportedError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
|
|
f.debug_struct("NotSupportedError").finish()
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for NotSupportedError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
|
|
f.pad("the requested operation is not supported by Winit")
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for EventLoopError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
|
|
match self {
|
|
EventLoopError::RecreationAttempt => write!(f, "EventLoop can't be recreated"),
|
|
EventLoopError::NotSupported(e) => e.fmt(f),
|
|
EventLoopError::Os(e) => e.fmt(f),
|
|
EventLoopError::ExitFailure(status) => write!(f, "Exit Failure: {status}"),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl error::Error for OsError {}
|
|
impl error::Error for ExternalError {}
|
|
impl error::Error for NotSupportedError {}
|
|
impl error::Error for EventLoopError {}
|
|
|
|
#[cfg(test)]
|
|
#[allow(clippy::redundant_clone)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
// Eat attributes for testing
|
|
#[test]
|
|
fn ensure_fmt_does_not_panic() {
|
|
let _ = format!("{:?}, {}", NotSupportedError::new(), NotSupportedError::new().clone());
|
|
let _ = format!(
|
|
"{:?}, {}",
|
|
ExternalError::NotSupported(NotSupportedError::new()),
|
|
ExternalError::NotSupported(NotSupportedError::new())
|
|
);
|
|
}
|
|
}
|