Input method and virtual keyboard

.github/workflows/audit.yml

@@ -16,15 +16,3 @@ jobs:
       run: cargo update
     - name: Audit vulnerabilities
       run: cargo audit
-
-  artifacts:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: hecrj/setup-rust-action@v1
-    - name: Install cargo-outdated
-      run: cargo install cargo-outdated
-    - uses: actions/checkout@master
-    - name: Delete `web-sys` dependency from `integration` example
-      run: sed -i '$d' examples/integration/Cargo.toml
-    - name: Find outdated dependencies
-      run: cargo outdated --workspace --exit-code 1 --ignore raw-window-handle

.github/workflows/document.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Generate documentation
       run: |
         RUSTDOCFLAGS="--cfg docsrs" \
-          cargo doc --no-deps --all-features \
+          cargo doc --no-deps --features "winit" \
           -p iced_core \
           -p iced_highlighter \
           -p iced_style \

.github/workflows/lint.yml

@@ -2,11 +2,19 @@ name: Lint
 on: [push, pull_request]
 jobs:
   all:
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
     steps:
     - uses: hecrj/setup-rust-action@v1
       with:
         components: clippy
+
     - uses: actions/checkout@master
+    - name: Install dependencies
+      run: |
+        export DEBIAN_FRONTED=noninteractive
+        sudo apt-get -qq update
+        sudo apt-get install -y libxkbcommon-dev libwayland-dev
     - name: Check lints
-      run: cargo lint
+      run: |
+        cargo clippy --no-default-features --features "winit" --all-targets
+        cargo clippy --no-default-features --features "wayland wgpu svg canvas qr_code lazy debug tokio palette web-colors a11y"

.github/workflows/test.yml

@@ -19,8 +19,38 @@ jobs:
       run: |
         export DEBIAN_FRONTED=noninteractive
         sudo apt-get -qq update
-        sudo apt-get install -y libxkbcommon-dev libgtk-3-dev
+        sudo apt-get install -y libxkbcommon-dev libwayland-dev
     - name: Run tests
       run: |
-        cargo test --verbose --workspace
-        cargo test --verbose --workspace --all-features
+        cargo test --verbose --features "winit wgpu svg canvas qr_code lazy debug tokio palette web-colors a11y"
+        cargo test -p iced_accessibility
+        cargo test -p iced_core
+        cargo test -p iced_futures
+        cargo test -p iced_graphics
+        cargo test -p iced_renderer
+        cargo test -p iced_runtime
+        cargo test -p iced_tiny_skia
+        cargo test -p iced_widget
+        cargo test -p iced_wgpu
+    - name: test wayland
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        cargo test --verbose --features "wayland wgpu svg canvas qr_code lazy debug tokio palette web-colors a11y"
+        cargo test -p iced_sctk
+
+  web:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hecrj/setup-rust-action@v1
+      with:
+        rust-version: stable
+        targets: wasm32-unknown-unknown
+    - uses: actions/checkout@master
+    - name: Run checks
+      run: cargo check --package iced --target wasm32-unknown-unknown --no-default-features --features "winit"
+    - name: Check compilation of `tour` example
+      run: cargo build --package tour --target wasm32-unknown-unknown
+    - name: Check compilation of `todos` example
+      run: cargo build --package todos --target wasm32-unknown-unknown
+    - name: Check compilation of `integration` example
+      run: cargo build --package integration --target wasm32-unknown-unknown

CHANGELOG.md

@@ -21,6 +21,11 @@ Many thanks to...
 - @akshayr-mecha
 - @dtzxporter
 
+Many thanks to...
+- @edfloreshz
+- @jackpot51
+- @wash2
+
 ## [0.10.0] - 2023-07-28
 ### Added
 - Text shaping, font fallback, and `iced_wgpu` overhaul. [#1697](https://github.com/iced-rs/iced/pull/1697)

Cargo.toml

@@ -18,7 +18,6 @@ all-features = true
 maintenance = { status = "actively-developed" }
 
 [features]
-default = ["wgpu"]
 # Enable the `wgpu` GPU-accelerated renderer backend
 wgpu = ["iced_renderer/wgpu", "iced_widget/wgpu"]
 # Enables the `Image` widget
@@ -32,7 +31,7 @@ qr_code = ["iced_widget/qr_code"]
 # Enables lazy widgets
 lazy = ["iced_widget/lazy"]
 # Enables a debug view in native platforms (press F12)
-debug = ["iced_winit/debug"]
+debug = ["iced_winit?/debug", "iced_sctk?/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
 tokio = ["iced_futures/tokio"]
 # Enables `async-std` as the `executor::Default` on native platforms
@@ -41,18 +40,28 @@ async-std = ["iced_futures/async-std"]
 smol = ["iced_futures/smol"]
 # Enables advanced color conversion via `palette`
 palette = ["iced_core/palette"]
-# Enables querying system information
-system = ["iced_winit/system"]
 # Enables broken "sRGB linear" blending to reproduce color management of the Web
 web-colors = ["iced_renderer/web-colors"]
 # Enables the WebGL backend, replacing WebGPU
 webgl = ["iced_renderer/webgl"]
 # Enables the syntax `highlighter` module
 highlighter = ["iced_highlighter"]
 # Enables experimental multi-window support.
-multi-window = ["iced_winit/multi-window"]
+multi-window = ["iced_winit?/multi-window"]
 # Enables the advanced module
 advanced = []
+# Enables the `accesskit` accessibility library
+a11y = ["iced_accessibility", "iced_core/a11y", "iced_widget/a11y", "iced_winit?/a11y", "iced_sctk?/a11y"]
+# Enables the winit shell. Conflicts with `wayland` and `glutin`.
+winit = ["iced_winit", "iced_accessibility?/accesskit_winit"]
+# Enables the sctk shell. Conflicts with `winit` and `glutin`.
+wayland = ["iced_sctk", "iced_widget/wayland", "iced_accessibility?/accesskit_unix", "iced_core/wayland"]
+# Enables clipboard for iced_sctk
+wayland-clipboard = ["iced_sctk?/clipboard"]
+# Enables the sctk with input method support.
+wayland_input_method = ["iced_sctk/input_method"]
+# Enables the sctk with virtual keyboard.
+wayland_virtual_keyboard = ["iced_sctk/virtual_keyboard"]
 
 [dependencies]
 iced_core.workspace = true
@@ -61,40 +70,48 @@ iced_renderer.workspace = true
 iced_widget.workspace = true
 iced_winit.features = ["application"]
 iced_winit.workspace = true
-
+iced_winit.optional = true
+iced_sctk.workspace = true
+iced_sctk.optional = true
 iced_highlighter.workspace = true
 iced_highlighter.optional = true
-
+iced_accessibility.workspace = true
+iced_accessibility.optional = true
 thiserror.workspace = true
+window_clipboard.workspace = true
 
 image.workspace = true
 image.optional = true
 
-[profile.release-opt]
-inherits = "release"
-codegen-units = 1
-debug = false
-lto = true
-incremental = false
-opt-level = 3
-overflow-checks = false
-strip = "debuginfo"
 
 [workspace]
 members = [
     "core",
     "futures",
     "graphics",
-    "highlighter",
-    "renderer",
     "runtime",
+    "renderer",
     "style",
     "tiny_skia",
     "wgpu",
     "widget",
     "winit",
     "examples/*",
+    "accessibility",
+    "sctk"
 ]
+exclude = ["examples/integration"]
+
+
+[profile.release-opt]
+inherits = "release"
+codegen-units = 1
+debug = false
+lto = true
+incremental = false
+opt-level = 3
+overflow-checks = false
+strip = "debuginfo"
 
 [workspace.package]
 version = "0.12.0"
@@ -118,15 +135,17 @@ iced_style = { version = "0.12", path = "style" }
 iced_tiny_skia = { version = "0.12", path = "tiny_skia" }
 iced_wgpu = { version = "0.12", path = "wgpu" }
 iced_widget = { version = "0.12", path = "widget" }
-iced_winit = { version = "0.12", path = "winit" }
+iced_winit = { version = "0.12", path = "winit", features = ["application"] }
+iced_sctk = { version = "0.1", path = "sctk" }
+iced_accessibility = { version = "0.1", path = "accessibility" }
 
 async-std = "1.0"
 bitflags = "1.0"
 bytemuck = { version = "1.0", features = ["derive"] }
-cosmic-text = "0.10"
+cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git" }
 futures = "0.3"
 glam = "0.24"
-glyphon = "0.5"
+glyphon = { git = "https://github.com/pop-os/glyphon.git", tag = "v0.5.0" }
 guillotiere = "0.6"
 half = "2.2"
 image = "0.24"
@@ -141,11 +160,12 @@ ouroboros = "0.17"
 palette = "0.7"
 qrcode = { version = "0.12", default-features = false }
 raw-window-handle = "0.6"
-resvg = "0.36"
+resvg = "0.37"
 rustc-hash = "1.0"
+sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "2e9bf9f" }
 smol = "1.0"
 smol_str = "0.2"
-softbuffer = "0.4"
+softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "cosmic-4.0" }
 syntect = "5.1"
 sysinfo = "0.28"
 thiserror = "1.0"
@@ -156,9 +176,14 @@ xxhash-rust = { version = "0.8", features = ["xxh3"] }
 unicode-segmentation = "1.0"
 wasm-bindgen-futures = "0.4"
 wasm-timer = "0.2"
+wayland-protocols = { version = "0.31.0", features = [ "staging"]}
 web-sys = "0.3"
 web-time = "0.2"
-wgpu = "0.19"
+# wgpu = "0.19"
+# Newer wgpu commit that fixes Vulkan backend on Nvidia
+wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "20fda69" }
+wayland-protocols-misc = { version = "0.2.0"}
 winapi = "0.3"
-window_clipboard = "0.4"
-winit = { git = "https://github.com/iced-rs/winit.git", rev = "b91e39ece2c0d378c3b80da7f3ab50e17bb798a5" }
+window_clipboard = { git = "https://github.com/pop-os/window_clipboard.git", tag = "pop-mime-types" } 
+# window_clipboard = { path = "../window_clipboard" } 
+winit = { git = "https://github.com/pop-os/winit.git", branch = "winit-0.29" }

accessibility/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "iced_accessibility"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+# TODO Ashley re-export more platform adapters
+
+[dependencies]
+accesskit = { git = "https://github.com/wash2/accesskit.git", branch = "winit-0.29" }
+accesskit_unix = { git = "https://github.com/wash2/accesskit.git", branch = "winit-0.29", optional = true }
+accesskit_windows = { git = "https://github.com/wash2/accesskit.git", branch = "winit-0.29", optional = true}
+accesskit_macos = { git = "https://github.com/wash2/accesskit.git", branch = "winit-0.29", optional = true}
+accesskit_winit = { git = "https://github.com/wash2/accesskit.git", branch = "winit-0.29", optional = true}
+# accesskit = { path = "../../fork/accesskit/common/", version = "0.11.0" }
+# accesskit_unix = { path = "../../fork/accesskit/platforms/unix/", version = "0.4.0", optional = true }
+# accesskit_windows = { path = "../../fork/accesskit/platforms/windows/", version = "0.14.0", optional = true}
+# accesskit_macos = { path = "../../fork/accesskit/platforms/macos/", version = "0.7.0", optional = true}
+# accesskit_winit = { path = "../../fork/accesskit/platforms/winit/", version = "0.13.0", optional = true}

accessibility/src/a11y_tree.rs

@@ -0,0 +1,80 @@
+use crate::{A11yId, A11yNode, IdEq};
+
+#[derive(Debug, Clone, Default)]
+/// Accessible tree of nodes
+pub struct A11yTree {
+    /// The root of the current widget, children of the parent widget or the Window if there is no parent widget
+    root: Vec<A11yNode>,
+    /// The children of a widget and its children
+    children: Vec<A11yNode>,
+}
+
+impl A11yTree {
+    /// Create a new A11yTree
+    /// XXX if you use this method, you will need to manually add the children of the root nodes
+    pub fn new(root: Vec<A11yNode>, children: Vec<A11yNode>) -> Self {
+        Self { root, children }
+    }
+
+    pub fn leaf<T: Into<A11yId>>(node: accesskit::NodeBuilder, id: T) -> Self {
+        Self {
+            root: vec![A11yNode::new(node, id)],
+            children: vec![],
+        }
+    }
+
+    /// Helper for creating an A11y tree with a single root node and some children
+    pub fn node_with_child_tree(mut root: A11yNode, child_tree: Self) -> Self {
+        root.add_children(
+            child_tree.root.iter().map(|n| n.id()).cloned().collect(),
+        );
+        Self {
+            root: vec![root],
+            children: child_tree
+                .children
+                .into_iter()
+                .chain(child_tree.root)
+                .collect(),
+        }
+    }
+
+    /// Joins multiple trees into a single tree
+    pub fn join<T: Iterator<Item = Self>>(trees: T) -> Self {
+        trees.fold(Self::default(), |mut acc, A11yTree { root, children }| {
+            acc.root.extend(root);
+            acc.children.extend(children);
+            acc
+        })
+    }
+
+    pub fn root(&self) -> &Vec<A11yNode> {
+        &self.root
+    }
+
+    pub fn children(&self) -> &Vec<A11yNode> {
+        &self.children
+    }
+
+    pub fn root_mut(&mut self) -> &mut Vec<A11yNode> {
+        &mut self.root
+    }
+
+    pub fn children_mut(&mut self) -> &mut Vec<A11yNode> {
+        &mut self.children
+    }
+
+    pub fn contains(&self, id: &A11yId) -> bool {
+        self.root.iter().any(|n| IdEq::eq(n.id(), id))
+            || self.children.iter().any(|n| IdEq::eq(n.id(), id))
+    }
+}
+
+impl From<A11yTree> for Vec<(accesskit::NodeId, accesskit::Node)> {
+    fn from(tree: A11yTree) -> Vec<(accesskit::NodeId, accesskit::Node)> {
+        tree.root
+            .into_iter()
+            .map(|node| node.into())
+            .chain(tree.children.into_iter().map(|node| node.into()))
+            .collect()
+    }
+}