dpi: add LogicalUnit, PhysicalUnit, and Unit

Part-off: https://github.com/rust-windowing/winit/issues/2395

.github/workflows/ci.yml

@@ -145,13 +145,6 @@ jobs:
     - name: Build crate
       run: cargo $CMD build $OPTIONS
 
-    # Test only on Linux x86_64, so we avoid spending unnecessary CI hours.
-    - name: Test dpi crate
-      if: >
-        contains(matrix.platform.name, 'Linux 64bit') &&
-        matrix.toolchain != '1.70.0'
-      run: cargo test -p dpi
-
     - name: Build tests
       if: >
         !contains(matrix.platform.target, 'redox') &&

CHANGELOG.md

@@ -51,7 +51,6 @@ Unreleased` header.
 - **Breaking:** Removed `EventLoopBuilder::with_user_event`, the functionality is now available in `EventLoop::with_user_event`.
 - Add `Window::default_attributes` to get default `WindowAttributes`.
 - `log` has been replaced with `tracing`. The old behavior can be emulated by setting the `log` feature on the `tracing` crate.
-- On X11, fix crash due to xsettings query on systems with incomplete xsettings.
 
 # 0.29.14
 

dpi/CHANGELOG.md

@@ -11,6 +11,4 @@ Unreleased` header.
 
 # Unreleased
 
-# 0.1.0
-
 - Add `LogicalUnit`, `PhysicalUnit` and `PixelUnit` types and related functions.

dpi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dpi"
-version = "0.1.0"
+version = "0.0.0"
 description = "Types for handling UI scaling"
 keywords = ["DPI", "HiDPI", "scale-factor"]
 categories = ["gui"]

dpi/src/lib.rs

@@ -250,7 +250,7 @@ impl<P: Pixel> PhysicalUnit<P> {
     #[inline]
     pub fn to_logical<X: Pixel>(&self, scale_factor: f64) -> LogicalUnit<X> {
         assert!(validate_scale_factor(scale_factor));
-        LogicalUnit::new(self.0.into() / scale_factor).cast()
+        LogicalUnit::new(self.0.into() * scale_factor).cast()
     }
 
     #[inline]

src/cursor.rs

@@ -195,7 +195,6 @@ impl OnlyCursorImageSource {
 }
 
 /// Platforms export this directly as `PlatformCustomCursor` if they don't implement caching.
-#[allow(dead_code)]
 #[derive(Debug, Clone)]
 pub(crate) struct OnlyCursorImage(pub(crate) Arc<CursorImage>);
 

src/platform_impl/linux/x11/mod.rs

@@ -887,9 +887,6 @@ pub enum X11Error {
 
     /// Unable to parse xsettings.
     XsettingsParse(xsettings::ParserError),
-
-    /// Failed to get property.
-    GetProperty(util::GetPropertyError),
 }
 
 impl fmt::Display for X11Error {
@@ -899,7 +896,6 @@ impl fmt::Display for X11Error {
             X11Error::Connect(e) => write!(f, "X11 connection error: {}", e),
             X11Error::Connection(e) => write!(f, "X11 connection error: {}", e),
             X11Error::XidsExhausted(e) => write!(f, "XID range exhausted: {}", e),
-            X11Error::GetProperty(e) => write!(f, "Failed to get X property {}", e),
             X11Error::X11(e) => write!(f, "X11 error: {:?}", e),
             X11Error::UnexpectedNull(s) => write!(f, "Xlib function returned null: {}", s),
             X11Error::InvalidActivationToken(s) => write!(
@@ -992,12 +988,6 @@ impl From<xsettings::ParserError> for X11Error {
     }
 }
 
-impl From<util::GetPropertyError> for X11Error {
-    fn from(value: util::GetPropertyError) -> Self {
-        Self::GetProperty(value)
-    }
-}
-
 /// Type alias for a void cookie.
 type VoidCookie<'a> = x11rb::cookie::VoidCookie<'a, X11rbConnection>;
 

src/platform_impl/linux/x11/util/randr.rs

@@ -53,7 +53,6 @@ impl XConnection {
             .get_string("Xft.dpi", "")
             .and_then(|s| f64::from_str(s).ok())
     }
-
     pub fn get_output_info(
         &self,
         resources: &monitor::ScreenResources,

src/platform_impl/linux/x11/util/window_property.rs

@@ -1,17 +1,12 @@
-use std::error::Error;
-use std::fmt;
-use std::sync::Arc;
-
+use super::*;
 use bytemuck::{NoUninit, Pod};
+use std::sync::Arc;
 
 use x11rb::connection::Connection;
 use x11rb::errors::ReplyError;
 
-use super::*;
-
-pub const CARDINAL_SIZE: usize = mem::size_of::<u32>();
-
 pub type Cardinal = u32;
+pub const CARDINAL_SIZE: usize = mem::size_of::<u32>();
 
 #[derive(Debug, Clone)]
 pub enum GetPropertyError {
@@ -20,6 +15,12 @@ pub enum GetPropertyError {
     FormatMismatch(c_int),
 }
 
+impl<T: Into<ReplyError>> From<T> for GetPropertyError {
+    fn from(e: T) -> Self {
+        Self::X11rbError(Arc::new(e.into()))
+    }
+}
+
 impl GetPropertyError {
     pub fn is_actual_property_type(&self, t: xproto::Atom) -> bool {
         if let GetPropertyError::TypeMismatch(actual_type) = *self {
@@ -30,24 +31,6 @@ impl GetPropertyError {
     }
 }
 
-impl<T: Into<ReplyError>> From<T> for GetPropertyError {
-    fn from(e: T) -> Self {
-        Self::X11rbError(Arc::new(e.into()))
-    }
-}
-
-impl fmt::Display for GetPropertyError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            GetPropertyError::X11rbError(err) => err.fmt(f),
-            GetPropertyError::TypeMismatch(err) => write!(f, "type mismatch: {err}"),
-            GetPropertyError::FormatMismatch(err) => write!(f, "format mismatch: {err}"),
-        }
-    }
-}
-
-impl Error for GetPropertyError {}
-
 // Number of 32-bit chunks to retrieve per iteration of get_property's inner loop.
 // To test if `get_property` works correctly, set this to 1.
 const PROPERTY_BUFFER_SIZE: u32 = 1024; // 4k of RAM ought to be enough for anyone!

src/platform_impl/linux/x11/xsettings.rs

@@ -33,11 +33,13 @@ impl XConnection {
             .reply()?;
 
         // Read the _XSETTINGS_SETTINGS property.
-        let data: Vec<u8> = self.get_property(
-            owner.owner,
-            atoms[_XSETTINGS_SETTINGS],
-            atoms[_XSETTINGS_SETTINGS],
-        )?;
+        let data: Vec<u8> = self
+            .get_property(
+                owner.owner,
+                atoms[_XSETTINGS_SETTINGS],
+                atoms[_XSETTINGS_SETTINGS],
+            )
+            .unwrap();
 
         // Parse the property.
         let dpi_setting = read_settings(&data)?