diff --git a/Cargo.lock b/Cargo.lock index b8425f2..1937d93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -531,13 +531,38 @@ dependencies = [ "thiserror", ] +[[package]] +name = "calloop" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ead1e1514bce44c0f40e027899fbc595907fc112635bed21b3b5d975c0a5e7" +dependencies = [ + "bitflags 2.6.0", + "polling", + "rustix", + "slab", + "tracing", +] + [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop", + "calloop 0.13.0", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a7a1dbbe026a55ef47a500b123af5a9a0914520f061d467914cf21be95daf" +dependencies = [ + "calloop 0.14.1", "rustix", "wayland-backend", "wayland-client", @@ -908,6 +933,41 @@ dependencies = [ "zbus 4.4.0", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.87", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.87", +] + [[package]] name = "data-url" version = "0.3.1" @@ -1215,6 +1275,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "font-types" version = "0.7.3" @@ -1866,6 +1932,40 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "iced_layershell" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c691ad809b0479546f8e8e9ce3d6ed4eeb7117e934c58049370c4ecc3b839e72" +dependencies = [ + "futures", + "iced", + "iced_core", + "iced_futures", + "iced_graphics", + "iced_layershell_macros", + "iced_renderer", + "iced_runtime", + "layershellev", + "log", + "thiserror", + "tracing", + "window_clipboard", +] + +[[package]] +name = "iced_layershell_macros" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9e870f0a81a2b8a132043733a240995574b4e3af6f99a7fc914de155ed8afd7" +dependencies = [ + "darling", + "manyhow", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "iced_renderer" version = "0.13.0" @@ -2099,6 +2199,12 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.0.3" @@ -2295,6 +2401,7 @@ dependencies = [ "iced_aw", "iced_fonts", "iced_futures", + "iced_layershell", "iced_runtime", "iced_zbus_notification", "regex", @@ -2308,6 +2415,28 @@ dependencies = [ "zbus 5.1.1", ] +[[package]] +name = "layershellev" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e1c8fa611d833feba322320afdf72d528432232b30a8d848f829d257f250ce1" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.14.1", + "calloop-wayland-source 0.4.0", + "log", + "raw-window-handle", + "tempfile", + "thiserror", + "waycrate_xkbkeycode", + "wayland-backend", + "wayland-client", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-misc", + "wayland-protocols-wlr", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -2464,6 +2593,30 @@ dependencies = [ "libc", ] +[[package]] +name = "manyhow" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587" +dependencies = [ + "darling_core", + "manyhow-macros", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "manyhow-macros" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495" +dependencies = [ + "proc-macro-utils", + "proc-macro2", + "quote", +] + [[package]] name = "matchers" version = "0.1.0" @@ -3193,6 +3346,17 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "proc-macro-utils" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeaf08a13de400bc215877b5bdc088f241b12eb42f0a548d3390dc1c56bb7071" +dependencies = [ + "proc-macro2", + "quote", + "smallvec", +] + [[package]] name = "proc-macro2" version = "1.0.89" @@ -3692,8 +3856,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", - "calloop", - "calloop-wayland-source", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", "cursor-icon", "libc", "log", @@ -3802,6 +3966,12 @@ dependencies = [ "float-cmp", ] +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "svg_fmt" version = "0.4.4" @@ -4087,6 +4257,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4432,6 +4603,22 @@ dependencies = [ "web-sys", ] +[[package]] +name = "waycrate_xkbkeycode" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95bfd714703072e1b7f6e320b570074d0994661c6b21ce184bd20f4aaef1d2d3" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.14.1", + "log", + "memmap2", + "smol_str", + "wayland-backend", + "wayland-client", + "xkbcommon-dl", +] + [[package]] name = "wayland-backend" version = "0.3.7" @@ -4492,6 +4679,19 @@ dependencies = [ "wayland-scanner", ] +[[package]] +name = "wayland-protocols-misc" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2e42969764e469a115d4bb1c16e9588ef8b75b127ba7a2c9ddf1e140b25ca7" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + [[package]] name = "wayland-protocols-plasma" version = "0.3.5" @@ -4961,7 +5161,7 @@ dependencies = [ "bitflags 2.6.0", "block2", "bytemuck", - "calloop", + "calloop 0.13.0", "cfg_aliases 0.2.1", "concurrent-queue", "core-foundation 0.9.4",