diff options
| author | bbb651 <bar.ye651@gmail.com> | 2025-01-29 23:45:38 +0200 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-01-30 07:18:42 +0300 |
| commit | 0c340ec5ea351e12e0e826f341b9bf1f7b3b5f5f (patch) | |
| tree | ad3ec72335cea175b30a441fa23cc2f9c9c29921 /src | |
| parent | 34679c75a4735b11a0a42509201e6ea57f260e27 (diff) | |
| download | niri-0c340ec5ea351e12e0e826f341b9bf1f7b3b5f5f.tar.gz niri-0c340ec5ea351e12e0e826f341b9bf1f7b3b5f5f.tar.bz2 niri-0c340ec5ea351e12e0e826f341b9bf1f7b3b5f5f.zip | |
misc: Use `CursorImageSurfaceData` type alias
instead of `Mutex<CursorImageAttributes>`
Diffstat (limited to 'src')
| -rw-r--r-- | src/cursor.rs | 5 | ||||
| -rw-r--r-- | src/niri.rs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/cursor.rs b/src/cursor.rs index 041895ba..891854c0 100644 --- a/src/cursor.rs +++ b/src/cursor.rs @@ -4,12 +4,11 @@ use std::env; use std::fs::File; use std::io::Read; use std::rc::Rc; -use std::sync::Mutex; use anyhow::{anyhow, Context}; use smithay::backend::allocator::Fourcc; use smithay::backend::renderer::element::memory::MemoryRenderBuffer; -use smithay::input::pointer::{CursorIcon, CursorImageAttributes, CursorImageStatus}; +use smithay::input::pointer::{CursorIcon, CursorImageStatus, CursorImageSurfaceData}; use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface; use smithay::utils::{IsAlive, Logical, Physical, Point, Transform}; use smithay::wayland::compositor::with_states; @@ -67,7 +66,7 @@ impl CursorManager { let hotspot = with_states(&surface, |states| { states .data_map - .get::<Mutex<CursorImageAttributes>>() + .get::<CursorImageSurfaceData>() .unwrap() .lock() .unwrap() diff --git a/src/niri.rs b/src/niri.rs index 64d5f30c..6f54f695 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -46,7 +46,7 @@ use smithay::desktop::{ PopupUngrabStrategy, Space, Window, WindowSurfaceType, }; use smithay::input::keyboard::Layout as KeyboardLayout; -use smithay::input::pointer::{CursorIcon, CursorImageAttributes, CursorImageStatus, MotionEvent}; +use smithay::input::pointer::{CursorIcon, CursorImageStatus, CursorImageSurfaceData, MotionEvent}; use smithay::input::{Seat, SeatState}; use smithay::output::{self, Output, OutputModeSource, PhysicalProperties, Subpixel}; use smithay::reexports::calloop::generic::Generic; @@ -3026,7 +3026,7 @@ impl Niri { let hotspot = with_states(surface, |states| { states .data_map - .get::<Mutex<CursorImageAttributes>>() + .get::<CursorImageSurfaceData>() .unwrap() .lock() .unwrap() |