diff --git a/Cargo.lock b/Cargo.lock index eb4aeef..7264eb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,7 +288,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -531,7 +531,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -566,7 +566,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -675,16 +675,14 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -692,8 +690,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.72", - "which", + "syn 2.0.87", ] [[package]] @@ -829,7 +826,7 @@ dependencies = [ "calloop", "rustix 0.38.34", "wayland-backend", - "wayland-client 0.31.5", + "wayland-client", ] [[package]] @@ -866,12 +863,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -974,7 +972,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1041,9 +1039,9 @@ dependencies = [ [[package]] name = "copypasta" -version = "0.8.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133fc8675ee3a4ec9aa513584deda9aa0faeda3586b87f7f0f2ba082c66fb172" +checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858" dependencies = [ "clipboard-win", "objc", @@ -1187,7 +1185,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1198,7 +1196,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1263,6 +1261,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "dioxus-clipboard" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3796f1d3dd56e6fdd6ea96221c0f639b4d688a17966d0d2f4dc883d9713813" +dependencies = [ + "copypasta", + "dioxus-lib", +] + [[package]] name = "dioxus-config-macro" version = "0.5.6" @@ -1303,7 +1311,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1380,7 +1388,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1430,7 +1438,7 @@ dependencies = [ "proc-macro2", "quote", "slab", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1444,7 +1452,7 @@ dependencies = [ "krates", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", "tracing", ] @@ -1454,7 +1462,6 @@ version = "0.5.0" source = "git+https://github.com/DioxusLabs/sdk?rev=57ab3fa972c6d4a7acc25e82a0aafc3ff9e63403#57ab3fa972c6d4a7acc25e82a0aafc3ff9e63403" dependencies = [ "cfg-if", - "copypasta", "dioxus", "futures", "gloo-timers", @@ -1564,7 +1571,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1575,7 +1582,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1596,7 +1603,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1691,7 +1698,7 @@ checksum = "ce8cd46a041ad005ab9c71263f9a0ff5b529eac0fe4cc9b4a20f4f0765d8cf4b" dependencies = [ "execute-command-tokens", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1810,7 +1817,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -1837,7 +1844,7 @@ dependencies = [ [[package]] name = "freya" version = "0.2.2" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "dioxus", "dioxus-core", @@ -1860,7 +1867,7 @@ dependencies = [ [[package]] name = "freya-common" version = "0.2.1" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "accesskit", "dioxus-core", @@ -1876,7 +1883,7 @@ dependencies = [ [[package]] name = "freya-components" version = "0.2.1" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "bytes", "dioxus", @@ -1899,7 +1906,7 @@ dependencies = [ [[package]] name = "freya-core" version = "0.2.1" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "accesskit", "accesskit_winit", @@ -1909,6 +1916,7 @@ dependencies = [ "freya-engine", "freya-native-core", "freya-node-state", + "indexmap", "itertools 0.13.0", "rustc-hash 2.0.0", "smallvec", @@ -1922,7 +1930,7 @@ dependencies = [ [[package]] name = "freya-elements" version = "0.2.0" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "dioxus-core", "dioxus-rsx", @@ -1934,7 +1942,7 @@ dependencies = [ [[package]] name = "freya-engine" version = "0.2.2" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "bitflags 2.6.0", "glutin", @@ -1944,13 +1952,13 @@ dependencies = [ [[package]] name = "freya-hooks" version = "0.2.1" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "bitflags 2.6.0", "bytes", + "dioxus-clipboard", "dioxus-core", "dioxus-hooks", - "dioxus-sdk", "dioxus-signals", "easer", "freya-common", @@ -1969,7 +1977,7 @@ dependencies = [ [[package]] name = "freya-native-core" version = "0.2.1" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "anymap", "dashmap", @@ -1983,16 +1991,16 @@ dependencies = [ [[package]] name = "freya-native-core-macro" version = "0.2.0" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] name = "freya-node-state" version = "0.2.1" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "accesskit", "bytes", @@ -2013,7 +2021,7 @@ dependencies = [ [[package]] name = "freya-renderer" version = "0.2.1" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "accesskit", "accesskit_winit", @@ -2035,6 +2043,7 @@ dependencies = [ "itertools 0.13.0", "pin-utils", "raw-window-handle", + "rustc-hash 2.0.0", "tokio", "torin", "tracing", @@ -2135,7 +2144,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -2205,16 +2214,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "gethostname" version = "0.4.3" @@ -2323,7 +2322,7 @@ dependencies = [ "objc2-foundation", "once_cell", "raw-window-handle", - "wayland-sys 0.31.4", + "wayland-sys", "windows-sys 0.52.0", "x11-dl", ] @@ -2417,6 +2416,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + [[package]] name = "heck" version = "0.5.0" @@ -2668,12 +2673,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.1", ] [[package]] @@ -2723,7 +2728,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -2926,12 +2931,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lebe" version = "0.5.2" @@ -3066,15 +3065,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.4" @@ -3084,15 +3074,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -3198,18 +3179,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.26.4" @@ -3316,7 +3285,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -3376,7 +3345,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -3660,7 +3629,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -3798,7 +3767,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -3893,7 +3862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -3917,9 +3886,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -3940,7 +3909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -3969,9 +3938,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -4316,9 +4285,7 @@ version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ - "log", "once_cell", - "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -4396,8 +4363,8 @@ checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", - "smithay-client-toolkit 0.19.2", + "memmap2", + "smithay-client-toolkit", "tiny-skia", ] @@ -4460,7 +4427,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -4482,7 +4449,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -4581,9 +4548,9 @@ dependencies = [ [[package]] name = "skia-bindings" -version = "0.75.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06e19e97660b09a381c6eb566849b63556b1a90b8e2c6ba2d146b3f5066847b" +checksum = "179ebe08aee2634b22ef4d2a1a9370aaa39dfe619a702fc0793d491a26c05cbb" dependencies = [ "bindgen", "cc", @@ -4598,15 +4565,27 @@ dependencies = [ [[package]] name = "skia-safe" -version = "0.75.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6e6f369522471b585c99427720b53aad04016fa4314e0a8cf23f17083a4e4c" +checksum = "41f1a96bec5198699d49e9c6a46aea27033958521c971d9186ae015a0dbecb7b" dependencies = [ "base64", "bitflags 2.6.0", "lazy_static", + "percent-encoding", "skia-bindings", - "ureq", + "skia-svg-macros", +] + +[[package]] +name = "skia-svg-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "044dd2233c9717a74f75197f3e7f0a966db2127c0ffb5e05013b480a9b75b2c7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] @@ -4634,24 +4613,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" -dependencies = [ - "bitflags 1.3.2", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client 0.29.5", - "wayland-cursor 0.29.5", - "wayland-protocols 0.29.5", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -4664,27 +4625,28 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2", "rustix 0.38.34", "thiserror", "wayland-backend", - "wayland-client 0.31.5", + "wayland-client", "wayland-csd-frame", - "wayland-cursor 0.31.5", - "wayland-protocols 0.32.3", + "wayland-cursor", + "wayland-protocols", "wayland-protocols-wlr", - "wayland-scanner 0.31.4", + "wayland-scanner", "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ - "smithay-client-toolkit 0.16.1", - "wayland-client 0.29.5", + "libc", + "smithay-client-toolkit", + "wayland-backend", ] [[package]] @@ -4777,9 +4739,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -4872,7 +4834,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -4968,7 +4930,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -5076,7 +5038,7 @@ dependencies = [ [[package]] name = "torin" version = "0.2.0" -source = "git+https://github.com/marc2332/freya?rev=44d1ee86154fa12bb3e5a0f70dbd752f012a909a#44d1ee86154fa12bb3e5a0f70dbd752f012a909a" +source = "git+https://github.com/marc2332/freya?rev=e617db5a733297fc4e52f75936b53a690d807c82#e617db5a733297fc4e52f75936b53a690d807c82" dependencies = [ "euclid", "freya-native-core", @@ -5132,7 +5094,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -5236,22 +5198,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-pki-types", - "url", - "webpki-roots", -] - [[package]] name = "url" version = "2.5.2" @@ -5299,12 +5245,13 @@ dependencies = [ [[package]] name = "valin" -version = "0.0.14" +version = "0.0.16" dependencies = [ "async-lsp", "async-trait", "clap", "dioxus", + "dioxus-clipboard", "dioxus-radio", "dioxus-sdk", "dioxus-use-computed", @@ -5418,7 +5365,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -5452,7 +5399,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5474,23 +5421,7 @@ dependencies = [ "rustix 0.38.34", "scoped-tls", "smallvec", - "wayland-sys 0.31.4", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons", - "wayland-scanner 0.29.5", - "wayland-sys 0.29.5", + "wayland-sys", ] [[package]] @@ -5502,19 +5433,7 @@ dependencies = [ "bitflags 2.6.0", "rustix 0.38.34", "wayland-backend", - "wayland-scanner 0.31.4", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", + "wayland-scanner", ] [[package]] @@ -5528,17 +5447,6 @@ dependencies = [ "wayland-backend", ] -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.3", - "wayland-client 0.29.5", - "xcursor", -] - [[package]] name = "wayland-cursor" version = "0.31.5" @@ -5546,22 +5454,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" dependencies = [ "rustix 0.38.34", - "wayland-client 0.31.5", + "wayland-client", "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.29.5", - "wayland-commons", - "wayland-scanner 0.29.5", -] - [[package]] name = "wayland-protocols" version = "0.32.3" @@ -5570,8 +5466,8 @@ checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" dependencies = [ "bitflags 2.6.0", "wayland-backend", - "wayland-client 0.31.5", - "wayland-scanner 0.31.4", + "wayland-client", + "wayland-scanner", ] [[package]] @@ -5582,9 +5478,9 @@ checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" dependencies = [ "bitflags 2.6.0", "wayland-backend", - "wayland-client 0.31.5", - "wayland-protocols 0.32.3", - "wayland-scanner 0.31.4", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -5595,20 +5491,9 @@ checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" dependencies = [ "bitflags 2.6.0", "wayland-backend", - "wayland-client 0.31.5", - "wayland-protocols 0.32.3", - "wayland-scanner 0.31.4", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -5622,17 +5507,6 @@ dependencies = [ "quote", ] -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - [[package]] name = "wayland-sys" version = "0.31.4" @@ -5665,33 +5539,12 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "weezl" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.34", -] - [[package]] name = "winapi" version = "0.3.9" @@ -5717,15 +5570,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -5771,7 +5615,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -5782,7 +5626,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -6020,7 +5864,7 @@ dependencies = [ "dpi", "js-sys", "libc", - "memmap2 0.9.4", + "memmap2", "ndk", "objc2", "objc2-app-kit", @@ -6033,21 +5877,21 @@ dependencies = [ "redox_syscall 0.4.1", "rustix 0.38.34", "sctk-adwaita", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smol_str", "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", - "wayland-client 0.31.5", - "wayland-protocols 0.32.3", + "wayland-client", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", "windows-sys 0.52.0", "x11-dl", - "x11rb 0.13.1", + "x11rb", "xkbcommon-dl", ] @@ -6081,11 +5925,12 @@ dependencies = [ [[package]] name = "x11-clipboard" -version = "0.7.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" +checksum = "662d74b3d77e396b8e5beb00b9cad6a9eccf40b2ef68cc858784b14c41d535a3" dependencies = [ - "x11rb 0.10.1", + "libc", + "x11rb", ] [[package]] @@ -6099,19 +5944,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" -dependencies = [ - "gethostname 0.2.3", - "nix 0.24.3", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.10.0", -] - [[package]] name = "x11rb" version = "0.13.1" @@ -6119,21 +5951,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", - "gethostname 0.4.3", + "gethostname", "libc", "libloading", "once_cell", "rustix 0.38.34", - "x11rb-protocol 0.13.1", -] - -[[package]] -name = "x11rb-protocol" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix 0.24.3", + "x11rb-protocol", ] [[package]] @@ -6296,7 +6119,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", "zvariant_utils 2.0.0", ] @@ -6339,7 +6162,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] [[package]] @@ -6422,7 +6245,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", "zvariant_utils 2.0.0", ] @@ -6445,5 +6268,5 @@ checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.87", ] diff --git a/Cargo.toml b/Cargo.toml index 13dab51..b3c6ff4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,21 @@ [package] name = "valin" -version = "0.0.15" +version = "0.0.16" edition = "2021" -[patch.crates-io] -dioxus-sdk = { git = "https://github.com/DioxusLabs/sdk", rev = "57ab3fa972c6d4a7acc25e82a0aafc3ff9e63403" } - [dependencies] -freya-node-state = { git = "https://github.com/marc2332/freya", rev = "175aa299029e797b7288f51b4d95c2d53a45fce9" } -freya = { git = "https://github.com/marc2332/freya", rev = "175aa299029e797b7288f51b4d95c2d53a45fce9" } -freya-hooks = { git = "https://github.com/marc2332/freya", rev = "175aa299029e797b7288f51b4d95c2d53a45fce9" } +freya-node-state = { git = "https://github.com/marc2332/freya", rev = "e617db5a733297fc4e52f75936b53a690d807c82" } +freya = { git = "https://github.com/marc2332/freya", rev = "e617db5a733297fc4e52f75936b53a690d807c82" } +freya-hooks = { git = "https://github.com/marc2332/freya", rev = "e617db5a733297fc4e52f75936b53a690d807c82" } dioxus-radio = "0.2.4" dioxus = "0.5" -dioxus-sdk = { git = "https://github.com/DioxusLabs/sdk", rev = "57ab3fa972c6d4a7acc25e82a0aafc3ff9e63403", features = ["clipboard", "timing"] } +dioxus-clipboard = "*" +dioxus-sdk = { git = "https://github.com/DioxusLabs/sdk", rev = "57ab3fa972c6d4a7acc25e82a0aafc3ff9e63403", features = ["timing"] } tokio = { version = "1.33.0", features = ["fs", "process"]} winit = "0.30.1" -skia-safe = { version = "0.75.0", features = ["gl", "textlayout", "svg"] } +skia-safe = { version = "0.80.0", features = ["gl", "textlayout", "svg"] } ropey = "1.6.0" smallvec = "1.10.0" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e1b7e95..8fc77ba 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.79.0" +channel = "1.82.0" profile = "default" \ No newline at end of file diff --git a/src/app.rs b/src/app.rs index 4796624..e279a28 100644 --- a/src/app.rs +++ b/src/app.rs @@ -8,8 +8,8 @@ use crate::{ use crate::{global_defaults::GlobalDefaults, state::KeyboardShortcuts}; use crate::{hooks::*, settings::watch_settings}; use crate::{tabs::editor::EditorTab, utils::*}; +use dioxus_clipboard::prelude::use_clipboard; use dioxus_radio::prelude::*; -use dioxus_sdk::clipboard::use_clipboard; use freya::prelude::*; use std::sync::Arc; use tracing::info; diff --git a/src/components/editor_panel.rs b/src/components/editor_panel.rs index 7dbd495..e31fab1 100644 --- a/src/components/editor_panel.rs +++ b/src/components/editor_panel.rs @@ -90,7 +90,7 @@ pub fn EditorPanel(EditorPanelProps { panel_index, width }: EditorPanelProps) -> Button { theme: theme_with!(ButtonTheme { height: "fill".into(), - padding: "10 8".into(), + padding: "0 8".into(), }), onpress: close_panel, label { @@ -101,7 +101,7 @@ pub fn EditorPanel(EditorPanelProps { panel_index, width }: EditorPanelProps) -> Button { theme: theme_with!(ButtonTheme { height: "fill".into(), - padding: "10 8".into(), + padding: "0 8".into(), }), onpress: split_panel, label { diff --git a/src/main.rs b/src/main.rs index 8c7f201..cc496ce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -85,6 +85,7 @@ fn main() { config .with_size(1280.0, 720.0) .with_title("Valin") - .with_state(Arc::new(args)), + .with_state(Arc::new(args)) + .with_max_paragraph_cache_size(200), ); } diff --git a/src/state/app.rs b/src/state/app.rs index 998ef3e..20f0208 100644 --- a/src/state/app.rs +++ b/src/state/app.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, vec}; +use dioxus_clipboard::prelude::UseClipboard; use dioxus_radio::prelude::{Radio, RadioChannel}; -use dioxus_sdk::clipboard::UseClipboard; use skia_safe::{textlayout::FontCollection, FontMgr}; use tracing::info; diff --git a/src/tabs/editor/editor_data.rs b/src/tabs/editor/editor_data.rs index b2c8ebb..f67a6ce 100644 --- a/src/tabs/editor/editor_data.rs +++ b/src/tabs/editor/editor_data.rs @@ -3,7 +3,7 @@ use std::cell::RefCell; use std::rc::Rc; use std::{cmp::Ordering, fmt::Display, ops::Range, path::PathBuf}; -use dioxus_sdk::clipboard::UseClipboard; +use dioxus_clipboard::prelude::UseClipboard; use freya::hooks::{EditorHistory, HistoryChange, Line, TextCursor, TextEditor}; use freya::prelude::Rope; use freya_hooks::LinesIterator; @@ -145,7 +145,8 @@ impl Display for EditorData { } impl TextEditor for EditorData { - type LinesIterator<'a> = LinesIterator<'a> + type LinesIterator<'a> + = LinesIterator<'a> where Self: 'a;