diff --git a/Cargo.lock b/Cargo.lock index f6e750c..7b63760 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,6 +18,15 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" +[[package]] +name = "accesskit" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a" +dependencies = [ + "uuid", +] + [[package]] name = "ahash" version = "0.8.12" @@ -436,7 +445,7 @@ dependencies = [ "chrono", "clap", "dbus", - "egui", + "egui 0.34.2", "freedesktop-desktop-entry", "futures-lite", "libc", @@ -535,6 +544,15 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "color" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ec7c5eb7a16992b1904d76c517d170ab353b0e0b3d5a0c81a8a0cd1037893cf" +dependencies = [ + "bytemuck", +] + [[package]] name = "color-hex" version = "0.2.0" @@ -716,8 +734,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ddb8ac7643d1dba1bb02110e804406dd459a838efcb14011ced10556711a8e" dependencies = [ "bytemuck", + "emath 0.33.3", +] + +[[package]] +name = "ecolor" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f6cc0cb3b84a21232c468db972ebcddd34decbf1ff02cdebffd807c13bbd81" +dependencies = [ "color-hex", - "emath", + "emath 0.34.2", ] [[package]] @@ -728,8 +755,26 @@ checksum = "6a9b567d356674e9a5121ed3fedfb0a7c31e059fe71f6972b691bcd0bfc284e3" dependencies = [ "ahash", "bitflags 2.11.0", - "emath", - "epaint", + "emath 0.33.3", + "epaint 0.33.3", + "log", + "nohash-hasher", + "profiling", + "smallvec", + "unicode-segmentation", +] + +[[package]] +name = "egui" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbe28ac1a9c0761319aafb9ad37737720cc49d99c13a4a6b990768fa01ffe67" +dependencies = [ + "accesskit", + "ahash", + "bitflags 2.11.0", + "emath 0.34.2", + "epaint 0.34.2", "log", "nohash-hasher", "profiling", @@ -746,8 +791,8 @@ dependencies = [ "ahash", "bytemuck", "document-features", - "egui", - "epaint", + "egui 0.33.3", + "epaint 0.33.3", "log", "profiling", "thiserror 2.0.18", @@ -765,6 +810,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "emath" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74fbbf7501c430b89df62d102b6bfa02162faaf3e155512c677c9d20f5708d1" + [[package]] name = "epaint" version = "0.33.3" @@ -774,21 +825,48 @@ dependencies = [ "ab_glyph", "ahash", "bytemuck", - "ecolor", - "emath", - "epaint_default_fonts", + "ecolor 0.33.3", + "emath 0.33.3", + "epaint_default_fonts 0.33.3", "log", "nohash-hasher", "parking_lot", "profiling", ] +[[package]] +name = "epaint" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92b452e348c2758115288802ca25f86ee286ce2cfae6643711ce116662311310" +dependencies = [ + "ahash", + "ecolor 0.34.2", + "emath 0.34.2", + "epaint_default_fonts 0.34.2", + "font-types", + "log", + "nohash-hasher", + "parking_lot", + "profiling", + "self_cell", + "skrifa", + "smallvec", + "vello_cpu", +] + [[package]] name = "epaint_default_fonts" version = "0.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4fbe202b6578d3d56428fa185cdf114a05e49da05f477b3c7f0fbb221f1862" +[[package]] +name = "epaint_default_fonts" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1644e25dbe3d663fd9c2a4181772c64b23361e377e550c10422ecc3a7de1c3c2" + [[package]] name = "equivalent" version = "1.0.1" @@ -816,6 +894,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "euclid" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06" +dependencies = [ + "num-traits", +] + [[package]] name = "event-listener" version = "5.3.1" @@ -843,6 +930,15 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +[[package]] +name = "fearless_simd" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903" +dependencies = [ + "bytemuck", +] + [[package]] name = "foldhash" version = "0.1.5" @@ -855,6 +951,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" +[[package]] +name = "font-types" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7" +dependencies = [ + "bytemuck", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -1284,6 +1389,18 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +[[package]] +name = "kurbo" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2" +dependencies = [ + "arrayvec", + "euclid", + "polycool", + "smallvec", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -1337,6 +1454,12 @@ dependencies = [ "libc", ] +[[package]] +name = "linebender_resource_handle" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" + [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -1698,6 +1821,19 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "peniko" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839c8299360d2e998bdb106dc0a6cd71dcc5f4df51df1b620361bf50e283cca6" +dependencies = [ + "bytemuck", + "color", + "kurbo", + "linebender_resource_handle", + "smallvec", +] + [[package]] name = "pin-project-lite" version = "0.2.15" @@ -1736,6 +1872,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "polycool" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6" +dependencies = [ + "arrayvec", +] + [[package]] name = "portable-atomic" version = "1.13.1" @@ -1808,6 +1953,16 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "read-fonts" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5" +dependencies = [ + "bytemuck", + "font-types", +] + [[package]] name = "redox_syscall" version = "0.5.7" @@ -1953,6 +2108,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "self_cell" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" + [[package]] name = "serde" version = "1.0.228" @@ -2035,7 +2196,7 @@ version = "1.1.0" dependencies = [ "anyhow", "clap", - "egui", + "egui 0.34.2", "log", "serde", "serde_yaml", @@ -2069,6 +2230,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "skrifa" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.9" @@ -2548,6 +2719,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "uuid" +version = "1.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" + [[package]] name = "value-bag" version = "1.12.0" @@ -2584,6 +2761,32 @@ dependencies = [ "sval_serde", ] +[[package]] +name = "vello_common" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bd1a4c633ce09e7d713df1a6e036644a125e15e0c169cfb5180ddf5836ca04b" +dependencies = [ + "bytemuck", + "fearless_simd", + "hashbrown 0.16.1", + "log", + "peniko", + "skrifa", + "smallvec", +] + +[[package]] +name = "vello_cpu" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162bfe48aabf6a9fdcd401b628c7d9f260c2cbabb343c70a65feba6f7849edc" +dependencies = [ + "bytemuck", + "hashbrown 0.16.1", + "vello_common", +] + [[package]] name = "version_check" version = "0.9.5" @@ -2688,7 +2891,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a781af8b83ca955370ad712e2191116da76c03ca673cb9b40f18ddaf4faf660" dependencies = [ - "egui", + "egui 0.33.3", "egui-wgpu", "futures", "log", diff --git a/client/Cargo.toml b/client/Cargo.toml index 96656bf..42f3a56 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -26,7 +26,7 @@ serde = { version = "1.0.217", features = ["derive"] } serde_yaml = "0.9.34" # application window -egui = { version = "0.33.3", features = ["color-hex"] } +egui = { version = "0.34.2", features = ["color-hex"] } wayapp = "0.2.2" smithay-client-toolkit = "0.20.0" diff --git a/settings/Cargo.toml b/settings/Cargo.toml index 7fa5514..ec2ddf3 100644 --- a/settings/Cargo.toml +++ b/settings/Cargo.toml @@ -9,5 +9,5 @@ anyhow = "1.0.102" serde = { version = "1.0.210", features = ["derive"] } serde_yaml = "0.9.34" -egui = { version = "0.33.3", features = ["color-hex"] } +egui = { version = "0.34.2", features = ["color-hex"] } clap = { version = "4.5.60", features = ["derive", "env"] }