Use wayland-csd-frame as a part of public API (#28)

This new crate is used to provide common interface for the CSD libraries. This also updates to the newer SCTK 0.18.
PolyMeilex · Oct 14, 2023 · 91810f5 · 91810f5
1 parent 0999ee8
commit 91810f5
Show file tree

Hide file tree

Showing 8 changed files with 167 additions and 81 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Unreleased
 
+- **Breaking:** `wayland-csd-frame` is now used as a part of the public interface.
+
 ## 0.6.1
 - Bump tiny-skia to v0.11 (#32) 
 - cleanup: Remove debug println (#29) 

diff --git a/Cargo.toml b/Cargo.toml
@@ -10,13 +10,13 @@ documentation = "https://docs.rs/sctk-adwaita"
 description = "Adwaita-like SCTK Frame"
 
 [dependencies]
-smithay-client-toolkit = { version = "0.17.0", default_features = false }
+log = "0.4"
+memmap2 = { version = "0.9.0", optional = true }
 tiny-skia = { version = "0.11", default-features = false, features = [
   "std",
   "simd",
 ] }
-log = "0.4"
-memmap2 = { version = "0.5.8", optional = true }
+smithay-client-toolkit = { version = "0.18.0", default_features = false }
 
 # Draw title text using crossfont `--features crossfont`
 crossfont = { version = "0.5.0", features = [

diff --git a/examples/window.rs b/examples/window.rs
@@ -1,13 +1,18 @@
 // Based on https://github.com/Smithay/client-toolkit/blob/master/examples/themed_window.rs.
 
 use std::sync::Arc;
+use std::time::Duration;
 use std::{convert::TryInto, num::NonZeroU32};
 
 use smithay_client_toolkit::reexports::client::{
     globals::registry_queue_init,
     protocol::{wl_output, wl_pointer, wl_seat, wl_shm, wl_surface},
     Connection, Proxy, QueueHandle,
 };
+use smithay_client_toolkit::reexports::csd_frame::{
+    CursorIcon, DecorationsFrame, FrameAction, FrameClick, ResizeEdge,
+};
+use smithay_client_toolkit::reexports::protocols::xdg::shell::client::xdg_toplevel::ResizeEdge as XdgResizeEdge;
 use smithay_client_toolkit::{
     compositor::{CompositorHandler, CompositorState},
     delegate_compositor, delegate_output, delegate_pointer, delegate_registry, delegate_seat,
@@ -23,7 +28,6 @@ use smithay_client_toolkit::{
     },
     shell::{
         xdg::{
-            frame::{DecorationsFrame, FrameAction, FrameClick},
             window::{DecorationMode, Window, WindowConfigure, WindowDecorations, WindowHandler},
             XdgShell, XdgSurface,
         },
@@ -60,7 +64,6 @@ fn main() {
         .expect("Failed to create pool");
 
     let window_surface = compositor_state.create_surface(&qh);
-    let pointer_surface = compositor_state.create_surface(&qh);
 
     let window =
         xdg_shell_state.create_window(window_surface, WindowDecorations::ServerDefault, &qh);
@@ -81,7 +84,7 @@ fn main() {
         registry_state,
         seat_state,
         output_state,
-        _compositor_state: compositor_state,
+        compositor_state,
         subcompositor_state: Arc::new(subcompositor_state),
         shm_state,
         _xdg_shell_state: xdg_shell_state,
@@ -95,10 +98,9 @@ fn main() {
         buffer: None,
         window,
         window_frame: None,
-        pointer_surface,
         themed_pointer: None,
         set_cursor: false,
-        cursor_icon: String::from("diamond_cross"),
+        cursor_icon: CursorIcon::Crosshair,
     };
 
     // We don't draw immediately, the configure will notify us when to first draw.
@@ -118,7 +120,7 @@ struct SimpleWindow {
     registry_state: RegistryState,
     seat_state: SeatState,
     output_state: OutputState,
-    _compositor_state: CompositorState,
+    compositor_state: CompositorState,
     subcompositor_state: Arc<SubcompositorState>,
     shm_state: Shm,
     _xdg_shell_state: XdgShell,
@@ -132,10 +134,9 @@ struct SimpleWindow {
     buffer: Option<Buffer>,
     window: Window,
     window_frame: Option<AdwaitaFrame<Self>>,
-    pointer_surface: wl_surface::WlSurface,
     themed_pointer: Option<ThemedPointer>,
     set_cursor: bool,
-    cursor_icon: String,
+    cursor_icon: CursorIcon,
 }
 
 impl CompositorHandler for SimpleWindow {
@@ -149,6 +150,16 @@ impl CompositorHandler for SimpleWindow {
         // Not needed for this example.
     }
 
+    fn transform_changed(
+        &mut self,
+        _: &Connection,
+        _: &QueueHandle<Self>,
+        _: &wl_surface::WlSurface,
+        _: wl_output::Transform,
+    ) {
+        // Not needed for this example.
+    }
+
     fn frame(
         &mut self,
         conn: &Connection,
@@ -305,9 +316,16 @@ impl SeatHandler for SimpleWindow {
         if capability == Capability::Pointer && self.themed_pointer.is_none() {
             println!("Set pointer capability");
             println!("Creating pointer theme");
+            let surface = self.compositor_state.create_surface(qh);
             let themed_pointer = self
                 .seat_state
-                .get_pointer_with_theme(qh, &seat, ThemeSpec::default())
+                .get_pointer_with_theme(
+                    qh,
+                    &seat,
+                    self.shm_state.wl_shm(),
+                    surface,
+                    ThemeSpec::default(),
+                )
                 .expect("Failed to create pointer");
             self.themed_pointer.replace(themed_pointer);
         }
@@ -346,8 +364,10 @@ impl PointerHandler for SimpleWindow {
                     self.cursor_icon = self
                         .window_frame
                         .as_mut()
-                        .and_then(|frame| frame.click_point_moved(&event.surface, x, y))
-                        .unwrap_or("diamond_cross")
+                        .and_then(|frame| {
+                            frame.click_point_moved(Duration::ZERO, &event.surface.id(), x, y)
+                        })
+                        .unwrap_or(CursorIcon::Crosshair)
                         .to_owned();
 
                     if &event.surface == self.window.wl_surface() {
@@ -362,17 +382,29 @@ impl PointerHandler for SimpleWindow {
                     }
                     println!("Pointer left");
                 }
-                Motion { .. } => {
-                    if let Some(new_cursor) = self
-                        .window_frame
-                        .as_mut()
-                        .and_then(|frame| frame.click_point_moved(&event.surface, x, y))
-                    {
+                Motion { time } => {
+                    if let Some(new_cursor) = self.window_frame.as_mut().and_then(|frame| {
+                        frame.click_point_moved(
+                            Duration::from_millis(time as u64),
+                            &event.surface.id(),
+                            x,
+                            y,
+                        )
+                    }) {
                         self.set_cursor = true;
                         self.cursor_icon = new_cursor.to_owned();
                     }
                 }
-                Press { button, serial, .. } | Release { button, serial, .. } => {
+                Press {
+                    button,
+                    serial,
+                    time,
+                }
+                | Release {
+                    button,
+                    serial,
+                    time,
+                } => {
                     let pressed = if matches!(event.kind, Press { .. }) {
                         true
                     } else {
@@ -385,11 +417,9 @@ impl PointerHandler for SimpleWindow {
                             _ => continue,
                         };
 
-                        if let Some(action) = self
-                            .window_frame
-                            .as_mut()
-                            .and_then(|frame| frame.on_click(click, pressed))
-                        {
+                        if let Some(action) = self.window_frame.as_mut().and_then(|frame| {
+                            frame.on_click(Duration::from_millis(time as u64), click, pressed)
+                        }) {
                             self.frame_action(pointer, serial, action);
                         }
                     } else if pressed {
@@ -420,8 +450,23 @@ impl SimpleWindow {
             FrameAction::Maximize => self.window.set_maximized(),
             FrameAction::UnMaximize => self.window.unset_maximized(),
             FrameAction::ShowMenu(x, y) => self.window.show_window_menu(seat, serial, (x, y)),
-            FrameAction::Resize(edge) => self.window.resize(seat, serial, edge),
+            FrameAction::Resize(edge) => {
+                let edge = match edge {
+                    ResizeEdge::None => XdgResizeEdge::None,
+                    ResizeEdge::Top => XdgResizeEdge::Top,
+                    ResizeEdge::Bottom => XdgResizeEdge::Bottom,
+                    ResizeEdge::Left => XdgResizeEdge::Left,
+                    ResizeEdge::TopLeft => XdgResizeEdge::TopLeft,
+                    ResizeEdge::BottomLeft => XdgResizeEdge::BottomLeft,
+                    ResizeEdge::Right => XdgResizeEdge::Right,
+                    ResizeEdge::TopRight => XdgResizeEdge::TopRight,
+                    ResizeEdge::BottomRight => XdgResizeEdge::BottomRight,
+                    _ => return,
+                };
+                self.window.resize(seat, serial, edge);
+            }
             FrameAction::Move => self.window.move_(seat, serial),
+            _ => (),
         }
     }
 }
@@ -435,13 +480,11 @@ impl ShmHandler for SimpleWindow {
 impl SimpleWindow {
     pub fn draw(&mut self, conn: &Connection, qh: &QueueHandle<Self>) {
         if self.set_cursor {
-            let _ = self.themed_pointer.as_mut().unwrap().set_cursor(
-                conn,
-                &self.cursor_icon,
-                self.shm_state.wl_shm(),
-                &self.pointer_surface,
-                1,
-            );
+            let _ = self
+                .themed_pointer
+                .as_mut()
+                .unwrap()
+                .set_cursor(conn, self.cursor_icon);
             self.set_cursor = false;
         }
 

diff --git a/src/buttons.rs b/src/buttons.rs
@@ -1,8 +1,7 @@
 use log::{debug, warn};
+use smithay_client_toolkit::reexports::csd_frame::{WindowManagerCapabilities, WindowState};
 use tiny_skia::{FillRule, PathBuilder, PixmapMut, Rect, Stroke, Transform};
 
-use smithay_client_toolkit::shell::xdg::window::{WindowManagerCapabilities, WindowState};
-
 use crate::{theme::ColorMap, Location, SkiaResult};
 
 /// The size of the button on the header bar in logical points.
@@ -113,6 +112,7 @@ impl Buttons {
         self.buttons_left.last().map(|button| button.end_x())
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn draw(
         &self,
         start_x: f32,
@@ -375,7 +375,7 @@ pub enum ButtonKind {
     Minimize,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum Side {
     Left,
     Right,