wayland: add cursor_shape_v1 support

Cargo.toml

@@ -30,6 +30,7 @@ appendlist = "1.4"
 ash = { version = "0.37.1", optional = true }
 bitflags = "2.2.1"
 calloop = "0.12.2"
+cursor-icon = "1.0.0"
 cgmath = "0.18.0"
 downcast-rs = "1.2.0"
 drm-fourcc = "^2.2.0"

anvil/src/drawing.rs

@@ -35,7 +35,7 @@ impl<T: Texture> Default for PointerElement<T> {
     fn default() -> Self {
         Self {
             texture: Default::default(),
-            status: CursorImageStatus::Default,
+            status: CursorImageStatus::default_named(),
         }
     }
 }
@@ -84,7 +84,8 @@ where
     {
         match &self.status {
             CursorImageStatus::Hidden => vec![],
-            CursorImageStatus::Default => {
+            // Always render `Default` for a named shape.
+            CursorImageStatus::Named(_) => {
                 if let Some(texture) = self.texture.as_ref() {
                     vec![
                         PointerRenderElement::<R>::from(TextureRenderElement::from_texture_buffer(

anvil/src/state.rs

@@ -594,7 +594,7 @@ impl<BackendData: Backend + 'static> AnvilState<BackendData> {
         let seat_name = backend_data.seat_name();
         let mut seat = seat_state.new_wl_seat(&dh, seat_name.clone());
 
-        let cursor_status = Arc::new(Mutex::new(CursorImageStatus::Default));
+        let cursor_status = Arc::new(Mutex::new(CursorImageStatus::default_named()));
         let pointer = seat.add_pointer();
         seat.add_keyboard(XkbConfig::default(), 200, 25)
             .expect("Failed to initialize the keyboard");

anvil/src/udev.rs

@@ -1611,7 +1611,7 @@ fn render_surface<'a, 'b>(
                 reset = !surface.alive();
             }
             if reset {
-                *cursor_status = CursorImageStatus::Default;
+                *cursor_status = CursorImageStatus::default_named();
             }
 
             pointer_element.set_status(cursor_status.clone());

anvil/src/winit.rs

@@ -249,7 +249,7 @@ pub fn run_winit() {
                 reset = !surface.alive();
             }
             if reset {
-                *cursor_guard = CursorImageStatus::Default;
+                *cursor_guard = CursorImageStatus::default_named();
             }
             let cursor_visible = !matches!(*cursor_guard, CursorImageStatus::Surface(_));
 

anvil/src/x11.rs

@@ -334,7 +334,7 @@ pub fn run_x11() {
                 reset = !surface.alive();
             }
             if reset {
-                *cursor_guard = CursorImageStatus::Default;
+                *cursor_guard = CursorImageStatus::default_named();
             }
             let cursor_visible = !matches!(*cursor_guard, CursorImageStatus::Surface(_));
 

src/input/pointer/cursor_image.rs

@@ -1,6 +1,8 @@
 #[cfg(feature = "wayland_frontend")]
 use wayland_server::protocol::wl_surface::WlSurface;
 
+pub use cursor_icon::CursorIcon;
+
 use crate::utils::{Logical, Point};
 use std::sync::Mutex;
 
@@ -31,11 +33,18 @@ pub type CursorImageSurfaceData = Mutex<CursorImageAttributes>;
 pub enum CursorImageStatus {
     /// The cursor should be hidden
     Hidden,
-    /// The compositor should draw its cursor
-    Default,
-
+    /// The compositor should draw the given named
+    /// cursor.
+    Named(CursorIcon),
     // TODO bitmap, dmabuf cursor? Or let the compositor handle everything through "Default"
     /// The cursor should be drawn using this surface as an image
     #[cfg(feature = "wayland_frontend")]
     Surface(WlSurface),
 }
+
+impl CursorImageStatus {
+    /// Get default `Named` cursor.
+    pub fn default_named() -> Self {
+        Self::Named(CursorIcon::Default)
+    }
+}

src/input/pointer/mod.rs

@@ -13,6 +13,7 @@ use crate::{
 };
 
 mod cursor_image;
+pub use cursor_icon::CursorIcon;
 pub use cursor_image::{CursorImageAttributes, CursorImageStatus, CursorImageSurfaceData};
 
 mod grab;
@@ -740,7 +741,7 @@ impl<D: SeatHandler + 'static> PointerInternal<D> {
                 focused.leave(seat, data, event.serial, event.time);
             }
             self.focus = None;
-            data.cursor_image(seat, CursorImageStatus::Default);
+            data.cursor_image(seat, CursorImageStatus::default_named());
         }
 
         // do we enter one ?