diff --git a/Cargo.lock b/Cargo.lock index 01ac60e..833fecc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,30 +4,32 @@ version = 4 [[package]] name = "accesskit" -version = "0.17.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a" +checksum = "ad442f58ee04714aaa0ba0a2768c1ea1935b29507bb22ddece8cbbc76db02932" +dependencies = [ + "uuid", +] [[package]] name = "accesskit_consumer" -version = "0.26.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47983a1084940ba9a39c077a8c63e55c619388be5476ac04c804cfbd1e63459" +checksum = "8a45e2bb300bea6d5f33a82c3e051c3ddc6f41c209750f68a0acbe991a284344" dependencies = [ "accesskit", - "hashbrown 0.15.5", - "immutable-chunkmap", + "hashbrown", ] [[package]] name = "accesskit_macos" -version = "0.18.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7329821f3bd1101e03a7d2e03bd339e3ac0dc64c70b4c9f9ae1949e3ba8dece1" +checksum = "5701624bf6a11efb6d4c8e922bf44126ed96250e5faa9a7a0468c979635839a4" dependencies = [ "accesskit", "accesskit_consumer", - "hashbrown 0.15.5", + "hashbrown", "objc2 0.5.2", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", @@ -35,14 +37,13 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.24.1" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fcd5d23d70670992b823e735e859374d694a3d12bfd8dd32bd3bd8bedb5d81" +checksum = "ce63f35d6bdcf59f26b76b3379063f738e6412cef46999cc772d46aa3de35adb" dependencies = [ "accesskit", "accesskit_consumer", - "hashbrown 0.15.5", - "paste", + "hashbrown", "static_assertions", "windows", "windows-core", @@ -54,12 +55,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "arrayvec" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" - [[package]] name = "async-broadcast" version = "0.7.2" @@ -113,7 +108,7 @@ dependencies = [ "polling", "rustix", "slab", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -171,7 +166,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -203,12 +198,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.13.1" @@ -323,7 +312,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.1", + "bitflags", "objc2 0.6.4", ] @@ -367,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -418,9 +407,9 @@ dependencies = [ [[package]] name = "foldhash" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "font-types" @@ -525,7 +514,7 @@ version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "948d0741125ba89cd3e1c23e5642415b6ade7e1d29d67ba25fb925b533e989d6" dependencies = [ - "bitflags 2.13.1", + "bitflags", "bytemuck", "once_cell", "read-fonts 0.43.3", @@ -534,19 +523,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ "foldhash", ] -[[package]] -name = "hashbrown" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" - [[package]] name = "hermit-abi" version = "0.5.3" @@ -559,15 +542,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "immutable-chunkmap" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45b30d0eb3d4282f694894b75bc50807ab6e3203436681cc235fa364acf7f5e1" -dependencies = [ - "arrayvec", -] - [[package]] name = "indexmap" version = "2.14.2" @@ -575,7 +549,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", - "hashbrown 0.17.1", + "hashbrown", ] [[package]] @@ -672,7 +646,7 @@ checksum = "4b18443e9c262bfe8fa82f51666e2642c53393f7e5c27b3e1aeab922cff5b9d8" dependencies = [ "libc", "wasi", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -695,7 +669,7 @@ dependencies = [ "objc2-quartz-core 0.3.2", "png", "swash", - "windows-sys 0.59.0", + "windows-sys", "x11rb", "zbus", "zeno", @@ -732,7 +706,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -748,7 +722,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -769,7 +743,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" dependencies = [ - "bitflags 2.13.1", + "bitflags", "objc2 0.6.4", "objc2-foundation 0.3.2", ] @@ -780,7 +754,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -792,7 +766,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" dependencies = [ - "bitflags 2.13.1", + "bitflags", "objc2 0.6.4", "objc2-foundation 0.3.2", ] @@ -803,7 +777,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.6.2", "dispatch2", "libc", @@ -816,7 +790,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.6.2", "dispatch2", "libc", @@ -854,7 +828,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" dependencies = [ - "bitflags 2.13.1", + "bitflags", "objc2 0.6.4", "objc2-core-foundation", "objc2-core-graphics", @@ -866,7 +840,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" dependencies = [ - "bitflags 2.13.1", + "bitflags", "objc2 0.6.4", "objc2-core-foundation", "objc2-core-graphics", @@ -885,7 +859,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -897,7 +871,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -910,7 +884,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ - "bitflags 2.13.1", + "bitflags", "objc2 0.6.4", "objc2-core-foundation", ] @@ -921,7 +895,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -933,7 +907,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794" dependencies = [ - "bitflags 2.13.1", + "bitflags", "objc2 0.6.4", "objc2-foundation 0.3.2", ] @@ -944,7 +918,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -957,7 +931,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" dependencies = [ - "bitflags 2.13.1", + "bitflags", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -990,12 +964,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "pastey" version = "0.2.3" @@ -1021,11 +989,11 @@ dependencies = [ [[package]] name = "png" -version = "0.17.16" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 1.3.2", + "bitflags", "crc32fast", "fdeflate", "flate2", @@ -1043,7 +1011,7 @@ dependencies = [ "hermit-abi", "pin-project-lite", "rustix", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1107,11 +1075,11 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.13.1", + "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1215,7 +1183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1267,7 +1235,7 @@ dependencies = [ "getrandom", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1299,7 +1267,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1382,7 +1350,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1461,32 +1429,54 @@ dependencies = [ [[package]] name = "windows" -version = "0.58.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" +dependencies = [ + "windows-collections", + "windows-core", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ "windows-core", - "windows-targets", ] [[package]] name = "windows-core" -version = "0.58.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", + "windows-link", "windows-result", "windows-strings", - "windows-targets", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core", + "windows-link", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.58.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -1495,9 +1485,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.58.0" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -1511,31 +1501,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "windows-result" -version = "0.2.0" +name = "windows-numerics" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-targets", + "windows-core", + "windows-link", ] [[package]] -name = "windows-strings" -version = "0.1.0" +name = "windows-result" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-result", - "windows-targets", + "windows-link", ] [[package]] -name = "windows-sys" -version = "0.59.0" +name = "windows-strings" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-targets", + "windows-link", ] [[package]] @@ -1548,69 +1538,14 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.52.6" +name = "windows-threading" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-link", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - [[package]] name = "winnow" version = "1.0.4" @@ -1622,9 +1557,9 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" +checksum = "5a8885a854a8bfdf87a301e53e41b17c5f8f33639903131338b997b1eb614f44" dependencies = [ "gethostname", "rustix", @@ -1633,9 +1568,9 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" +checksum = "acf4d1bc32aa46eec18caa634ec3cf4c05bfa151f12b93b510b15190f69a1ca8" [[package]] name = "yazi" @@ -1672,7 +1607,7 @@ dependencies = [ "tracing", "uds_windows", "uuid", - "windows-sys 0.61.2", + "windows-sys", "winnow", "zbus_macros", "zbus_names", diff --git a/Cargo.toml b/Cargo.toml index cb8bb72..386044c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ targets = ["x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linu # used internally, now direct so `tiny-skia`'s own crates drop out of the tree). # All permissive-licensed; carries no windowing/GUI dependency, so the offscreen # render + snapshot test runs anywhere. -png = "0.17" +png = "0.18" # Text stack โ€” the deep engines used *directly* (ADR-0001), with muri owning the # thin shaping-glue + font-fallback layer in `src/render/mod.rs`: @@ -77,7 +77,7 @@ crossbeam-channel = "0.5" # pure, portable set of node/tree types; the muri `a11y` tree maps straight onto # it, and consumers feed the resulting `TreeUpdate` to `accesskit_macos` / # `accesskit_windows` (which bridge to NSAccessibility / UIA). -accesskit = { version = "0.17", optional = true } +accesskit = { version = "0.25", optional = true } # macOS backend: the live tray icon (NSStatusItem via objc2) and the # winit/softbuffer popup window the scene drawer paints into. Gated to macOS @@ -105,13 +105,13 @@ objc2-core-foundation = "0.3" # `a11y` feature unavoidably pulls a small objc2 0.5 subtree *for the accesskit # bridge only*. The default build carries none of it; winit's objc2 0.5 stack # (and winit/softbuffer/raw-window-handle/accesskit_winit) are fully gone. -accesskit_macos = { version = "0.18", optional = true } +accesskit_macos = { version = "0.27", optional = true } # Windows backend: the notification-area tray icon + anchor rect via # `Shell_NotifyIcon` / `Shell_NotifyIconGetRect`. Only the tray shim is # Windows-specific; the scene drawer and menu model are shared. [target.'cfg(target_os = "windows")'.dependencies] -windows-sys = { version = "0.59", features = [ +windows-sys = { version = "0.61", features = [ "Win32_Foundation", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging", @@ -136,7 +136,7 @@ windows-sys = { version = "0.59", features = [ # over UI Automation. 0.24 pairs with accesskit 0.17; it re-exports its own # `windows`-crate `HWND`, which never crosses the `Platform` seam. Mirrors how # `accesskit_macos` is wired on the macOS target. -accesskit_windows = { version = "0.24", optional = true } +accesskit_windows = { version = "0.35", optional = true } # Linux backend (M5): the native-menu fallback (spec 22 ยง2, Path 1). Both crates # are **pure Rust** โ€” `ksni` speaks StatusNotifierItem / `com.canonical.dbusmenu` @@ -158,7 +158,7 @@ zbus = { version = "5", features = ["blocking-api"] } # `RustConnection` โ€” no `libxcb`/`allow-unsafe-code`, so the build needs no system # X libraries (only a running X server, incl. XWayland, at *runtime*). MSRV is well # below muri's 1.85 floor. -x11rb = { version = "0.13", default-features = false } +x11rb = { version = "0.14", default-features = false } [features] default = [] diff --git a/src/a11y.rs b/src/a11y.rs index 1da6bbf..ddb7f1e 100644 --- a/src/a11y.rs +++ b/src/a11y.rs @@ -369,7 +369,7 @@ pub fn announcement(node: &AxNode) -> String { #[cfg(feature = "a11y")] pub mod accesskit { use super::{AxNode, AxRole, AxTree}; - use accesskit::{HasPopup, Node, NodeId, Role, Toggled, Tree, TreeUpdate}; + use accesskit::{HasPopup, Node, NodeId, Role, Toggled, TreeId, TreeInfo, TreeUpdate}; fn role_of(node: &AxNode) -> Role { match node.role { @@ -422,7 +422,8 @@ pub mod accesskit { let root = NodeId(tree.root.id.0); TreeUpdate { nodes, - tree: Some(Tree::new(root)), + tree: Some(TreeInfo::new(root)), + tree_id: TreeId::ROOT, focus: focus.map(|f| NodeId(f.0)).unwrap_or(root), } } diff --git a/src/platform/mac.rs b/src/platform/mac.rs index 2646f4a..22baa28 100644 --- a/src/platform/mac.rs +++ b/src/platform/mac.rs @@ -1289,7 +1289,7 @@ impl PopupSession<'_> { #[cfg(feature = "a11y")] fn on_a11y_action(&mut self, kind: WindowKind, request: accesskit::ActionRequest) { - let target = crate::a11y::AxId(request.target.0); + let target = crate::a11y::AxId(request.target_node.0); let level = kind.menu_level(); let Some(menu) = self.menu_at_level(level) else { return; diff --git a/src/platform/windows.rs b/src/platform/windows.rs index 336f7a8..8133b50 100644 --- a/src/platform/windows.rs +++ b/src/platform/windows.rs @@ -1659,7 +1659,7 @@ impl PopupSession<'_> { #[cfg(feature = "a11y")] fn on_a11y_action(&mut self, kind: WindowKind, request: accesskit::ActionRequest) { - let target = crate::a11y::AxId(request.target.0); + let target = crate::a11y::AxId(request.target_node.0); let level = kind.menu_level(); let Some(menu) = self.menu_at_level(level) else { return; diff --git a/src/render/raster.rs b/src/render/raster.rs index 3c65c9e..af18af1 100644 --- a/src/render/raster.rs +++ b/src/render/raster.rs @@ -327,7 +327,7 @@ const MAX_ICON_PIXELS: u64 = 2048 * 2048; /// IHDR-derived [`png::OutputInfo`] *before* any pixel buffer is allocated, /// so oversized/malicious inputs are rejected cheaply. pub fn decode_png(bytes: &[u8]) -> Option<(Vec, u32, u32)> { - let mut decoder = png::Decoder::new(bytes); + let mut decoder = png::Decoder::new(std::io::Cursor::new(bytes)); decoder.set_transformations(png::Transformations::normalize_to_color8()); let mut reader = decoder.read_info().ok()?; let hdr = reader.info(); @@ -338,7 +338,7 @@ pub fn decode_png(bytes: &[u8]) -> Option<(Vec, u32, u32)> { if (hw as u64) * (hh as u64) > MAX_ICON_PIXELS { return None; } - let mut buf = vec![0u8; reader.output_buffer_size()]; + let mut buf = vec![0u8; reader.output_buffer_size()?]; let info = reader.next_frame(&mut buf).ok()?; let (w, h) = (info.width, info.height); let count = (w as usize).checked_mul(h as usize)?;