Skip to content

Commit

Permalink
wayland-csd-frame version 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kchibisov committed May 10, 2023
0 parents commit ab70fe5
Show file tree
Hide file tree
Showing 7 changed files with 365 additions and 0 deletions.
45 changes: 45 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI

on:
pull_request:
push:
branches: [main]

env:
RUST_BACKTRACE: 1
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-Cdebuginfo=0 --deny=warnings"
RUSTDOCFLAGS: "--deny=warnings"

jobs:
fmt:
name: Check Formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: hecrj/setup-rust-action@v1
with:
rust-version: nightly
components: rustfmt
- name: Check Formatting
run: cargo +nightly fmt --all -- --check

tests:
name: Tests
runs-on: ubuntu-latest
strategy:
matrix:
rust_version: ["1.64", stable, nightly]

steps:
- uses: actions/checkout@v2

- uses: hecrj/setup-rust-action@v1
with:
rust-version: ${{ matrix.rust_version }}

- name: Check documentation
run: cargo doc --no-deps --document-private-items

- name: Run tests
run: cargo test --verbose
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/target
/Cargo.lock
17 changes: 17 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[package]
name = "wayland-csd-frame"
version = "0.1.0"
authors = ["Kirill Chibisov <[email protected]>"]
repository = "https://github.com/rust-windowing/wayland-csd-frame"
description = "Common trait and types for wayland CSD interop"
keywords = ["windowing", "wayland"]
readme = "README.md"
license = "MIT"
edition = "2021"
categories = ["gui"]
rust-version = "1.64.0"

[dependencies]
bitflags = "2.0"
cursor-icon = "1.0.0"
wayland-backend = { version = "0.1.1", default-features = false }
19 changes: 19 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2023 Kirill Chibisov

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# wayland-csd-frame

`wayland-csd-frame` aims to provide common client side decorations (CSD) frame
for xdg-shell Wayland windows establishing a stable interface between windowing
libraries (e.g winit) and decorations drawing libraries.

This library defines a simple interface other crates providing decoration
frames could use to integrate with crates like winit. An example of crates
using this interface to provide decorations frame:

- https://github.com/PolyMeilex/sctk-adwaita an Adwaita-like frame.
- https://github.com/smithay/client-toolkit provides bare bones `FallbackFrame`.
16 changes: 16 additions & 0 deletions rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
format_code_in_doc_comments = true
match_block_trailing_comma = true
condense_wildcard_suffixes = true
use_field_init_shorthand = true
normalize_doc_attributes = true
overflow_delimited_expr = true
imports_granularity = "Module"
use_small_heuristics = "Max"
normalize_comments = true
reorder_impl_items = true
use_try_shorthand = true
newline_style = "Unix"
format_strings = true
wrap_comments = true
comment_width = 80
edition = "2021"
254 changes: 254 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
#![deny(rust_2018_idioms)]
#![deny(rustdoc::broken_intra_doc_links)]
#![deny(unsafe_op_in_unsafe_fn)]
#![deny(improper_ctypes, improper_ctypes_definitions)]
#![deny(clippy::all)]
#![deny(missing_debug_implementations)]
#![deny(missing_docs)]
#![forbid(unsafe_code)]
#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]

//! The interface for wayland client side decorations (CSD).
//!
//! The crate is intended to be used by libraries providing client
//! side decorations for the xdg-shell protocol.
//!
//! Examples could be found in [`client toolkit`] and [`sctk-adwaita`].
//!
//! [`client toolkit`]: https://github.com/smithay/client-toolkit
//! [`sctk-adwaita`]: https://github.com/PolyMeilex/sctk-adwaita
use std::num::NonZeroU32;

use bitflags::bitflags;
use wayland_backend::client::ObjectId;

#[doc(inline)]
pub use cursor_icon::{CursorIcon, ParseError as CursorIconParseError};

/// The interface for the client side decorations.
pub trait DecorationsFrame: Sized {
/// Emulate click on the decorations.
///
/// The `click` is a variant of click to use, see [`FrameClick`] for more
/// information.
///
/// The return value is a [`FrameAction`] you should apply, this action
/// could be ignored.
///
/// The location of the click is the one passed to
/// [`Self::click_point_moved`].
fn on_click(&mut self, click: FrameClick, pressed: bool) -> Option<FrameAction>;

/// Emulate pointer moved event on the decorations frame.
///
/// The `x` and `y` are location in the surface local coordinates relative
/// to the `surface`.
///
/// The return value is the new cursor icon you should apply to provide
/// better visual feedback for the user. However, you might want to
/// ignore it, if you're using touch events to drive the movements.
fn click_point_moved(&mut self, surface_id: &ObjectId, x: f64, y: f64) -> Option<CursorIcon>;

/// All clicks left the decorations.
///
/// This function should be called when input leaves the decorations.
fn click_point_left(&mut self);

/// Update the state of the frame.
///
/// The state is usually obtained from the `xdg_toplevel::configure` event.
fn update_state(&mut self, state: WindowState);

/// Update the window manager capabilites.
///
/// The capabilites are usually obtained from the
/// `xdg_toplevel::wm_capabilities` event.
fn update_wm_capabilities(&mut self, wm_capabilities: WindowManagerCapabilities);

/// Resize the window to the new size.
///
/// The size must be without the borders, as in [`Self::subtract_borders]`
/// were used on it.
///
/// **Note:** The [`Self::update_state`] and
/// [`Self::update_wm_capabilities`] **must be** applied before calling
/// this function.
///
/// # Panics
///
/// Panics when resizing the hidden frame.
fn resize(&mut self, width: NonZeroU32, height: NonZeroU32);

/// Return the coordinates of the top-left corner of the borders relative to
/// the content.
///
/// Values **must** thus be non-positive.
fn location(&self) -> (i32, i32);

/// Subtract the borders from the given `width` and `height`.
///
/// `None` will be returned for the particular dimension when the given
/// value for it was too small.
fn subtract_borders(
&self,
width: NonZeroU32,
height: NonZeroU32,
) -> (Option<NonZeroU32>, Option<NonZeroU32>);

/// Add the borders to the given `width` and `height`.
///
/// Passing zero for both width and height could be used to get the size
/// of the decorations frame.
fn add_borders(&self, width: u32, height: u32) -> (u32, u32);

/// Whether the given frame is dirty and should be redrawn.
fn is_dirty(&self) -> bool;

/// Set the frame as hidden.
///
/// The frame **must be** visible by default.
fn set_hidden(&mut self, hidden: bool);

/// Get the frame hidden state.
///
/// Get the state of the last [`DecorationsFrame::set_hidden`].
fn is_hidden(&self) -> bool;

/// Mark the frame as resizable.
///
/// By default the frame is resizable.
fn set_resizable(&mut self, resizable: bool);

/// Draw the decorations frame.
///
/// The user of the frame **must** commit the base surface afterwards.
fn draw(&mut self);

/// Set the frames title.
fn set_title(&mut self, title: impl Into<String>);
}

/// The Frame action user should perform in responce to mouse click events.
#[non_exhaustive]
#[derive(Debug, Clone, Copy)]
pub enum FrameAction {
/// The window should be minimized.
Minimize,
/// The window should be maximized.
Maximize,
/// The window should be unmaximized.
UnMaximize,
/// The window should be closed.
Close,
/// An interactive move should be started.
Move,
/// An interactive resize should be started with the provided edge.
Resize(ResizeEdge),
/// Show window menu.
///
/// The coordinates are relative to the base surface, as in should be
/// directly passed to the `xdg_toplevel::show_window_menu`.
ShowMenu(i32, i32),
}

/// The user clicked or touched the decoractions frame.
#[non_exhaustive]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum FrameClick {
/// The user done normal click, likely with left mouse button or single
/// finger touch.
Normal,

/// The user done right mouse click or some touch sequence that was treated
/// as alternate click.
///
/// The alternate click exists solely to provide alternative action, like
/// show window menu when doing right mouse button cilck on the header
/// decorations, nothing more.
Alternate,
}

bitflags! {
/// The configured state of the window.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub struct WindowState: u16 {
/// The surface is maximized. The window geometry specified in the
/// configure event must be obeyed by the client. The client should
/// draw without shadow or other decoration outside of the window
/// geometry.
const MAXIMIZED = 0b0000_0000_0000_0001;
/// The surface is fullscreen. The window geometry specified in the
/// configure event is a maximum; the client cannot resize beyond it.
/// For a surface to cover the whole fullscreened area, the geometry
/// dimensions must be obeyed by the client. For more details, see
/// xdg_toplevel.set_fullscreen.
const FULLSCREEN = 0b0000_0000_0000_0010;
/// The surface is being resized. The window geometry specified in the
/// configure event is a maximum; the client cannot resize beyond it.
/// Clients that have aspect ratio or cell sizing configuration can use
/// a smaller size, however.
const RESIZING = 0b0000_0000_0000_0100;
/// Client window decorations should be painted as if the window is
/// active. Do not assume this means that the window actually has
/// keyboard or pointer focus.
const ACTIVATED = 0b0000_0000_0000_1000;
/// The window is currently in a tiled layout and the left edge is
/// considered to be adjacent to another part of the tiling grid.
const TILED_LEFT = 0b0000_0000_0001_0000;
/// The window is currently in a tiled layout and the right edge is
/// considered to be adjacent to another part of the tiling grid.
const TILED_RIGHT = 0b0000_0000_0010_0000;
/// The window is currently in a tiled layout and the top edge is
/// considered to be adjacent to another part of the tiling grid.
const TILED_TOP = 0b0000_0000_0100_0000;
/// The window is currently in a tiled layout and the bottom edge is
/// considered to be adjacent to another part of the tiling grid.
const TILED_BOTTOM = 0b0000_0000_1000_0000;
/// The window has any of the mentioned tiled bits set.
const TILED = Self::TILED_TOP.bits() | Self::TILED_LEFT.bits() | Self::TILED_RIGHT.bits() | Self::TILED_BOTTOM.bits();
}
}

bitflags! {
/// The capabilities of the window manager.
///
/// This is a hint to hide UI elements which provide functionality
/// not supported by compositor.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub struct WindowManagerCapabilities : u16 {
/// `show_window_menu` is available.
const WINDOW_MENU = 0b0000_0000_0000_0001;
/// Window can be maximized and unmaximized.
const MAXIMIZE = 0b0000_0000_0000_0010;
/// Window can be fullscreened and unfullscreened.
const FULLSCREEN = 0b0000_0000_0000_0100;
/// Window could be minimized.
const MINIMIZE = 0b0000_0000_0000_1000;
}
}

/// Which edge or corner is being dragged.
#[non_exhaustive]
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub enum ResizeEdge {
/// Nothing is being dragged.
None,
/// The top edge is being dragged.
Top,
/// The bottom edge is being dragged.
Bottom,
/// The left edge is being dragged.
Left,
/// The top left corner is being dragged.
TopLeft,
/// The bottom left corner is being dragged.
BottomLeft,
/// The right edge is being dragged.
Right,
/// The top right corner is being dragged.
TopRight,
/// The bottom right corner is being dragged.
BottomRight,
}

0 comments on commit ab70fe5

Please sign in to comment.