diff --git a/Cargo.lock b/Cargo.lock index 76f6776..827ff3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,8 +94,8 @@ dependencies = [ "accesskit_macos", "accesskit_unix", "accesskit_windows", - "raw-window-handle", - "winit", + "raw-window-handle 0.6.2", + "winit 0.30.5", ] [[package]] @@ -192,7 +192,7 @@ dependencies = [ "ndk 0.9.0", "ndk-context", "ndk-sys 0.6.0+11769913", - "num_enum", + "num_enum 0.7.3", "thiserror 1.0.69", ] @@ -288,6 +288,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "arrayvec" version = "0.7.6" @@ -300,13 +306,22 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + [[package]] name = "ash" version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading", + "libloading 0.8.6", ] [[package]] @@ -699,15 +714,30 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec 0.6.3", +] + [[package]] name = "bit-set" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ - "bit-vec", + "bit-vec 0.7.0", ] +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bit-vec" version = "0.7.0" @@ -816,6 +846,20 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +[[package]] +name = "calloop" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +dependencies = [ + "bitflags 1.3.2", + "log", + "nix 0.25.1", + "slotmap", + "thiserror 1.0.69", + "vec_map", +] + [[package]] name = "calloop" version = "0.13.0" @@ -836,10 +880,10 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop", + "calloop 0.13.0", "rustix 0.38.44", "wayland-backend", - "wayland-client", + "wayland-client 0.31.8", ] [[package]] @@ -918,7 +962,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.8.6", ] [[package]] @@ -941,7 +985,7 @@ dependencies = [ "anstyle", "backtrace", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] @@ -968,13 +1012,24 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" +[[package]] +name = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code 2.3.1", + "str-buf", + "winapi", +] + [[package]] name = "clipboard-win" version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ - "error-code", + "error-code 3.3.1", ] [[package]] @@ -987,6 +1042,26 @@ dependencies = [ "objc_id", ] +[[package]] +name = "clipboard_macos" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7f4aaa047ba3c3630b080bb9860894732ff23e2aee290a418909aa6d5df38f" +dependencies = [ + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8" +dependencies = [ + "smithay-clipboard 0.7.2", +] + [[package]] name = "clipboard_wayland" version = "0.2.2" @@ -994,7 +1069,17 @@ source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9f dependencies = [ "dnd", "mime", - "smithay-clipboard", + "smithay-clipboard 0.8.0", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c" +dependencies = [ + "thiserror 1.0.69", + "x11rb", ] [[package]] @@ -1006,6 +1091,31 @@ dependencies = [ "x11rb", ] +[[package]] +name = "cmake" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + [[package]] name = "cocoa" version = "0.25.0" @@ -1016,8 +1126,8 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.23.2", + "foreign-types 0.5.0", "libc", "objc", ] @@ -1073,6 +1183,12 @@ dependencies = [ "com_macros", ] +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + [[package]] name = "com_macros" version = "0.6.0" @@ -1120,6 +1236,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const_panic" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2459fc9262a1aa204eb4b5764ad4f189caec88aea9634389c0a25f8be7f6265e" + [[package]] name = "core-foundation" version = "0.9.4" @@ -1136,6 +1258,19 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + [[package]] name = "core-graphics" version = "0.23.2" @@ -1145,7 +1280,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.5.0", "libc", ] @@ -1160,6 +1295,18 @@ dependencies = [ "libc", ] +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", +] + [[package]] name = "core_maths" version = "0.1.1" @@ -1196,9 +1343,9 @@ source = "git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b#178eb0b14a0 dependencies = [ "cosmic-protocols", "libc", - "smithay-client-toolkit", - "wayland-client", - "wayland-protocols", + "smithay-client-toolkit 0.19.2", + "wayland-client 0.31.8", + "wayland-protocols 0.32.6", ] [[package]] @@ -1211,7 +1358,7 @@ dependencies = [ "cosmic-settings-daemon", "dirs 6.0.0", "futures-util", - "iced_futures", + "iced_futures 0.14.0-dev", "known-folders", "notify", "once_cell", @@ -1252,10 +1399,10 @@ source = "git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b#178eb0b14a0 dependencies = [ "bitflags 2.9.0", "wayland-backend", - "wayland-client", - "wayland-protocols", + "wayland-client 0.31.8", + "wayland-protocols 0.32.6", "wayland-protocols-wlr", - "wayland-scanner", + "wayland-scanner 0.31.6", "wayland-server", ] @@ -1299,13 +1446,26 @@ dependencies = [ "csscolorparser", "dirs 6.0.0", "lazy_static", - "palette", + "palette 0.7.6", "ron 0.9.0", "serde", "serde_json", "thiserror 2.0.12", ] +[[package]] +name = "cosmic-time" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269b94889f152389ed39fde8a69a6083ff4ca73993360d2850d5c281e3488c11" +dependencies = [ + "iced 0.9.0", + "iced_core 0.9.0", + "iced_futures 0.6.0", + "iced_native", + "iced_style", +] + [[package]] name = "cpal" version = "0.15.3" @@ -1374,6 +1534,34 @@ dependencies = [ "rustyline", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-queue" version = "0.3.12" @@ -1389,6 +1577,29 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "crossfont" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb5a3822b594afc99b503cc1859b94686d3c3efdd60507a28587dab80ee1071" +dependencies = [ + "cocoa 0.25.0", + "core-foundation", + "core-foundation-sys", + "core-graphics 0.23.2", + "core-text", + "dwrote", + "foreign-types 0.5.0", + "freetype-rs", + "libc", + "log", + "objc", + "once_cell", + "pkg-config", + "servo-fontconfig", + "winapi", +] + [[package]] name = "crunchy" version = "0.2.3" @@ -1427,12 +1638,29 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + [[package]] name = "cursor-icon" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + [[package]] name = "d3d12" version = "22.0.0" @@ -1440,18 +1668,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.9.0", - "libloading", + "libloading 0.8.6", "winapi", ] +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + [[package]] name = "darling" version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", ] [[package]] @@ -1464,17 +1716,28 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.11.1", "syn 2.0.100", ] +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core 0.13.4", + "quote", + "syn 1.0.109", +] + [[package]] name = "darling_macro" version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", "quote", "syn 2.0.100", ] @@ -1528,7 +1791,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro2", "quote", "syn 2.0.100", @@ -1628,7 +1891,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading", + "libloading 0.8.6", ] [[package]] @@ -1638,9 +1901,9 @@ source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9f dependencies = [ "bitflags 2.9.0", "mime", - "raw-window-handle", - "smithay-client-toolkit", - "smithay-clipboard", + "raw-window-handle 0.6.2", + "smithay-client-toolkit 0.19.2", + "smithay-clipboard 0.8.0", ] [[package]] @@ -1708,6 +1971,20 @@ dependencies = [ "linux-raw-sys 0.6.5", ] +[[package]] +name = "dwrote" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe1f192fcce01590bd8d839aca53ce0d11d803bf291b2a6c4ad925a8f0024be" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", +] + [[package]] name = "either" version = "1.15.0" @@ -1717,6 +1994,38 @@ dependencies = [ "serde", ] +[[package]] +name = "encase" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9" +dependencies = [ + "const_panic", + "encase_derive", + "glam 0.21.3", + "thiserror 1.0.69", +] + +[[package]] +name = "encase_derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22" +dependencies = [ + "encase_derive_impl", +] + +[[package]] +name = "encase_derive_impl" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "encoding_rs" version = "0.8.35" @@ -1775,6 +2084,16 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + [[package]] name = "error-code" version = "3.3.1" @@ -1849,6 +2168,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "expat-sys" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +dependencies = [ + "cmake", + "pkg-config", +] + [[package]] name = "extended" version = "0.1.0" @@ -1908,6 +2237,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + [[package]] name = "flate2" version = "1.1.1" @@ -1999,6 +2337,15 @@ dependencies = [ "ttf-parser 0.25.1", ] +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -2006,7 +2353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared", + "foreign-types-shared 0.3.1", ] [[package]] @@ -2020,6 +2367,12 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -2035,6 +2388,28 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "freetype-rs" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" +dependencies = [ + "bitflags 1.3.2", + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -2173,6 +2548,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -2256,6 +2640,12 @@ dependencies = [ "xml-rs", ] +[[package]] +name = "glam" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815" + [[package]] name = "glam" version = "0.25.0" @@ -2312,6 +2702,18 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "glow" version = "0.13.1" @@ -2333,6 +2735,44 @@ dependencies = [ "gl_generator", ] +[[package]] +name = "glyph_brush" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0060f4ed4ef64a5876d9836d7d6c9ed43a463f3ca431682bec1c326064c8c93e" +dependencies = [ + "glyph_brush_draw_cache", + "glyph_brush_layout", + "ordered-float", + "rustc-hash 2.1.1", + "twox-hash 2.1.0", +] + +[[package]] +name = "glyph_brush_draw_cache" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb6c910def52365fef3f439a6b50a4d5c11b28eec4cf6c191f6dfea18e88d7f" +dependencies = [ + "ab_glyph", + "crossbeam-channel", + "crossbeam-deque", + "linked-hash-map", + "rayon", + "rustc-hash 2.1.1", +] + +[[package]] +name = "glyph_brush_layout" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992" +dependencies = [ + "ab_glyph", + "approx", + "xi-unicode", +] + [[package]] name = "gobject-sys" version = "0.20.9" @@ -2344,6 +2784,16 @@ dependencies = [ "system-deps", ] +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types 0.2.0", +] + [[package]] name = "gpu-alloc" version = "0.6.0" @@ -2351,7 +2801,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ "bitflags 2.9.0", - "gpu-alloc-types", + "gpu-alloc-types 0.3.0", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -2363,6 +2822,19 @@ dependencies = [ "bitflags 2.9.0", ] +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror 1.0.69", + "winapi", + "windows 0.44.0", +] + [[package]] name = "gpu-allocator" version = "0.26.0" @@ -2376,6 +2848,17 @@ dependencies = [ "windows 0.52.0", ] +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.9.0", + "gpu-descriptor-types 0.1.2", + "hashbrown 0.14.5", +] + [[package]] name = "gpu-descriptor" version = "0.3.1" @@ -2383,8 +2866,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca" dependencies = [ "bitflags 2.9.0", - "gpu-descriptor-types", - "hashbrown", + "gpu-descriptor-types 0.2.0", + "hashbrown 0.15.2", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.9.0", ] [[package]] @@ -2605,6 +3097,22 @@ dependencies = [ "crunchy", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + [[package]] name = "hashbrown" version = "0.15.2" @@ -2622,7 +3130,22 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown", + "hashbrown 0.15.2", +] + +[[package]] +name = "hassle-rs" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror 1.0.69", + "widestring 0.5.1", + "winapi", ] [[package]] @@ -2634,9 +3157,9 @@ dependencies = [ "bitflags 2.9.0", "com", "libc", - "libloading", + "libloading 0.8.6", "thiserror 1.0.69", - "widestring", + "widestring 1.2.0", "winapi", ] @@ -2742,6 +3265,21 @@ dependencies = [ "cc", ] +[[package]] +name = "iced" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbddf356d01e9d41cd394a9d04d62bfd89650a30f12fda5839cabb8c4591c88" +dependencies = [ + "iced_core 0.9.0", + "iced_futures 0.6.0", + "iced_graphics 0.8.0", + "iced_native", + "iced_wgpu 0.10.0", + "iced_winit 0.9.1", + "thiserror 1.0.69", +] + [[package]] name = "iced" version = "0.14.0-dev" @@ -2749,15 +3287,15 @@ source = "git+https://github.com/pop-os/libcosmic#9b9d373e89aaf48e9d77e1621fe0de dependencies = [ "dnd", "iced_accessibility", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", "iced_renderer", "iced_widget", - "iced_winit", + "iced_winit 0.14.0-dev", "image", "mime", "thiserror 1.0.69", - "window_clipboard", + "window_clipboard 0.4.1", ] [[package]] @@ -2769,6 +3307,17 @@ dependencies = [ "accesskit_winit", ] +[[package]] +name = "iced_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e1942e28dedee756cc27e67e7a838cdc1e59fb6bf9627ec9f709ab3b135782" +dependencies = [ + "bitflags 1.3.2", + "instant", + "palette 0.6.1", +] + [[package]] name = "iced_core" version = "0.14.0-dev" @@ -2777,20 +3326,33 @@ dependencies = [ "bitflags 2.9.0", "bytes", "dnd", - "glam", + "glam 0.25.0", "iced_accessibility", "log", "mime", "num-traits", "once_cell", - "palette", - "raw-window-handle", + "palette 0.7.6", + "raw-window-handle 0.6.2", "rustc-hash 2.1.1", "serde", "smol_str", "thiserror 1.0.69", "web-time", - "window_clipboard", + "window_clipboard 0.4.1", +] + +[[package]] +name = "iced_futures" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "215d51fa4f70dbb63775d7141243c4d98d4d525d8949695601f8fbac7dcbc04e" +dependencies = [ + "futures", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", ] [[package]] @@ -2799,7 +3361,7 @@ version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#9b9d373e89aaf48e9d77e1621fe0de991d573764" dependencies = [ "futures", - "iced_core", + "iced_core 0.14.0-dev", "log", "rustc-hash 2.1.1", "tokio", @@ -2816,7 +3378,23 @@ dependencies = [ "etagere", "lru", "rustc-hash 2.1.1", - "wgpu", + "wgpu 22.1.0", +] + +[[package]] +name = "iced_graphics" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338a6aff7db906537074ad0fe8b720cfdb9512cdfea43c628c76bd1cf50fdcc0" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam 0.21.3", + "iced_native", + "iced_style", + "log", + "raw-window-handle 0.5.2", + "thiserror 1.0.69", ] [[package]] @@ -2828,27 +3406,42 @@ dependencies = [ "bytemuck", "cosmic-text", "half", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", "image", "kamadak-exif", "log", "lyon_path", "once_cell", - "raw-window-handle", + "raw-window-handle 0.6.2", "rustc-hash 2.1.1", "thiserror 1.0.69", "unicode-segmentation", ] +[[package]] +name = "iced_native" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d012eb06da490fe46a695b39721c20da9643f35cf2ecb9d30618fdeb96170616" +dependencies = [ + "iced_core 0.9.0", + "iced_futures 0.6.0", + "iced_style", + "num-traits", + "thiserror 1.0.69", + "twox-hash 1.6.3", + "unicode-segmentation", +] + [[package]] name = "iced_renderer" version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#9b9d373e89aaf48e9d77e1621fe0de991d573764" dependencies = [ - "iced_graphics", + "iced_graphics 0.14.0-dev", "iced_tiny_skia", - "iced_wgpu", + "iced_wgpu 0.14.0-dev", "log", "thiserror 1.0.69", ] @@ -2861,11 +3454,22 @@ dependencies = [ "bytes", "dnd", "iced_accessibility", - "iced_core", - "iced_futures", - "raw-window-handle", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", + "raw-window-handle 0.6.2", "thiserror 1.0.69", - "window_clipboard", + "window_clipboard 0.4.1", +] + +[[package]] +name = "iced_style" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e37333dc2991201140302cd0d4cea051bd37ca3671d5008ec85df86d232ff30" +dependencies = [ + "iced_core 0.9.0", + "once_cell", + "palette 0.6.1", ] [[package]] @@ -2875,13 +3479,13 @@ source = "git+https://github.com/pop-os/libcosmic#9b9d373e89aaf48e9d77e1621fe0de dependencies = [ "bytemuck", "cosmic-text", - "iced_graphics", + "iced_graphics 0.14.0-dev", "kurbo 0.10.4", "log", "resvg", "rustc-hash 2.1.1", "softbuffer", - "tiny-skia", + "tiny-skia 0.11.4", ] [[package]] @@ -2901,6 +3505,27 @@ dependencies = [ "url", ] +[[package]] +name = "iced_wgpu" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478803c56061f567ce5ddf223b20d11d3c118cc46bb0d0552370dc65cdc4cb9c" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "encase", + "futures", + "glam 0.21.3", + "glyph_brush", + "guillotiere", + "iced_graphics 0.8.0", + "iced_native", + "log", + "raw-window-handle 0.5.2", + "wgpu 0.15.1", + "wgpu_glyph", +] + [[package]] name = "iced_wgpu" version = "0.14.0-dev" @@ -2911,24 +3536,24 @@ dependencies = [ "bytemuck", "cosmic-client-toolkit", "futures", - "glam", + "glam 0.25.0", "guillotiere", "iced_glyphon", - "iced_graphics", + "iced_graphics 0.14.0-dev", "log", "lyon", "once_cell", - "raw-window-handle", + "raw-window-handle 0.6.2", "resvg", "rustc-hash 2.1.1", "rustix 0.38.44", "thiserror 1.0.69", "tiny-xlib", "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-sys", - "wgpu", + "wayland-client 0.31.8", + "wayland-protocols 0.32.6", + "wayland-sys 0.31.6", + "wgpu 22.1.0", "x11rb", ] @@ -2947,7 +3572,24 @@ dependencies = [ "rustc-hash 2.1.1", "thiserror 1.0.69", "unicode-segmentation", - "window_clipboard", + "window_clipboard 0.4.1", +] + +[[package]] +name = "iced_winit" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a59ea3a85149a6a1f9e92b6c740ce90f04e5c7d848cfd05742336863fceb955" +dependencies = [ + "iced_futures 0.6.0", + "iced_graphics 0.8.0", + "iced_native", + "log", + "thiserror 1.0.69", + "web-sys", + "winapi", + "window_clipboard 0.2.4", + "winit 0.27.5", ] [[package]] @@ -2957,8 +3599,8 @@ source = "git+https://github.com/pop-os/libcosmic#9b9d373e89aaf48e9d77e1621fe0de dependencies = [ "dnd", "iced_accessibility", - "iced_futures", - "iced_graphics", + "iced_futures 0.14.0-dev", + "iced_graphics 0.14.0-dev", "iced_runtime", "log", "rustc-hash 2.1.1", @@ -2966,11 +3608,11 @@ dependencies = [ "thiserror 1.0.69", "tracing", "wasm-bindgen-futures", - "wayland-client", + "wayland-client 0.31.8", "web-sys", "winapi", - "window_clipboard", - "winit", + "window_clipboard 0.4.1", + "winit 0.30.5", ] [[package]] @@ -3144,7 +3786,17 @@ version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" dependencies = [ - "arrayvec", + "arrayvec 0.7.6", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", ] [[package]] @@ -3154,7 +3806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -3193,6 +3845,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -3290,6 +3945,17 @@ dependencies = [ "mutate_once", ] +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + [[package]] name = "khronos-egl" version = "6.0.0" @@ -3297,7 +3963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading", + "libloading 0.8.6", "pkg-config", ] @@ -3342,7 +4008,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ - "arrayvec", + "arrayvec 0.7.6", "smallvec", ] @@ -3352,7 +4018,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" dependencies = [ - "arrayvec", + "arrayvec 0.7.6", "smallvec", ] @@ -3419,19 +4085,19 @@ dependencies = [ "css-color", "derive_setters", "futures", - "iced", + "iced 0.14.0-dev", "iced_accessibility", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", "iced_renderer", "iced_runtime", "iced_tiny_skia", - "iced_wgpu", + "iced_wgpu 0.14.0-dev", "iced_widget", - "iced_winit", + "iced_winit 0.14.0-dev", "image", "lazy_static", - "palette", + "palette 0.7.6", "rfd", "serde", "slotmap", @@ -3444,6 +4110,16 @@ dependencies = [ "zbus 4.4.0", ] +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + [[package]] name = "libloading" version = "0.8.6" @@ -3482,6 +4158,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -3546,6 +4228,7 @@ version = "0.1.0" dependencies = [ "clap", "colors-transform", + "cosmic-time", "crisp", "dirs 5.0.1", "gstreamer", @@ -3594,7 +4277,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8af69edc087272df438b3ee436c4bb6d7c04aa8af665cfd398feae627dbd8570" dependencies = [ - "arrayvec", + "arrayvec 0.7.6", "euclid", "num-traits", ] @@ -3663,6 +4346,15 @@ 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.8.0" @@ -3681,6 +4373,15 @@ 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" @@ -3699,6 +4400,20 @@ dependencies = [ "autocfg", ] +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types 0.3.2", + "log", + "objc", +] + [[package]] name = "metal" version = "0.29.0" @@ -3708,7 +4423,7 @@ dependencies = [ "bitflags 2.9.0", "block", "core-graphics-types", - "foreign-types", + "foreign-types 0.5.0", "log", "objc", "paste", @@ -3750,7 +4465,7 @@ name = "mime" version = "0.1.0" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ - "smithay-clipboard", + "smithay-clipboard 0.8.0", ] [[package]] @@ -3769,6 +4484,18 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + [[package]] name = "mio" version = "1.0.3" @@ -3793,27 +4520,61 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" +[[package]] +name = "naga" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" +dependencies = [ + "bit-set 0.5.3", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash 1.1.0", + "spirv 0.2.0+1.5.4", + "termcolor", + "thiserror 1.0.69", + "unicode-xid", +] + [[package]] name = "naga" version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ - "arrayvec", - "bit-set", + "arrayvec 0.7.6", + "bit-set 0.6.0", "bitflags 2.9.0", "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 2.9.0", "log", "rustc-hash 1.1.0", - "spirv", + "spirv 0.3.0+sdk-1.3.268.0", "termcolor", "thiserror 1.0.69", "unicode-xid", ] +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle 0.5.2", + "thiserror 1.0.69", +] + [[package]] name = "ndk" version = "0.8.0" @@ -3824,7 +4585,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum", + "num_enum 0.7.3", "thiserror 1.0.69", ] @@ -3838,8 +4599,8 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.6.0+11769913", - "num_enum", - "raw-window-handle", + "num_enum 0.7.3", + "raw-window-handle 0.6.2", "thiserror 1.0.69", ] @@ -3849,6 +4610,44 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" +[[package]] +name = "ndk-glue" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" +dependencies = [ + "libc", + "log", + "ndk 0.7.0", + "ndk-context", + "ndk-macro", + "ndk-sys 0.4.1+23.1.7779620", + "once_cell", + "parking_lot 0.12.3", +] + +[[package]] +name = "ndk-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling 0.13.4", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + [[package]] name = "ndk-sys" version = "0.5.0+25.2.9519653" @@ -3876,6 +4675,31 @@ dependencies = [ "smallvec", ] +[[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.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + [[package]] name = "nix" version = "0.26.4" @@ -3936,7 +4760,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 1.0.3", "notify-types", "walkdir", "windows-sys 0.59.0", @@ -4042,13 +4866,34 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + [[package]] name = "num_enum" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.7.3", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -4079,6 +4924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -4295,6 +5141,15 @@ dependencies = [ "objc2-foundation", ] +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + [[package]] name = "objc_id" version = "0.1.1" @@ -4375,6 +5230,15 @@ dependencies = [ "libredox", ] +[[package]] +name = "ordered-float" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-stream" version = "0.2.0" @@ -4430,6 +5294,18 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564" +[[package]] +name = "palette" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" +dependencies = [ + "approx", + "num-traits", + "palette_derive 0.6.1", + "phf", +] + [[package]] name = "palette" version = "0.7.6" @@ -4438,11 +5314,23 @@ checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", "fast-srgb8", - "palette_derive", + "palette_derive 0.7.6", "phf", "serde", ] +[[package]] +name = "palette_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" +dependencies = [ + "find-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "palette_derive" version = "0.7.6" @@ -4852,12 +5740,57 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +[[package]] +name = "raw-window-handle" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" +dependencies = [ + "libc", + "raw-window-handle 0.4.3", +] + +[[package]] +name = "raw-window-handle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" +dependencies = [ + "cty", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + [[package]] name = "raw-window-handle" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "read-fonts" version = "0.25.3" @@ -4961,6 +5894,12 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "renderdoc-sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" + [[package]] name = "renderdoc-sys" version = "1.1.0" @@ -4979,7 +5918,7 @@ dependencies = [ "pico-args", "rgb", "svgtypes", - "tiny-skia", + "tiny-skia 0.11.4", "usvg", ] @@ -4998,7 +5937,7 @@ dependencies = [ "objc-foundation", "objc_id", "pollster", - "raw-window-handle", + "raw-window-handle 0.6.2", "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", @@ -5169,7 +6108,7 @@ checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ "bitflags 2.9.0", "cfg-if", - "clipboard-win", + "clipboard-win 5.4.0", "fd-lock", "home", "libc", @@ -5189,6 +6128,15 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +[[package]] +name = "safe_arch" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" +dependencies = [ + "bytemuck", +] + [[package]] name = "same-file" version = "1.0.6" @@ -5210,6 +6158,18 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sctk-adwaita" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" +dependencies = [ + "crossfont", + "log", + "smithay-client-toolkit 0.16.1", + "tiny-skia 0.7.0", +] + [[package]] name = "sctk-adwaita" version = "0.10.1" @@ -5219,8 +6179,8 @@ dependencies = [ "ab_glyph", "log", "memmap2 0.9.5", - "smithay-client-toolkit", - "tiny-skia", + "smithay-client-toolkit 0.19.2", + "tiny-skia 0.11.4", ] [[package]] @@ -5265,7 +6225,7 @@ version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ - "indexmap", + "indexmap 2.9.0", "itoa", "memchr", "ryu", @@ -5304,6 +6264,27 @@ dependencies = [ "serde", ] +[[package]] +name = "servo-fontconfig" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +dependencies = [ + "libc", + "servo-fontconfig-sys", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" +dependencies = [ + "expat-sys", + "freetype-sys", + "pkg-config", +] + [[package]] name = "sha1" version = "0.10.6" @@ -5418,6 +6399,25 @@ dependencies = [ "serde", ] +[[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", + "calloop 0.10.6", + "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" @@ -5426,7 +6426,7 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.9.0", "bytemuck", - "calloop", + "calloop 0.13.0", "calloop-wayland-source", "cursor-icon", "libc", @@ -5436,24 +6436,35 @@ dependencies = [ "rustix 0.38.44", "thiserror 1.0.69", "wayland-backend", - "wayland-client", + "wayland-client 0.31.8", "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", + "wayland-cursor 0.31.8", + "wayland-protocols 0.32.6", "wayland-protocols-wlr", - "wayland-scanner", + "wayland-scanner 0.31.6", "xkbcommon", "xkeysym", ] +[[package]] +name = "smithay-clipboard" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" +dependencies = [ + "libc", + "smithay-client-toolkit 0.19.2", + "wayland-backend", +] + [[package]] name = "smithay-clipboard" version = "0.8.0" source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a" dependencies = [ "libc", - "raw-window-handle", - "smithay-client-toolkit", + "raw-window-handle 0.6.2", + "smithay-client-toolkit 0.19.2", "wayland-backend", ] @@ -5494,23 +6505,23 @@ dependencies = [ "as-raw-xcb-connection", "bytemuck", "cfg_aliases 0.2.1", - "cocoa", - "core-graphics", + "cocoa 0.25.0", + "core-graphics 0.23.2", "drm", "fastrand 2.3.0", - "foreign-types", + "foreign-types 0.5.0", "js-sys", "log", "memmap2 0.9.5", "objc", - "raw-window-handle", + "raw-window-handle 0.6.2", "redox_syscall 0.4.1", "rustix 0.38.44", "tiny-xlib", "wasm-bindgen", "wayland-backend", - "wayland-client", - "wayland-sys", + "wayland-client 0.31.8", + "wayland-sys 0.31.6", "web-sys", "windows-sys 0.52.0", "x11rb", @@ -5525,6 +6536,16 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" @@ -5573,9 +6594,9 @@ dependencies = [ "futures-intrusive", "futures-io", "futures-util", - "hashbrown", + "hashbrown 0.15.2", "hashlink", - "indexmap", + "indexmap 2.9.0", "log", "memchr", "once_cell", @@ -5745,6 +6766,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + [[package]] name = "strict-num" version = "0.1.1" @@ -5765,6 +6792,12 @@ dependencies = [ "unicode-properties", ] +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "strsim" version = "0.11.1" @@ -5935,7 +6968,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" dependencies = [ - "arrayvec", + "arrayvec 0.7.6", "bitflags 1.3.2", "bytemuck", "lazy_static", @@ -6040,7 +7073,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml", + "toml 0.8.20", "version-compare", ] @@ -6049,7 +7082,7 @@ name = "taffy" version = "0.3.11" source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" dependencies = [ - "arrayvec", + "arrayvec 0.7.6", "grid", "num-traits", "slotmap", @@ -6186,6 +7219,21 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-skia" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "bytemuck", + "cfg-if", + "png", + "safe_arch", + "tiny-skia-path 0.7.0", +] + [[package]] name = "tiny-skia" version = "0.11.4" @@ -6193,12 +7241,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.7.6", "bytemuck", "cfg-if", "log", "png", - "tiny-skia-path", + "tiny-skia-path 0.11.4", +] + +[[package]] +name = "tiny-skia-path" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" +dependencies = [ + "arrayref", + "bytemuck", ] [[package]] @@ -6220,7 +7278,7 @@ checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading", + "libloading 0.8.6", "pkg-config", "tracing", ] @@ -6259,7 +7317,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio", + "mio 1.0.3", "pin-project-lite", "signal-hook-registry", "socket2 0.5.9", @@ -6290,6 +7348,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "toml" version = "0.8.20" @@ -6317,7 +7384,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.9.0", "toml_datetime", "winnow 0.5.40", ] @@ -6328,7 +7395,7 @@ version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ - "indexmap", + "indexmap 2.9.0", "serde", "serde_spanned", "toml_datetime", @@ -6414,6 +7481,25 @@ dependencies = [ "core_maths", ] +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "twox-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908" +dependencies = [ + "rand", +] + [[package]] name = "typenum" version = "1.18.0" @@ -6550,7 +7636,7 @@ dependencies = [ "siphasher", "strict-num", "svgtypes", - "tiny-skia-path", + "tiny-skia-path 0.11.4", "unicode-bidi", "unicode-script", "unicode-vo", @@ -6593,6 +7679,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version-compare" version = "0.2.0" @@ -6738,7 +7830,23 @@ dependencies = [ "rustix 0.38.44", "scoped-tls", "smallvec", - "wayland-sys", + "wayland-sys 0.31.6", +] + +[[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", ] [[package]] @@ -6750,7 +7858,19 @@ dependencies = [ "bitflags 2.9.0", "rustix 0.38.44", "wayland-backend", - "wayland-scanner", + "wayland-scanner 0.31.6", +] + +[[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", ] [[package]] @@ -6764,6 +7884,17 @@ 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.8" @@ -6771,10 +7902,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a93029cbb6650748881a00e4922b076092a6a08c11e7fbdb923f064b23968c5d" dependencies = [ "rustix 0.38.44", - "wayland-client", + "wayland-client 0.31.8", "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.6" @@ -6783,8 +7926,8 @@ checksum = "0781cf46869b37e36928f7b432273c0995aa8aed9552c556fb18754420541efc" dependencies = [ "bitflags 2.9.0", "wayland-backend", - "wayland-client", - "wayland-scanner", + "wayland-client 0.31.8", + "wayland-scanner 0.31.6", "wayland-server", ] @@ -6796,9 +7939,9 @@ checksum = "7ccaacc76703fefd6763022ac565b590fcade92202492381c95b2edfdf7d46b3" dependencies = [ "bitflags 2.9.0", "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", + "wayland-client 0.31.8", + "wayland-protocols 0.32.6", + "wayland-scanner 0.31.6", ] [[package]] @@ -6809,12 +7952,23 @@ checksum = "248a02e6f595aad796561fa82d25601bd2c8c3b145b1c7453fc8f94c1a58f8b2" dependencies = [ "bitflags 2.9.0", "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", + "wayland-client 0.31.8", + "wayland-protocols 0.32.6", + "wayland-scanner 0.31.6", "wayland-server", ] +[[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", +] + [[package]] name = "wayland-scanner" version = "0.31.6" @@ -6836,7 +7990,18 @@ dependencies = [ "downcast-rs", "rustix 0.38.44", "wayland-backend", - "wayland-scanner", + "wayland-scanner 0.31.6", +] + +[[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]] @@ -6879,27 +8044,74 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "22.1.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" +checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" dependencies = [ - "arrayvec", - "cfg_aliases 0.1.1", - "document-features", + "arrayvec 0.7.6", + "cfg-if", "js-sys", "log", - "naga", + "naga 0.11.1", "parking_lot 0.12.3", "profiling", - "raw-window-handle", + "raw-window-handle 0.5.2", "smallvec", "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.15.1", + "wgpu-hal 0.15.4", + "wgpu-types 0.15.2", +] + +[[package]] +name = "wgpu" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" +dependencies = [ + "arrayvec 0.7.6", + "cfg_aliases 0.1.1", + "document-features", + "js-sys", + "log", + "naga 22.1.0", + "parking_lot 0.12.3", + "profiling", + "raw-window-handle 0.6.2", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 22.1.0", + "wgpu-hal 22.0.0", + "wgpu-types 22.0.0", +] + +[[package]] +name = "wgpu-core" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" +dependencies = [ + "arrayvec 0.7.6", + "bit-vec 0.6.3", + "bitflags 1.3.2", + "codespan-reporting", + "fxhash", + "log", + "naga 0.11.1", + "parking_lot 0.12.3", + "profiling", + "raw-window-handle 0.5.2", + "smallvec", + "thiserror 1.0.69", + "web-sys", + "wgpu-hal 0.15.4", + "wgpu-types 0.15.2", ] [[package]] @@ -6908,23 +8120,65 @@ version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ - "arrayvec", - "bit-vec", + "arrayvec 0.7.6", + "bit-vec 0.7.0", "bitflags 2.9.0", "cfg_aliases 0.1.1", "document-features", - "indexmap", + "indexmap 2.9.0", "log", - "naga", + "naga 22.1.0", "once_cell", "parking_lot 0.12.3", "profiling", - "raw-window-handle", + "raw-window-handle 0.6.2", "rustc-hash 1.1.0", "smallvec", "thiserror 1.0.69", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 22.0.0", + "wgpu-types 22.0.0", +] + +[[package]] +name = "wgpu-hal" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" +dependencies = [ + "android_system_properties", + "arrayvec 0.7.6", + "ash 0.37.3+1.3.251", + "bit-set 0.5.3", + "bitflags 1.3.2", + "block", + "core-graphics-types", + "d3d12 0.6.0", + "foreign-types 0.3.2", + "fxhash", + "glow 0.12.3", + "gpu-alloc 0.5.4", + "gpu-allocator 0.22.0", + "gpu-descriptor 0.2.4", + "hassle-rs 0.9.0", + "js-sys", + "khronos-egl 4.1.0", + "libc", + "libloading 0.7.4", + "log", + "metal 0.24.0", + "naga 0.11.1", + "objc", + "parking_lot 0.12.3", + "profiling", + "range-alloc", + "raw-window-handle 0.5.2", + "renderdoc-sys 0.7.1", + "smallvec", + "thiserror 1.0.69", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.15.2", + "winapi", ] [[package]] @@ -6934,44 +8188,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", - "arrayvec", - "ash", - "bit-set", + "arrayvec 0.7.6", + "ash 0.38.0+1.3.281", + "bit-set 0.6.0", "bitflags 2.9.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", - "glow", + "d3d12 22.0.0", + "glow 0.13.1", "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", + "gpu-alloc 0.6.0", + "gpu-allocator 0.26.0", + "gpu-descriptor 0.3.1", + "hassle-rs 0.11.0", "js-sys", - "khronos-egl", + "khronos-egl 6.0.0", "libc", - "libloading", + "libloading 0.8.6", "log", - "metal", - "naga", + "metal 0.29.0", + "naga 22.1.0", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.3", "profiling", "range-alloc", - "raw-window-handle", - "renderdoc-sys", + "raw-window-handle 0.6.2", + "renderdoc-sys 1.1.0", "rustc-hash 1.1.0", "smallvec", "thiserror 1.0.69", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 22.0.0", "winapi", ] +[[package]] +name = "wgpu-types" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" +dependencies = [ + "bitflags 1.3.2", + "js-sys", + "web-sys", +] + [[package]] name = "wgpu-types" version = "22.0.0" @@ -6983,6 +8248,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu_glyph" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25440d5f32ec39de49c57c15c2d3f9133a7939b069b5ad07e5afd8b78fb8adc" +dependencies = [ + "bytemuck", + "glyph_brush", + "log", + "wgpu 0.15.1", +] + [[package]] name = "whoami" version = "1.6.0" @@ -6993,6 +8270,12 @@ dependencies = [ "wasite", ] +[[package]] +name = "widestring" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + [[package]] name = "widestring" version = "1.2.0" @@ -7030,21 +8313,44 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "window_clipboard" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d" +dependencies = [ + "clipboard-win 4.5.0", + "clipboard_macos 0.1.1", + "clipboard_wayland 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "clipboard_x11 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "raw-window-handle 0.3.4", + "thiserror 1.0.69", +] + [[package]] name = "window_clipboard" version = "0.4.1" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f" dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", + "clipboard-win 5.4.0", + "clipboard_macos 0.1.0", + "clipboard_wayland 0.2.2 (git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2)", + "clipboard_x11 0.4.2 (git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2)", "dnd", "mime", - "raw-window-handle", + "raw-window-handle 0.6.2", "thiserror 1.0.69", ] +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows" version = "0.52.0" @@ -7176,6 +8482,19 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -7276,6 +8595,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -7294,6 +8619,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -7318,6 +8649,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -7336,6 +8673,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -7372,6 +8715,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -7390,6 +8739,39 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winit" +version = "0.27.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +dependencies = [ + "bitflags 1.3.2", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "dispatch", + "instant", + "libc", + "log", + "mio 0.8.11", + "ndk 0.7.0", + "ndk-glue", + "objc", + "once_cell", + "parking_lot 0.12.3", + "percent-encoding", + "raw-window-handle 0.4.3", + "raw-window-handle 0.5.2", + "sctk-adwaita 0.4.3", + "smithay-client-toolkit 0.16.1", + "wasm-bindgen", + "wayland-client 0.29.5", + "wayland-protocols 0.29.5", + "web-sys", + "windows-sys 0.36.1", + "x11-dl", +] + [[package]] name = "winit" version = "0.30.5" @@ -7401,11 +8783,11 @@ dependencies = [ "bitflags 2.9.0", "block2", "bytemuck", - "calloop", + "calloop 0.13.0", "cfg_aliases 0.2.1", "concurrent-queue", "core-foundation", - "core-graphics", + "core-graphics 0.23.2", "cursor-icon", "dpi", "js-sys", @@ -7419,19 +8801,19 @@ dependencies = [ "orbclient", "percent-encoding", "pin-project", - "raw-window-handle", + "raw-window-handle 0.6.2", "redox_syscall 0.4.1", "rustix 0.38.44", - "sctk-adwaita", - "smithay-client-toolkit", + "sctk-adwaita 0.10.1", + "smithay-client-toolkit 0.19.2", "smol_str", "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", - "wayland-client", - "wayland-protocols", + "wayland-client 0.31.8", + "wayland-protocols 0.32.6", "wayland-protocols-plasma", "web-sys", "web-time", @@ -7459,6 +8841,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + [[package]] name = "wit-bindgen-rt" version = "0.39.0" @@ -7500,7 +8891,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading", + "libloading 0.8.6", "once_cell", "rustix 0.38.44", "x11rb-protocol", @@ -7534,6 +8925,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + [[package]] name = "xkbcommon" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index 8c223ca..3736d89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,10 +26,9 @@ crisp = { git = "https://git.tfcconnection.org/chris/crisp", version = "0.1.3" } rodio = { version = "0.20.1", features = ["symphonia-all", "tracing"] } gstreamer = "0.23.3" gstreamer-app = "0.23.3" -# cosmic-time = "0.2.0" +cosmic-time = "0.2.0" url = "2" colors-transform = "0.2.11" -# mupdf = "0.5.0" # rfd = { version = "0.12.1", features = ["xdg-portal"], default-features = false } [dependencies.iced_video_player] diff --git a/src/core/images.rs b/src/core/images.rs index beba760..4eb16dd 100644 --- a/src/core/images.rs +++ b/src/core/images.rs @@ -3,7 +3,7 @@ use crate::{Background, Slide, SlideBuilder, TextAlignment}; use super::{ content::Content, kinds::ServiceItemKind, - model::{LibraryKind, Model}, + model::{get_db, LibraryKind, Model}, service_items::ServiceTrait, }; use crisp::types::{Keyword, Symbol, Value}; @@ -45,7 +45,13 @@ impl Content for Image { } fn background(&self) -> Option { - Background::try_from(self.path.clone()).ok() + if let Ok(background) = + Background::try_from(self.path.clone()) + { + Some(background) + } else { + None + } } fn subtext(&self) -> String { diff --git a/src/core/lisp.rs b/src/core/lisp.rs index 2c1a666..ad795d2 100644 --- a/src/core/lisp.rs +++ b/src/core/lisp.rs @@ -133,6 +133,12 @@ pub(crate) fn get_lists(exp: &Value) -> Vec { #[cfg(test)] mod test { + use std::fs::read_to_string; + + use lexpr::{parse::Options, Parser}; + use pretty_assertions::assert_eq; + + use super::*; // #[test] // fn test_list() { diff --git a/src/core/model.rs b/src/core/model.rs index a0afcd0..14ed67c 100644 --- a/src/core/model.rs +++ b/src/core/model.rs @@ -4,6 +4,8 @@ use cosmic::iced::Executor; use miette::{miette, Result}; use sqlx::{Connection, SqliteConnection}; +use super::kinds::ServiceItemKind; + #[derive(Debug, Clone)] pub struct Model { pub items: Vec, diff --git a/src/core/presentations.rs b/src/core/presentations.rs index 106f8c4..164a9dd 100644 --- a/src/core/presentations.rs +++ b/src/core/presentations.rs @@ -13,7 +13,7 @@ use crate::{Background, Slide, SlideBuilder, TextAlignment}; use super::{ content::Content, kinds::ServiceItemKind, - model::{LibraryKind, Model}, + model::{get_db, LibraryKind, Model}, service_items::ServiceTrait, }; @@ -57,7 +57,13 @@ impl Content for Presentation { } fn background(&self) -> Option { - Background::try_from(self.path.clone()).ok() + if let Ok(background) = + Background::try_from(self.path.clone()) + { + Some(background) + } else { + None + } } fn subtext(&self) -> String { diff --git a/src/core/service_items.rs b/src/core/service_items.rs index c9483cd..f84d231 100644 --- a/src/core/service_items.rs +++ b/src/core/service_items.rs @@ -3,7 +3,7 @@ use std::ops::Deref; use cosmic::iced::clipboard::mime::{AllowedMimeTypes, AsMimeTypes}; use crisp::types::{Keyword, Symbol, Value}; -use miette::Result; +use miette::{miette, Result}; use tracing::{debug, error}; use crate::Slide; @@ -153,48 +153,52 @@ impl From<&Value> for ServiceItem { database_id: 0, kind: ServiceItemKind::Content(slide), } - } else if let Some(background) = - list.get(background_pos) - { - match background { - Value::List(item) => match &item[0] { - Value::Symbol(Symbol(s)) - if s == "image" => - { - Self::from(&Image::from( - background, - )) - } - Value::Symbol(Symbol(s)) - if s == "video" => - { - Self::from(&Video::from( - background, - )) - } - Value::Symbol(Symbol(s)) - if s == "presentation" => - { - Self::from(&Presentation::from( - background, - )) - } - _ => todo!(), - }, - _ => { - error!( - "There is no background here: {:?}", - background - ); - ServiceItem::default() - } - } } else { - error!( - "There is no background here: {:?}", - background_pos - ); - ServiceItem::default() + if let Some(background) = + list.get(background_pos) + { + match background { + Value::List(item) => match &item[0] { + Value::Symbol(Symbol(s)) + if s == "image" => + { + Self::from(&Image::from( + background, + )) + } + Value::Symbol(Symbol(s)) + if s == "video" => + { + Self::from(&Video::from( + background, + )) + } + Value::Symbol(Symbol(s)) + if s == "presentation" => + { + Self::from( + &Presentation::from( + background, + ), + ) + } + _ => todo!(), + }, + _ => { + error!( + "There is no background here: {:?}", + background + ); + ServiceItem::default() + } + } + } else { + error!( + "There is no background here: {:?}", + background_pos + ); + ServiceItem::default() + } } } Value::Symbol(Symbol(s)) if s == "song" => { @@ -338,7 +342,7 @@ mod test { use crate::core::presentations::PresKind; use super::*; - use pretty_assertions::assert_eq; + use pretty_assertions::{assert_eq, assert_ne}; fn test_song() -> Song { Song { diff --git a/src/core/slide.rs b/src/core/slide.rs index 277034d..662710a 100644 --- a/src/core/slide.rs +++ b/src/core/slide.rs @@ -1,5 +1,6 @@ // use cosmic::dialog::ashpd::url::Url; use crisp::types::{Keyword, Symbol, Value}; +use gstreamer::query::Uri; use iced_video_player::Video; use miette::{miette, Result}; use serde::{Deserialize, Serialize}; @@ -12,15 +13,7 @@ use tracing::error; use super::songs::Song; #[derive( - Clone, - Copy, - Debug, - Default, - PartialEq, - Eq, - Serialize, - Deserialize, - Hash, + Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, )] pub enum TextAlignment { TopLeft, diff --git a/src/core/songs.rs b/src/core/songs.rs index 20dbebb..52f4b13 100644 --- a/src/core/songs.rs +++ b/src/core/songs.rs @@ -8,14 +8,14 @@ use sqlx::{ pool::PoolConnection, query, sqlite::SqliteRow, FromRow, Row, Sqlite, SqliteConnection, SqlitePool, }; -use tracing::error; +use tracing::{debug, error}; use crate::{core::slide, Slide, SlideBuilder}; use super::{ content::Content, kinds::ServiceItemKind, - model::{LibraryKind, Model}, + model::{get_db, LibraryKind, Model}, service_items::ServiceTrait, slide::{Background, TextAlignment}, }; @@ -132,7 +132,10 @@ impl FromRow<'_, SqliteRow> for Song { }), background: { let string: String = row.try_get(7)?; - Background::try_from(string).ok() + match Background::try_from(string) { + Ok(background) => Some(background), + Err(_) => None, + } }, text_alignment: Some({ let horizontal_alignment: String = row.try_get(3)?; @@ -420,7 +423,7 @@ pub async fn update_song_in_db( if let Some(vo) = item.verse_order { vo.into_iter() .map(|mut s| { - s.push(' '); + s.push_str(" "); s }) .collect::() @@ -535,6 +538,7 @@ impl Song { lyric_list.push(lyric.to_string()); } else { // error!("NOT WORKING!"); + () }; } // for lyric in lyric_list.iter() { @@ -552,7 +556,7 @@ mod test { use std::fs::read_to_string; use super::*; - use pretty_assertions::assert_eq; + use pretty_assertions::{assert_eq, assert_ne}; #[test] pub fn test_song_lyrics() { @@ -720,7 +724,7 @@ You saved my soul" let lisp = read_to_string("./test_song.lisp").expect("oops"); let lisp_value = crisp::reader::read(&lisp); match lisp_value { - Value::List(v) => v.first().unwrap().clone(), + Value::List(v) => v.get(0).unwrap().clone(), _ => Value::Nil, } } diff --git a/src/core/videos.rs b/src/core/videos.rs index c0c1dfb..c3fe4e0 100644 --- a/src/core/videos.rs +++ b/src/core/videos.rs @@ -3,7 +3,7 @@ use crate::{Background, SlideBuilder, TextAlignment}; use super::{ content::Content, kinds::ServiceItemKind, - model::{LibraryKind, Model}, + model::{get_db, LibraryKind, Model}, service_items::ServiceTrait, slide::Slide, }; @@ -50,7 +50,13 @@ impl Content for Video { } fn background(&self) -> Option { - Background::try_from(self.path.clone()).ok() + if let Ok(background) = + Background::try_from(self.path.clone()) + { + Some(background) + } else { + None + } } fn subtext(&self) -> String { diff --git a/src/lisp.rs b/src/lisp.rs index 2f803e4..e5baa50 100644 --- a/src/lisp.rs +++ b/src/lisp.rs @@ -37,14 +37,17 @@ pub fn parse_lisp(value: Value) -> Vec { #[cfg(test)] mod test { - use std::{fs::read_to_string, path::PathBuf}; + use std::{ + fs::read_to_string, + path::{Path, PathBuf}, + }; use crate::{ core::{ images::Image, kinds::ServiceItemKind, service_items::ServiceTrait, songs::Song, videos::Video, }, - Background, TextAlignment, + Background, Slide, SlideBuilder, TextAlignment, }; use super::*; diff --git a/src/main.rs b/src/main.rs index 91ae9ee..888e690 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ use clap::{command, Parser}; +use core::model::{get_db, LibraryKind}; use core::service_items::{ServiceItem, ServiceItemModel}; use core::slide::*; use core::songs::Song; @@ -13,12 +14,13 @@ use cosmic::iced_widget::{column, row}; use cosmic::widget::dnd_destination::DragId; use cosmic::widget::nav_bar::nav_bar_style; use cosmic::widget::segmented_button::Entity; -use cosmic::widget::text; use cosmic::widget::tooltip::Position as TPosition; use cosmic::widget::{ - button, horizontal_space, nav_bar, search_input, tooltip, Space, + button, horizontal_space, nav_bar, search_input, text_input, + tooltip, Space, }; use cosmic::widget::{icon, slider}; +use cosmic::widget::{text, toggler}; use cosmic::{executor, Application, ApplicationExt, Element}; use cosmic::{prelude::*, theme}; use cosmic::{widget::Container, Theme}; @@ -330,7 +332,7 @@ impl cosmic::Application for App { ) .class(cosmic::theme::style::Button::HeaderBar) .on_press(Message::EditorToggle( - self.editor_mode.is_none(), + !self.editor_mode.is_some(), )), "Enter Edit Mode", TPosition::Bottom, @@ -719,7 +721,7 @@ impl cosmic::Application for App { let library = if self.library_open { Container::new(if let Some(library) = &self.library { - library.view().map(Message::Library) + library.view().map(|m| Message::Library(m)) } else { Space::new(0, 0).into() }) @@ -730,7 +732,7 @@ impl cosmic::Application for App { }; let song_editor = - self.song_editor.view().map(Message::SongEditor); + self.song_editor.view().map(|m| Message::SongEditor(m)); let row = row![ Container::new( @@ -744,7 +746,8 @@ impl cosmic::Application for App { .class(theme::style::Button::Transparent) ) .center_y(Length::Fill) - .align_right(Length::FillPortion(1)), + .align_right(Length::Fill) + .width(Length::FillPortion(1)), Container::new(slide_preview) .center_y(Length::Fill) .width(Length::FillPortion(3)), @@ -759,7 +762,8 @@ impl cosmic::Application for App { .class(theme::style::Button::Transparent) ) .center_y(Length::Fill) - .align_left(Length::FillPortion(1)), + .align_left(Length::Fill) + .width(Length::FillPortion(1)), library ] .width(Length::Fill) @@ -878,6 +882,8 @@ where #[cfg(test)] mod test { + use super::*; + use pretty_assertions::assert_eq; fn test_slide() -> String { let slide = r#"(slide (image :source "./somehting.jpg" :fill cover diff --git a/src/ui/library.rs b/src/ui/library.rs index 1c09e13..c89ed15 100644 --- a/src/ui/library.rs +++ b/src/ui/library.rs @@ -1,22 +1,21 @@ -use std::rc::Rc; - use cosmic::{ iced::{ alignment::Vertical, clipboard::dnd::DndAction, futures::FutureExt, Background, Border, Color, Length, }, - iced_core::widget::tree::State, iced_widget::{column, row as rowm, text as textm}, theme, widget::{ button, container, horizontal_space, icon, mouse_area, responsive, row, scrollable, text, text_input, Container, - DndSource, Space, Widget, + DndSource, Icon, Space, Widget, }, Element, Task, }; -use miette::{IntoDiagnostic, Result}; -use sqlx::{pool::PoolConnection, Sqlite, SqlitePool}; +use miette::{miette, IntoDiagnostic, Result}; +use sqlx::{ + pool::PoolConnection, Sqlite, SqliteConnection, SqlitePool, +}; use tracing::{debug, error, warn}; use crate::core::{ @@ -360,7 +359,7 @@ impl<'a> Library { |(index, item)| { let service_item = item.to_service_item(); let drag_item = - Box::new(self.single_item(index, item, &model)); + self.single_item(index, item, model); let visual_item = self .single_item(index, item, model) .map(|_| Message::None); @@ -387,25 +386,11 @@ impl<'a> Library { )), ) .action(DndAction::Copy) - .drag_icon({ - let model = model.kind.clone(); - move |i| { - let state = State::None; - let icon = match model { - LibraryKind::Song => icon::from_name( - "folder-music-symbolic", - ) - , - LibraryKind::Video => icon::from_name("folder-videos-symbolic"), - LibraryKind::Image => icon::from_name("folder-pictures-symbolic"), - LibraryKind::Presentation => icon::from_name("x-office-presentation-symbolic"), - }; - ( - icon.into(), - state, - i, - ) - }}) + // .drag_icon(move |i| { + // let state = + // drag_item.as_widget().state(); + // (drag_item, state, i) + // }) .drag_content(move || { service_item.to_owned() }) @@ -413,11 +398,10 @@ impl<'a> Library { }, ) }) - .spacing(2) - .width(Length::Fill), + .spacing(2) + .width(Length::Fill), ) - .spacing(5) - .height(Length::Fill); + .spacing(5); let library_toolbar = rowm!( text_input("Search...", ""), diff --git a/src/ui/presenter.rs b/src/ui/presenter.rs index 12a7c13..8526c4e 100644 --- a/src/ui/presenter.rs +++ b/src/ui/presenter.rs @@ -1,4 +1,4 @@ -use miette::{IntoDiagnostic, Result}; +use miette::{miette, IntoDiagnostic, Result}; use std::{fs::File, io::BufReader, path::PathBuf, sync::Arc}; use cosmic::{ @@ -13,7 +13,7 @@ use cosmic::{ scrollable::{ scroll_to, AbsoluteOffset, Direction, Scrollbar, }, - span, stack, + span, stack, text, }, prelude::*, widget::{ @@ -29,10 +29,13 @@ use url::Url; use crate::{ core::{service_items::ServiceItemModel, slide::Slide}, - ui::text_svg::{self, Font as SvgFont}, BackgroundKind, }; +use super::text_svg::{ + self, shadow, stroke, Font as SvgFont, TextSvg, +}; + const REFERENCE_WIDTH: f32 = 1920.0; const REFERENCE_HEIGHT: f32 = 1080.0; @@ -525,43 +528,39 @@ async fn start_audio(sink: Arc, audio: PathBuf) { fn scale_font(font_size: f32, width: f32) -> f32 { let scale_factor = (REFERENCE_WIDTH / width).sqrt(); // debug!(scale_factor); - - if font_size > 0.0 { + let font_size = if font_size > 0.0 { font_size / scale_factor } else { 50.0 - } + }; + font_size } -pub(crate) fn slide_view( +pub(crate) fn slide_view<'a>( slide: Slide, - video: &Option