diff --git a/Cargo.lock b/Cargo.lock index fb67632..b78eb8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "uuid", ] @@ -29,7 +29,7 @@ dependencies = [ [[package]] name = "accesskit_atspi_common" version = "0.15.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_consumer", @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "accesskit_consumer" version = "0.32.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "hashbrown 0.16.1", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "accesskit_macos" version = "0.23.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_consumer", @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "accesskit_unix" version = "0.18.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -78,7 +78,7 @@ dependencies = [ [[package]] name = "accesskit_windows" version = "0.30.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_consumer", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "accesskit_winit" version = "0.30.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_macos", @@ -109,13 +109,24 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aes" -version = "0.9.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35f0f96ce78e38c3dc6d8948aa8163d06385be74000f3c7a95bf1eef35d3ea32" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ - "cipher", + "cfg-if", + "cipher 0.4.4", + "cpufeatures 0.2.17", +] + +[[package]] +name = "aes" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8eb277bec05f56a0e0591f155a484cbd0f4f07ff2905051a48c72f004f7ed58" +dependencies = [ + "cipher 0.5.2", "cpubits", - "cpufeatures 0.3.1", + "cpufeatures 0.3.0", ] [[package]] @@ -146,8 +157,8 @@ version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46319972e74179d707445f64aaa2893bbf6a111de3a9af29b7eb382f8b39e282" dependencies = [ - "base64 0.22.1", - "bitflags 2.13.2", + "base64", + "bitflags 2.13.1", "home", "libc", "log", @@ -223,7 +234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd" dependencies = [ "android-properties", - "bitflags 2.13.2", + "bitflags 2.13.1", "cc", "jni", "libc", @@ -493,7 +504,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -564,7 +575,7 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -622,12 +633,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" - [[package]] name = "basic-toml" version = "0.1.10" @@ -666,9 +671,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.2" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" dependencies = [ "serde_core", ] @@ -709,11 +714,11 @@ dependencies = [ [[package]] name = "block-padding" -version = "0.4.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710f1dd022ef4e93f8a438b4ba958de7f64308434fa6a87104481645cc30068b" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ - "hybrid-array", + "generic-array", ] [[package]] @@ -749,9 +754,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.8.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" +checksum = "a88b7ea17d208c4193f2c1e6de3c35fe71f98c96982d5ced308bdcc749ff6e1f" dependencies = [ "bytes", "cfg_aliases", @@ -823,13 +828,13 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.12.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c" +checksum = "fc0e56a716f1e132ff6bf4bdac1c944a3fcdc1cae65f70a4a2a1ac3b401d2d1f" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -875,7 +880,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "polling", "rustix 1.1.4", "slab", @@ -896,18 +901,18 @@ dependencies = [ [[package]] name = "cbc" -version = "0.2.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2dc9ee5f88d11e0beb842c88b33c8a5cf0d1329c4b19494af42b07dbfe8896" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] name = "cc" -version = "1.4.6" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3eb0f42d6c360dc3f8a821f6bf2fdea7f72bfd36b3076eb0e6d1e9e0752fff4" +checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273" dependencies = [ "find-msvc-tools", "jobserver", @@ -951,6 +956,16 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common 0.1.7", + "inout 0.1.4", +] + [[package]] name = "cipher" version = "0.5.2" @@ -958,7 +973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ "crypto-common 0.2.2", - "inout", + "inout 0.2.2", ] [[package]] @@ -1049,9 +1064,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.8" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -1193,9 +1208,9 @@ dependencies = [ [[package]] name = "configparser" -version = "3.3.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031ad3d167622974ed636505ae4556267ed4aa2aea0464122fa6bc9698a32825" +checksum = "b46dec724fd22199ebde05033a0cbae453bc3b1ecff11eb6a6bb3eec4b90c6a4" [[package]] name = "const-oid" @@ -1265,7 +1280,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "core-foundation 0.10.1", "libc", ] @@ -1281,12 +1296,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "core_detect" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48" - [[package]] name = "core_maths" version = "0.1.1" @@ -1300,7 +1309,7 @@ dependencies = [ name = "cosmic-client-toolkit" version = "0.2.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "cosmic-protocols", "libc", "smithay-client-toolkit", @@ -1338,7 +1347,7 @@ dependencies = [ [[package]] name = "cosmic-files" -version = "1.9.0" +version = "1.7.0" dependencies = [ "anyhow", "atomic_float", @@ -1412,7 +1421,7 @@ dependencies = [ name = "cosmic-protocols" version = "0.2.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -1430,7 +1439,7 @@ dependencies = [ [[package]] name = "cosmic-term" -version = "1.9.0" +version = "1.7.0" dependencies = [ "alacritty_terminal", "clap_lex", @@ -1446,7 +1455,6 @@ dependencies = [ "log", "open", "paste", - "polling", "regex", "reqwest", "ron 0.11.0", @@ -1460,14 +1468,13 @@ dependencies = [ "tokio", "url", "xdgen", - "zbus", ] [[package]] name = "cosmic-text" version = "0.19.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "fontdb", "harfrust", "linebender_resource_handle", @@ -1520,27 +1527,27 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.5.2" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" +checksum = "8498c871161e1742aaa9d52551b2d6ebdd4c3d45a3be423e3728f33b955be550" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-deque" -version = "0.8.8" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a" +checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -1548,27 +1555,27 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.21" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.14" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e8bd762f7479489c70ed6c768ddca99d7296857de437a68dcb2a94365b3fae" +checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.23" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" [[package]] name = "crunchy" @@ -1743,7 +1750,7 @@ checksum = "dc05a5d33db20c784f873e84934ad94bb209a090987ac5f62fede2c178234f23" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -1754,6 +1761,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common 0.1.7", + "subtle", ] [[package]] @@ -1838,7 +1846,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -1852,7 +1860,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -1868,7 +1876,7 @@ dependencies = [ name = "dnd" version = "0.1.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "mime 0.1.0", "raw-window-handle", "smithay-client-toolkit", @@ -1902,16 +1910,11 @@ checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" [[package]] name = "encoding_rs" -version = "0.8.42" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", - "core_detect", - "multiversion_no_op", - "rustversion", - "scopeguard", - "simdutf8", ] [[package]] @@ -2031,7 +2034,7 @@ dependencies = [ "bit_field", "half", "lebe", - "miniz_oxide 0.8.9", + "miniz_oxide", "num-complex", "pulp", "rayon-core", @@ -2090,9 +2093,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.12" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d" +checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890" [[package]] name = "fixed_decimal" @@ -2107,12 +2110,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.10" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", - "miniz_oxide 0.9.1", + "miniz_oxide", "zlib-rs", ] @@ -2220,9 +2223,9 @@ dependencies = [ [[package]] name = "font-types" -version = "0.12.5" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8eb065f3251655b3c90e22e5e363f310fc5332fb3402e37bbc94752283248f6" +checksum = "e64eb721ca85a34323425f4041adc5d82704d3782d5f8f03793bc012419dce23" dependencies = [ "bytemuck", ] @@ -2277,7 +2280,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -2407,7 +2410,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -2597,7 +2600,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "gpu-descriptor-types", "hashbrown 0.15.5", ] @@ -2608,7 +2611,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", ] [[package]] @@ -2664,7 +2667,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "bytemuck", "core_maths", "read-fonts 0.37.0", @@ -2705,9 +2708,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17592d60ebacc7d5e169f4663c5f84f9161cc90328abcfe8456f41e4dfcb284" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -2734,11 +2737,20 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "hkdf" -version = "0.13.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "hmac", + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", ] [[package]] @@ -2800,18 +2812,18 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hybrid-array" -version = "0.4.15" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" +checksum = "707114b52a152fa7bdb290cd7cd5912d9467273b6d74e21b8d81aca1f8533f6b" dependencies = [ "typenum", ] [[package]] name = "hyper" -version = "1.11.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b501faa50e7a26c3d3560ca625132f4078a17771f4810baf70475ae48cbe43" +checksum = "d22053281f852e11534f5198498373cbb59295120a20771d90f7ed1897490a72" dependencies = [ "atomic-waker", "bytes", @@ -2830,9 +2842,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.10" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ "http", "hyper", @@ -2861,17 +2873,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.21" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ - "base64 0.23.1", + "base64", "bytes", "futures-channel", "futures-util", "http", "http-body", - "httparse", "hyper", "ipnet", "libc", @@ -3009,7 +3020,7 @@ dependencies = [ name = "iced_core" version = "0.14.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "build_helpers", "bytes", "cosmic-client-toolkit", @@ -3056,7 +3067,7 @@ dependencies = [ name = "iced_graphics" version = "0.14.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "bytemuck", "cosmic-text", "half", @@ -3126,7 +3137,7 @@ dependencies = [ name = "iced_wgpu" version = "0.14.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "build_helpers", "bytemuck", "cosmic-client-toolkit", @@ -3707,15 +3718,15 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "imgref" -version = "1.12.3" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44b0a4eaa4c82f441d50a963f2d5f05a787240aeee097597033e72accfd22f" +checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7" [[package]] name = "indexmap" -version = "2.14.2" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", "hashbrown 0.17.1", @@ -3738,7 +3749,7 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "inotify-sys", "libc", ] @@ -3752,13 +3763,22 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "block-padding", + "generic-array", +] + [[package]] name = "inout" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" dependencies = [ - "block-padding", "hybrid-array", ] @@ -3794,9 +3814,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.12.2" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" +checksum = "6a756c3fac73139e83f14c2d742155dd2b78d3ee56597b419a0579b7bdd6dd78" [[package]] name = "is-docker" @@ -3840,9 +3860,9 @@ checksum = "4d3667095d64c3ecffc96463a21157b04bf3e252f6e8d5750b20c02e33c194e3" [[package]] name = "jiff" -version = "0.2.37" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1baf72f08796de0260609515130699b890ac25f30e610ad894bc5856cafdb" +checksum = "668b7183bd07af9a4885f5c35b0cc5c83c4607a913c16b7e17291832910d2dcc" dependencies = [ "defmt", "jiff-core", @@ -3857,12 +3877,11 @@ dependencies = [ [[package]] name = "jiff-core" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c" +checksum = "7feca88439efe53da3754500c1851dedf3cb36c524dd5cf8225cc0794de95d09" dependencies = [ "defmt", - "log", ] [[package]] @@ -3878,9 +3897,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.37" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "378268a1116ad67ae6228701118ac9f491d78fda38a40a1f1a9e1348de6f7212" +checksum = "3a69dcb3a21cfb32ce1cd056169337ca284af0766dd766e7878819b251a49204" dependencies = [ "jiff-core", "proc-macro2", @@ -3973,9 +3992,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.105" +version = "0.3.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e" +checksum = "0e0c1080212aad755ea003d18543e8768dd432c48819efd73a7bf1e39b7a5a3a" dependencies = [ "cfg-if", "futures-util", @@ -4177,7 +4196,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "serde", ] @@ -4223,7 +4242,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "libc", ] @@ -4307,7 +4326,6 @@ dependencies = [ "palette", "phf", "rfd", - "roxmltree", "rust-embed", "serde", "slotmap", @@ -4348,14 +4366,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.24" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6480ccc157a1389bb2e4891b24751b0f798ba640d22386f23143fbcc89da195a" +checksum = "28d0a00925a9f930d679b6789b721e3a7f9ed110f41b86d2497caa780c3a070a" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "libc", "plain", - "redox_syscall 0.9.4", + "redox_syscall 0.9.3", ] [[package]] @@ -4453,9 +4471,9 @@ dependencies = [ [[package]] name = "lyon_algorithms" -version = "1.0.21" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfa8785f95e57914ddb35e3b59994aeba6f5e79e9cfd03da1c269f010f36009" +checksum = "8575c0d003ae459399623c4def180c63b77f343b1a7fee64f249b349e7699a31" dependencies = [ "lyon_path", "num-traits", @@ -4484,9 +4502,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.22" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b8dcf906637ecef61b3c0740c7a4e7f27caeb31257cfac0cc579ce15be6005" +checksum = "8e43b7e44161571868f5c931d12583592c223c5583eef86b08aa02b7048a3552" dependencies = [ "float_next_after", "lyon_path", @@ -4579,7 +4597,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block", "core-graphics-types 0.2.0", "foreign-types 0.5.0", @@ -4627,21 +4645,11 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "miniz_oxide" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" -dependencies = [ - "adler2", - "simd-adler32", -] - [[package]] name = "mio" -version = "1.2.3" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18443e9c262bfe8fa82f51666e2642c53393f7e5c27b3e1aeab922cff5b9d8" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "log", @@ -4668,12 +4676,6 @@ dependencies = [ "pxfm", ] -[[package]] -name = "multiversion_no_op" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" - [[package]] name = "mutate_once" version = "0.1.2" @@ -4688,7 +4690,7 @@ checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.13.2", + "bitflags 2.13.1", "cfg-if", "cfg_aliases", "codespan-reporting", @@ -4729,7 +4731,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "jni-sys 0.3.1", "log", "ndk-sys", @@ -4799,7 +4801,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "fsevent-sys", "inotify", "kqueue", @@ -4830,7 +4832,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", ] [[package]] @@ -5016,7 +5018,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -5032,7 +5034,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", @@ -5045,7 +5047,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -5057,7 +5059,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.6.2", "dispatch2", "objc2 0.6.4", @@ -5069,7 +5071,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "libc", "objc2-core-foundation", ] @@ -5092,7 +5094,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "objc2-core-foundation", "objc2-core-graphics", ] @@ -5109,7 +5111,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -5121,7 +5123,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", @@ -5133,7 +5135,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -5145,7 +5147,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -5158,7 +5160,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "objc2 0.6.4", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -5181,9 +5183,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "open" -version = "5.4.4" +version = "5.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc" +checksum = "ade3be4664bc1ef537ce133015f04c176b737815c2ba9fd60edf212d6e90dd55" dependencies = [ "is-wsl", "libc", @@ -5195,7 +5197,7 @@ version = "0.10.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "cfg-if", "foreign-types 0.3.2", "libc", @@ -5269,9 +5271,9 @@ dependencies = [ [[package]] name = "ordermap" -version = "1.2.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a756ddcdeb6c0efc8927bdf0ed112885815a35ba350472a467be5104f01ca1" +checksum = "7f7476a5b122ff1fce7208e7ee9dccd0a516e835f5b8b19b8f3c98a34cf757c1" dependencies = [ "indexmap", "serde", @@ -5400,7 +5402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629" dependencies = [ "digest 0.11.3", - "hmac", + "hmac 0.13.0", ] [[package]] @@ -5525,7 +5527,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.8.9", + "miniz_oxide", ] [[package]] @@ -5534,11 +5536,11 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.8.9", + "miniz_oxide", ] [[package]] @@ -5569,9 +5571,9 @@ checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "portable-atomic-util" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ab3eb7f3becc3a1cbc4f2c6f20267996cfc1a6467a873763411b136a122715" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" dependencies = [ "portable-atomic", ] @@ -5595,9 +5597,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppmd-rust" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196a7c80b9a7652aba7cc070827516c2abe4ccdf53d128e1944003cf5726cff1" +checksum = "efca4c95a19a79d1c98f791f10aebd5c1363b473244630bb7dbde1dc98455a24" [[package]] name = "ppv-lite86" @@ -5625,9 +5627,9 @@ dependencies = [ [[package]] name = "proc-macro-error-attr3" -version = "3.1.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e564d14133360e1ae169ffde5da25881b5fa47261665b8e5713c212c27799da" +checksum = "b0084e6206a967a2dad822180626b2f6b07a3b379325e8f1ec0438e33a469ba7" dependencies = [ "proc-macro2", "quote", @@ -5635,14 +5637,14 @@ dependencies = [ [[package]] name = "proc-macro-error3" -version = "3.1.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0d4471b3436c22106b21913b1dda531558918ae9b7ec55d58aa84b43552233" +checksum = "0cf066225f2373bc711684792b69bdeac0356019b007e721090c24d92d5d5a50" dependencies = [ "proc-macro-error-attr3", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -5673,7 +5675,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "chrono", "flate2", "procfs-core", @@ -5686,7 +5688,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "chrono", "hex", ] @@ -5921,7 +5923,7 @@ version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", ] [[package]] @@ -5968,7 +5970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" dependencies = [ "bytemuck", - "font-types 0.12.5", + "font-types 0.12.4", "once_cell", ] @@ -6000,7 +6002,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5018d583d6d2f5499352aea8d177e9067d1eb03ab17c78169d5ba7a30001b15" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "libredox", ] @@ -6010,16 +6012,16 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", ] [[package]] name = "redox_syscall" -version = "0.9.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "737970939a87c6fa31e7acad13307bccbb017a073b695b6089a2c484f929e20e" +checksum = "d678d17679829e73d371e96880897e98fee2ded7acc0a50bdf8af2affa4b2fe5" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", ] [[package]] @@ -6085,7 +6087,7 @@ version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "encoding_rs", "futures-core", @@ -6192,8 +6194,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468" dependencies = [ - "base64 0.22.1", - "bitflags 2.13.2", + "base64", + "bitflags 2.13.1", "serde", "serde_derive", "unicode-ident", @@ -6205,7 +6207,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81116b9531d61eabc41aeb228e4b6b2435bcca3233b98cf3b3077d4e6e9debb3" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "once_cell", "serde", "serde_derive", @@ -6281,7 +6283,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "errno", "libc", "linux-raw-sys 0.4.15", @@ -6294,7 +6296,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "errno", "libc", "linux-raw-sys 0.12.1", @@ -6314,9 +6316,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "0283386ce02abc0151e1761d08802dfe86c173b0b494af5cbc086574e453da06" dependencies = [ "once_cell", "rustls-pki-types", @@ -6357,7 +6359,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "bytemuck", "core_maths", "log", @@ -6420,20 +6422,20 @@ dependencies = [ [[package]] name = "secret-service" -version = "5.2.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5107b24b91445dd2aa449a258a1807b63240942157292354dc5bfdbeb8bc6db8" +checksum = "9a62d7f86047af0077255a29494136b9aaaf697c76ff70b8e49cded4e2623c14" dependencies = [ - "aes", + "aes 0.8.4", "cbc", "futures-util", - "getrandom 0.4.3", + "generic-array", + "getrandom 0.2.17", "hkdf", - "hybrid-array", "num", "once_cell", "serde", - "sha2 0.11.0", + "sha2 0.10.9", "zbus", ] @@ -6452,7 +6454,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -6508,7 +6510,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -6533,7 +6535,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -6555,7 +6557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures 0.3.1", + "cpufeatures 0.3.0", "digest 0.11.3", ] @@ -6577,7 +6579,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", - "cpufeatures 0.3.1", + "cpufeatures 0.3.0", "digest 0.11.3", ] @@ -6705,9 +6707,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.16.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "smithay-client-toolkit" @@ -6715,7 +6717,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "bytemuck", "calloop", "calloop-wayland-source", @@ -6809,7 +6811,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", ] [[package]] @@ -6885,9 +6887,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.5" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9" +checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f" dependencies = [ "proc-macro2", "quote", @@ -6939,7 +6941,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -7042,7 +7044,7 @@ checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -7152,9 +7154,18 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.13.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" +checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" @@ -7181,7 +7192,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -7196,9 +7207,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.5" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c85f2c3ef0b1cd58b36682f4b17aaa995f0e5db534d85692b4903abce21f67" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -7249,9 +7260,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.15+spec-1.1.0" +version = "0.25.13+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614" +checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" dependencies = [ "indexmap", "toml_datetime", @@ -7289,7 +7300,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "bytes", "futures-util", "http", @@ -7377,9 +7388,9 @@ dependencies = [ [[package]] name = "trash" -version = "5.2.9" +version = "5.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be89b3fe156965d29ac4f8522f3a640c655affdd9f21cb4f36857f0c92c00317" +checksum = "7602e0c7d66ec2d92a8c917219fbc7894039efa2063b9064260110828a356f46" dependencies = [ "chrono", "libc", @@ -7390,7 +7401,7 @@ dependencies = [ "percent-encoding", "scopeguard", "urlencoding", - "windows 0.62.2", + "windows 0.56.0", ] [[package]] @@ -7571,7 +7582,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" dependencies = [ - "base64 0.22.1", + "base64", "data-url", "flate2", "fontdb", @@ -7606,9 +7617,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.26.1" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce" +checksum = "f053576934f05a761a402421fbbe3d425d9366f75f978806a037b3ca481abecc" dependencies = [ "js-sys", "serde_core", @@ -7661,7 +7672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5924018406ce0063cd67f8e008104968b74b563ee1b85dde3ed1f7cb87d3dbd" dependencies = [ "arrayvec", - "bitflags 2.13.2", + "bitflags 2.13.1", "cursor-icon", "log", "memchr", @@ -7704,9 +7715,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.128" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aecb87a33d3b0c5e3b7aa46336eaf486cffafbd281b195e4c8b80d50df2351bf" +checksum = "1b70935747edd64d89de3efa29d73789b806c15798f8e7dca4d8ac356b50ce70" dependencies = [ "cfg-if", "once_cell", @@ -7717,9 +7728,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.78" +version = "0.4.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef4c5d3d2cdf5c54f4231181768f5510842e350db025faf1f7163b1030ed928" +checksum = "6b7777d5cc23d0e91404e53ce2d5e8ec7acae3026b16233dba62cd3246457950" dependencies = [ "js-sys", "wasm-bindgen", @@ -7727,9 +7738,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.128" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a690d511e3c1a8b3a55e33511e3c2c00c78415cd23650f32b808627f5696b9ed" +checksum = "77775f8f3f7217702089053b94958f8f54061a3f663417df76e19cbdcca29bc1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7737,22 +7748,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.128" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411e4887f0071ef2d2164a9d5fdf2d20efbef78fccd3a78b0c10a1dc5295e48a" +checksum = "e11d33f857dc2fb11b8bc75aee111aa9cbeb12cd9f25efd3d4c2a3dd4e235284" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.119", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.128" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81941cd78d0c92026c33e5e01312845a4cb1e9af3407f9134b100dd03144103e" +checksum = "7ef64dbcc55df09c7e5a46182d181c2cfa3e925f3da937ea764728b4bbb9dcbf" dependencies = [ "unicode-ident", ] @@ -7804,7 +7815,7 @@ version = "0.31.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "rustix 1.1.4", "wayland-backend", "wayland-scanner", @@ -7816,7 +7827,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "cursor-icon", "wayland-backend", ] @@ -7838,7 +7849,7 @@ version = "0.32.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7851,7 +7862,7 @@ version = "20250721.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7864,7 +7875,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7877,7 +7888,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7890,7 +7901,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7915,7 +7926,7 @@ version = "0.31.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde9c29be0f723a573977de51ee455bf3dfa03652730a74f9dd3b337e374d75" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "downcast-rs", "rustix 1.1.4", "wayland-backend", @@ -7936,9 +7947,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.105" +version = "0.3.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbddc4a036f00ec4f18c83445bd3115cb306a91da554919a099d9222fe4a7f8" +checksum = "c435338968042f4f59a557f690a253676d47ce13ceb55d70100e7facf6620a30" dependencies = [ "js-sys", "wasm-bindgen", @@ -7967,7 +7978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f" dependencies = [ "arrayvec", - "bitflags 2.13.2", + "bitflags 2.13.1", "bytemuck", "cfg-if", "cfg_aliases", @@ -7999,7 +8010,7 @@ dependencies = [ "arrayvec", "bit-set", "bit-vec", - "bitflags 2.13.2", + "bitflags 2.13.1", "bytemuck", "cfg_aliases", "document-features", @@ -8059,7 +8070,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.13.2", + "bitflags 2.13.1", "block", "bytemuck", "cfg-if", @@ -8103,7 +8114,7 @@ version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "bytemuck", "js-sys", "log", @@ -8160,6 +8171,16 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.61.3" @@ -8203,14 +8224,26 @@ dependencies = [ "windows-core 0.62.2", ] +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface 0.56.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.2", + "windows-interface 0.59.3", "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", @@ -8222,8 +8255,8 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.2", + "windows-interface 0.59.3", "windows-link 0.2.1", "windows-result 0.4.1", "windows-strings 0.5.1", @@ -8251,6 +8284,17 @@ dependencies = [ "windows-threading 0.2.1", ] +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "windows-implement" version = "0.60.2" @@ -8262,6 +8306,17 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "windows-interface" version = "0.59.3" @@ -8316,6 +8371,15 @@ dependencies = [ "windows-strings 0.5.1", ] +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.3.4" @@ -8605,7 +8669,7 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" name = "winit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "cfg_aliases", "cursor-icon", "dpi", @@ -8630,7 +8694,7 @@ name = "winit-android" version = "0.31.0-beta.2" dependencies = [ "android-activity", - "bitflags 2.13.2", + "bitflags 2.13.1", "dpi", "ndk", "raw-window-handle", @@ -8643,7 +8707,7 @@ dependencies = [ name = "winit-appkit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.6.2", "dispatch2", "dpi", @@ -8677,7 +8741,7 @@ dependencies = [ name = "winit-core" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "cursor-icon", "dpi", "keyboard-types", @@ -8690,7 +8754,7 @@ dependencies = [ name = "winit-orbital" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "dpi", "libredox", "orbclient", @@ -8705,7 +8769,7 @@ dependencies = [ name = "winit-uikit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "block2 0.6.2", "dispatch2", "dpi", @@ -8725,7 +8789,7 @@ name = "winit-wayland" version = "0.31.0-beta.2" dependencies = [ "ahash", - "bitflags 2.13.2", + "bitflags 2.13.1", "calloop", "cursor-icon", "dpi", @@ -8750,7 +8814,7 @@ name = "winit-web" version = "0.31.0-beta.2" dependencies = [ "atomic-waker", - "bitflags 2.13.2", + "bitflags 2.13.1", "concurrent-queue", "cursor-icon", "dpi", @@ -8770,7 +8834,7 @@ dependencies = [ name = "winit-win32" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "cursor-icon", "dpi", "raw-window-handle", @@ -8885,7 +8949,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.13.1", "dlib", "log", "once_cell", @@ -9038,7 +9102,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", "zbus_names", "zvariant", "zvariant_utils", @@ -9084,18 +9148,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.57" +version = "0.8.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d35102a9f36d089ccae9e4c6802bc118be4487b80aaffc0ab4e0cf5ce92d2873" +checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.57" +version = "0.8.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c01f5ab44258da43cf276c74a2763db2ff3969c9c652c3f2de07041d0b2bc" +checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1" dependencies = [ "proc-macro2", "quote", @@ -9161,7 +9225,7 @@ checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", ] [[package]] @@ -9170,14 +9234,14 @@ version = "8.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b" dependencies = [ - "aes", + "aes 0.9.2", "bzip2", "constant_time_eq", "crc32fast", "deflate64", "flate2", "getrandom 0.4.3", - "hmac", + "hmac 0.13.0", "indexmap", "lzma-rust2", "memchr", @@ -9193,9 +9257,9 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.8" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" +checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12" [[package]] name = "zmij" @@ -9226,18 +9290,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.3.0" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d80649ab6db9d9f6f9c80a40becd948eda4714a0a5ac8c4d157a32231c7882" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.1.0+zstd.1.5.7" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef0a8027ec3ee71300ab3bcbcd0393f434aa72b91ca6d635a39941deae8eea0" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", @@ -9307,7 +9371,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.4", "zvariant_utils", ] @@ -9320,7 +9384,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 3.0.5", + "syn 3.0.4", "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index c95c38f..5ea996e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmic-term" -version = "1.9.0" +version = "1.7.0" authors = ["Jeremy Soller "] edition = "2024" license = "GPL-3.0-only" @@ -18,9 +18,6 @@ ron = "0.11" serde = { version = "1", features = ["serde_derive"] } shlex = "1" tokio = { version = "1", features = ["sync", "rt", "macros", "time"] } -# Notifications de bureau (OSC 9 / 777) et enveloppe du PTY (yoda) -polling = "3.11" -zbus = "5.19" # HTTP client for Modjo AI integration reqwest = { version = "0.12", features = ["json", "stream"], optional = true } serde_json = { version = "1", optional = true } diff --git a/debian/changelog b/debian/changelog index 0da2a95..1656655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,3 @@ -cosmic-term (1.9.0) noble; urgency=medium - - * Epoch 1.9.0 version update - - -- Michael Murphy Mon, 14 Sep 2026 19:50:47 +0200 - -cosmic-term (1.8.0) noble; urgency=medium - - * Epoch 1.8.0 version update - - -- Jeremy Soller Wed, 02 Sep 2026 08:15:55 -0600 - cosmic-term (1.7.0) noble; urgency=medium * Epoch 1.7.0 version update diff --git a/debian/source/options b/debian/source/options index 2f8c4a1..5d4ff73 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,6 +1,4 @@ tar-ignore=.github -tar-ignore=target/.rustc_info.json -tar-ignore=target/CACHEDIR.TAG -tar-ignore=target/debug -tar-ignore=target/release +tar-ignore=.vscode tar-ignore=vendor +tar-ignore=target \ No newline at end of file diff --git a/i18n/en/cosmic_term.ftl b/i18n/en/cosmic_term.ftl index aab041c..8d282d4 100644 --- a/i18n/en/cosmic_term.ftl +++ b/i18n/en/cosmic_term.ftl @@ -59,17 +59,13 @@ use-bright-bold = Make bold text brighter splits = Splits focus-follow-mouse = Typing focus follows mouse show-pane-borders = Show pane borders -unfocused-pane-dim = Dim unfocused panes ### Advanced advanced = Advanced show-headerbar = Show header -window-header = Window header show-header-description = Reveal the header from the right-click menu tab-new-inherit-working-directory = New tabs and windows use current directory tab-new-inherit-working-directory-description = Open new tabs and windows in the active tab's working directory -copy-on-select-clipboard = Copy selection to clipboard -copy-on-select-clipboard-description = In addition to the primary selection (middle click), like copy-on-select = clipboard in Ghostty ### Keyboard shortcuts add-another-keybinding = Add another keybinding @@ -142,10 +138,6 @@ save-output = Save output as text... monitor-activity = Monitor for activity monitor-silence = Monitor for silence monitor-process-finished = Monitor for process finishing -read-only = Read-only - -## Notifications -notification-show = Show tab ## Open open-link = Open Link @@ -160,7 +152,7 @@ next-tab = Next tab previous-tab = Previous tab split-horizontal = Split horizontal split-vertical = Split vertical -pane-toggle-maximize = Maximize or restore pane +pane-toggle-maximize = Toggle maximized menu-color-schemes = Color schemes... menu-settings = Settings... menu-about = About COSMIC Terminal... diff --git a/i18n/fil/cosmic_term.ftl b/i18n/fil/cosmic_term.ftl deleted file mode 100644 index e69de29..0000000 diff --git a/i18n/fr/cosmic_term.ftl b/i18n/fr/cosmic_term.ftl index 5d2d82e..834c800 100644 --- a/i18n/fr/cosmic_term.ftl +++ b/i18n/fr/cosmic_term.ftl @@ -108,10 +108,6 @@ save-output = Enregistrer la sortie comme texte... monitor-activity = Surveiller l'activité monitor-silence = Surveiller le silence monitor-process-finished = Surveiller la fin du processus -read-only = Lecture seule - -## Notifications -notification-show = Afficher l'onglet ## View @@ -172,7 +168,4 @@ comment = Émulateur de terminal pour le bureau COSMIC keywords = Commande;Shell;Terminal;CLI; tab-new-inherit-working-directory = Les nouveaux onglets et fenêtres utilisent le répertoire actuel tab-new-inherit-working-directory-description = Ouvrir les nouveaux onglets et fenêtres dans le répertoire de travail de l'onglet actif -copy-on-select-clipboard = Copier la sélection dans le presse-papiers -copy-on-select-clipboard-description = En plus de la sélection primaire (clic du milieu), comme copy-on-select = clipboard dans Ghostty show-pane-borders = Afficher les bordures des panneaux -unfocused-pane-dim = Atténuation des panneaux inactifs diff --git a/i18n/id/cosmic_term.ftl b/i18n/id/cosmic_term.ftl index 6b139ad..a17d82d 100644 --- a/i18n/id/cosmic_term.ftl +++ b/i18n/id/cosmic_term.ftl @@ -4,7 +4,7 @@ repository = Repositori support = Dukungan color-schemes = Skema warna cosmic-terminal = Terminal COSMIC -rename = Ganti Nama +rename = Ganti nama export = Ekspor delete = Hapus import = Impor diff --git a/i18n/kab/cosmic_term.ftl b/i18n/kab/cosmic_term.ftl index 368b6f2..1761fee 100644 --- a/i18n/kab/cosmic_term.ftl +++ b/i18n/kab/cosmic_term.ftl @@ -1,9 +1,9 @@ -cancel = Semmet +cancel = Sefsex name = Isem delete = kkes rename = Snifel isem -quit = Ffeɣ -support = Tallelt +quit = Tuffɣa +support = Tallalt repository = Asarsay settings = Iɣewwaṛen appearance = Timeẓri @@ -14,7 +14,7 @@ paste = Senteḍ select-all = Fren akk view = Wali menu-settings = Iɣewwaṛen… -match-desktop = Semṣada akked tnarit +match-desktop = Amṣada d tnarit file = Afaylu new-window = Asfaylu amaynut edit = Ẓreg diff --git a/i18n/kmr/cosmic_term.ftl b/i18n/kmr/cosmic_term.ftl index 4348691..8cfa2dc 100644 --- a/i18n/kmr/cosmic_term.ftl +++ b/i18n/kmr/cosmic_term.ftl @@ -27,7 +27,7 @@ light = Ronî advanced = Pêşketî support = Piştgirî default-font = Cûrenivîs -paste = Pê ve bike +paste = Pêve bike menu-settings = Sazkarî... command-line = Rêza fermanê view = Dîtin @@ -100,7 +100,7 @@ focus-pane-left = Balê bikişîne ser destgeha çepê focus-pane-right = Balê bikişîne ser destgeha rastê focus-pane-up = Balê bikişîne ser destgeha jorîn password-manager = Rêveberê borînpeyvê -paste-primary = A sereke pê ve bike +paste-primary = A sereke pêve bike reset-to-default = Vegere rewşa berdest shortcut-capture-hint = Kombînasyona kilîtan bitikîne shortcut-replace-body = { $binding } berê ji bo { $existing } hatiye destnîşankirin. Tu dixwazî bi { $new_action } re biguherînî? diff --git a/i18n/oc/cosmic_term.ftl b/i18n/oc/cosmic_term.ftl index 50030da..0f74e05 100644 --- a/i18n/oc/cosmic_term.ftl +++ b/i18n/oc/cosmic_term.ftl @@ -1,14 +1,7 @@ -settings = Configuracion +settings = Paramètres appearance = Aparéncia theme = Tèma match-desktop = Assortir al burèu -dark = Escur +dark = Fosc light = Clar file = Fichièr -name = Nom -repository = Depaus -cancel = Anullar -menu-settings = Configuracion... -quit = Quitar -delete = Suprimir -replace = Remplaçar diff --git a/i18n/pl/cosmic_term.ftl b/i18n/pl/cosmic_term.ftl index 25c3027..6af669e 100644 --- a/i18n/pl/cosmic_term.ftl +++ b/i18n/pl/cosmic_term.ftl @@ -1,5 +1,5 @@ cosmic-terminal = Terminal COSMIC -comment = Emulator terminala dla środowiska COSMIC +comment = Emulator terminala dla pulpitu COSMIC keywords = Cli;WierszPoleceń;Powłoka;Terminal; new-terminal = Nowy terminal @@ -73,7 +73,7 @@ advanced = Zaawansowane show-headerbar = Pokaż pasek nagłówka show-header-description = Ukazuje pasek nagłówka z menu wybieranego prawym przyciskiem myszki # Find -find-placeholder = Wyszukaj… +find-placeholder = Szukaj… find-previous = Znajdź poprzedni find-next = Znajdź następny @@ -96,7 +96,7 @@ edit = Edytuj copy = Kopiuj paste = Wklej select-all = Zaznacz wszystko -find = Wyszukaj +find = Szukaj clear-scrollback = Wyczyść przewijanie ## View diff --git a/i18n/th/cosmic_term.ftl b/i18n/th/cosmic_term.ftl index f95e682..32ec77d 100644 --- a/i18n/th/cosmic_term.ftl +++ b/i18n/th/cosmic_term.ftl @@ -39,8 +39,8 @@ settings = การตั้งค่า appearance = ลักษณะ theme = ธีม match-desktop = ใช้ตามธีมหน้าจอหลัก -dark = มืด -light = สว่าง +dark = ธีมมืด +light = ธีมสว่าง syntax-dark = โทนสีมืด syntax-light = โทนสีสว่าง default-zoom-step = ระยะซูม @@ -109,8 +109,3 @@ pane-toggle-maximize = ขยายให้ใหญ่สุด menu-color-schemes = โทนสี... menu-settings = การตั้งค่า... menu-about = เกี่ยวกับ เทอร์มินัล COSMIC... -cancel = ยกเลิก -reset-to-default = รีเซ็ตเป็นค่าเริ่มต้น -type-to-search = พิมพ์เพื่อค้นหา -add-another-keybinding = เพิ่มคีย์ลัดเพิ่มเติม -replace = แทนที่ diff --git a/i18n/zh-TW/cosmic_term.ftl b/i18n/zh-TW/cosmic_term.ftl index 7cebc95..3fa61a6 100644 --- a/i18n/zh-TW/cosmic_term.ftl +++ b/i18n/zh-TW/cosmic_term.ftl @@ -10,7 +10,7 @@ new-terminal = 新建終端機 ## Color schemes color-schemes = 配色方案 -rename = 重新命名 +rename = 重命名 export = 匯出 delete = 刪除 import = 匯入 diff --git a/src/config.rs b/src/config.rs index 2137165..caedf4d 100644 --- a/src/config.rs +++ b/src/config.rs @@ -232,33 +232,17 @@ pub struct Config { pub profiles: BTreeMap, pub show_headerbar: bool, pub show_pane_borders: bool, - /// [yoda] Voile posé sur les panneaux non focalisés, en pourcentage - /// (`unfocused-split-opacity` de Ghostty : 0,7 d'opacité = 30 % de voile). - #[serde(default = "default_unfocused_pane_dim")] - pub unfocused_pane_dim: u8, pub use_bright_bold: bool, pub syntax_theme_dark: String, pub syntax_theme_light: String, pub focus_follow_mouse: bool, #[serde(default)] pub tab_new_inherit_working_directory: bool, - /// [yoda] Copier aussi la sélection dans le presse-papiers, et pas - /// seulement dans la sélection primaire (`copy-on-select = clipboard` de - /// Ghostty). - #[serde(default)] - pub copy_on_select_clipboard: bool, pub default_profile: Option, #[serde(default)] pub shortcuts_custom: Shortcuts, } -/// Voile maximal des panneaux non focalisés : Ghostty borne leur opacité à 0,15. -pub const UNFOCUSED_PANE_DIM_MAX: u8 = 85; - -fn default_unfocused_pane_dim() -> u8 { - 30 -} - impl Default for Config { fn default() -> Self { Self { @@ -269,7 +253,6 @@ impl Default for Config { dim_font_weight: Weight::NORMAL.0, focus_follow_mouse: false, tab_new_inherit_working_directory: false, - copy_on_select_clipboard: false, font_name: "Noto Sans Mono".to_string(), font_size: 14, font_size_zoom_step_mul_100: 100, @@ -279,7 +262,6 @@ impl Default for Config { profiles: BTreeMap::new(), show_headerbar: true, show_pane_borders: false, - unfocused_pane_dim: default_unfocused_pane_dim(), syntax_theme_dark: COSMIC_THEME_DARK.to_string(), syntax_theme_light: COSMIC_THEME_LIGHT.to_string(), use_bright_bold: false, @@ -361,12 +343,6 @@ impl Config { Metrics::new(font_size, line_height) } - /// Opacité du voile des panneaux non focalisés ; `None` si désactivé. - pub fn unfocused_pane_dim_ratio(&self) -> Option { - let dim = self.unfocused_pane_dim.min(UNFOCUSED_PANE_DIM_MAX); - (dim > 0).then(|| f32::from(dim) / 100.0) - } - pub fn opacity_ratio(&self) -> f32 { f32::from(self.opacity) / 100.0 } @@ -428,22 +404,3 @@ impl Config { })[&self.font_stretch] } } - -#[cfg(test)] -mod tests { - use super::{Config, UNFOCUSED_PANE_DIM_MAX}; - - #[test] - fn unfocused_pane_dim_ratio() { - let mut config = Config::default(); - // Défaut de Ghostty : opacité 0,7, soit 30 % de voile - assert_eq!(config.unfocused_pane_dim_ratio(), Some(0.3)); - config.unfocused_pane_dim = 0; - assert_eq!(config.unfocused_pane_dim_ratio(), None); - config.unfocused_pane_dim = 100; - assert_eq!( - config.unfocused_pane_dim_ratio(), - Some(f32::from(UNFOCUSED_PANE_DIM_MAX) / 100.0) - ); - } -} diff --git a/src/desktop_notify.rs b/src/desktop_notify.rs deleted file mode 100644 index 4ad9821..0000000 --- a/src/desktop_notify.rs +++ /dev/null @@ -1,185 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -//! Notifications de bureau des OSC 9 / 777 (yoda). -//! -//! On parle directement à `org.freedesktop.Notifications` plutôt que de passer -//! par notify-rust : au clic, cosmic-notifications émet `ActivationToken` puis -//! `ActionInvoked`, et c'est ce jeton xdg-activation qui permet de ramener la -//! fenêtre au premier plan sur le bon onglet. -//! -//! Une notification par onglet au plus : la suivante remplace la précédente -//! (`replaces_id`). - -use cosmic::{ - Application, - iced::{ - Subscription, - futures::{SinkExt, channel::mpsc::Sender}, - stream, - }, - widget::{pane_grid, segmented_button}, -}; -use std::{any::TypeId, collections::HashMap}; -use tokio::sync::mpsc; - -use crate::fl; - -/// Onglet à l'origine d'une notification. -pub type TabKey = (pane_grid::Pane, segmented_button::Entity); - -/// Demande envoyée par l'application à la tâche D-Bus. -#[derive(Debug)] -pub enum Request { - Show { - tab: TabKey, - summary: String, - body: String, - }, -} - -/// Événement renvoyé par la tâche D-Bus à l'application. -#[derive(Clone, Debug)] -pub enum Event { - /// Canal prêt : l'application peut envoyer ses demandes. - Ready(mpsc::UnboundedSender), - /// L'utilisateur a cliqué la notification de cet onglet. - Activated { tab: TabKey, token: Option }, -} - -#[zbus::proxy( - interface = "org.freedesktop.Notifications", - default_service = "org.freedesktop.Notifications", - default_path = "/org/freedesktop/Notifications" -)] -trait Notifications { - #[allow(clippy::too_many_arguments)] - fn notify( - &self, - app_name: &str, - replaces_id: u32, - app_icon: &str, - summary: &str, - body: &str, - actions: &[&str], - hints: HashMap<&str, zbus::zvariant::Value<'_>>, - expire_timeout: i32, - ) -> zbus::Result; - - #[zbus(signal)] - fn action_invoked(&self, id: u32, action_key: String) -> zbus::Result<()>; - - #[zbus(signal)] - fn activation_token(&self, id: u32, activation_token: String) -> zbus::Result<()>; - - #[zbus(signal)] - fn notification_closed(&self, id: u32, reason: u32) -> zbus::Result<()>; -} - -struct DesktopNotifySubscription; - -pub fn subscription() -> Subscription { - Subscription::run_with(TypeId::of::(), |_| { - stream::channel(16, |mut output: Sender| async move { - let (request_tx, request_rx) = mpsc::unbounded_channel(); - if output.send(Event::Ready(request_tx)).await.is_err() { - return; - } - if let Err(err) = run(request_rx, output).await { - log::warn!("desktop notifications unavailable: {err}"); - } - }) - }) -} - -async fn run( - mut request_rx: mpsc::UnboundedReceiver, - mut output: Sender, -) -> zbus::Result<()> { - use cosmic::iced::futures::StreamExt; - - let connection = zbus::Connection::session().await?; - let proxy = NotificationsProxy::new(&connection).await?; - let mut tokens = proxy.receive_activation_token().await?; - let mut invoked = proxy.receive_action_invoked().await?; - let mut closed = proxy.receive_notification_closed().await?; - - let app_name = fl!("cosmic-terminal"); - let show_label = fl!("notification-show"); - let mut tab_by_id: HashMap = HashMap::new(); - let mut id_by_tab: HashMap = HashMap::new(); - let mut pending_tokens: HashMap = HashMap::new(); - - loop { - tokio::select! { - request = request_rx.recv() => { - let Some(Request::Show { tab, summary, body }) = request else { - return Ok(()); - }; - let replaces_id = id_by_tab.get(&tab).copied().unwrap_or(0); - let body = neutralize_markup(&body); - let hints = HashMap::from([ - ("desktop-entry", zbus::zvariant::Value::from(crate::App::APP_ID)), - ("urgency", zbus::zvariant::Value::U8(1)), - ]); - match proxy - .notify( - &app_name, - replaces_id, - crate::App::APP_ID, - &summary, - &body, - &["default", &show_label], - hints, - -1, - ) - .await - { - Ok(id) => { - if replaces_id != 0 && replaces_id != id { - tab_by_id.remove(&replaces_id); - } - tab_by_id.insert(id, tab); - id_by_tab.insert(tab, id); - } - Err(err) => log::warn!("failed to send desktop notification: {err}"), - } - } - Some(signal) = tokens.next() => { - if let Ok(args) = signal.args() - && tab_by_id.contains_key(args.id()) - { - pending_tokens.insert(*args.id(), args.activation_token().clone()); - } - } - Some(signal) = invoked.next() => { - if let Ok(args) = signal.args() - && let Some(tab) = tab_by_id.get(args.id()).copied() - { - let token = pending_tokens.remove(args.id()); - if output.send(Event::Activated { tab, token }).await.is_err() { - return Ok(()); - } - } - } - Some(signal) = closed.next() => { - if let Ok(args) = signal.args() - && let Some(tab) = tab_by_id.remove(args.id()) - { - if id_by_tab.get(&tab) == Some(args.id()) { - id_by_tab.remove(&tab); - } - pending_tokens.remove(args.id()); - } - } - } - } -} - -/// Le corps d'une notification est du balisage (`body-markup`). Échapper `<` -/// en `<` serait conforme à la spécification, mais cosmic-notifications ne -/// décode pas les entités (il afficherait `<`), et un `<` brut y avale le -/// texte qui suit. Les chevrons deviennent donc des guillemets simples -/// d'aspect voisin, lisibles sur tous les serveurs. -fn neutralize_markup(body: &str) -> String { - body.replace('<', "‹").replace('>', "›") -} diff --git a/src/kitty_keyboard.rs b/src/kitty_keyboard.rs deleted file mode 100644 index df24628..0000000 --- a/src/kitty_keyboard.rs +++ /dev/null @@ -1,697 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -//! Protocole clavier kitty (yoda). -//! -//! Avec `kitty_keyboard` actif, alacritty_terminal tient la pile des modes -//! (`CSI > n u`, `CSI < n u`, `CSI = n ; m u`) et répond à la requête -//! `CSI ? u`. Il n'encode en revanche aucune touche : c'est le rôle du frontal, -//! donc de ce module. Il ne sert que quand l'application au premier plan a -//! demandé le protocole ; sinon l'encodage legacy de `terminal_box` s'applique -//! seul. -//! -//! C'est ce qui donne Shift+Entrée (`CSI 13;2u`) à Claude Code, qui interroge -//! le terminal avec `CSI ? u` au démarrage. -//! -//! Spécification : . La -//! découpe suit l'encodeur du frontal Alacritty (`alacritty/src/input/keyboard.rs`). -//! -//! Limites : les drapeaux 2 (types d'événements), 4 (touches alternatives) et -//! 16 (texte associé) ne sont honorés qu'avec le drapeau 1 (désambiguïsation) -//! ou 8 (toutes les touches), ce que font toutes les applications connues. -//! La touche de la disposition de base (3e champ du drapeau 4) n'est pas -//! envoyée, et Caps Lock / Num Lock ne figurent pas dans les modificateurs -//! (iced ne les expose pas). - -use alacritty_terminal::term::TermMode; -use cosmic::iced::keyboard::{Key, Location, Modifiers, key::Named}; - -/// Nature de l'événement clavier. -#[derive(Clone, Copy, Debug, Eq, PartialEq)] -pub enum KeyAction { - Press, - Repeat, - Release, -} - -/// Événement clavier tel que livré par iced. -pub struct KeyInput<'a> { - /// Touche sans aucun modificateur (`key_without_modifiers` de winit). - pub key: &'a Key, - /// Touche avec Shift (et AltGr) appliqués, mais pas Ctrl (`logical_key`). - pub modified_key: &'a Key, - pub location: Location, - pub modifiers: Modifiers, - /// Texte produit, tous modificateurs appliqués. - pub text: Option<&'a str>, - pub action: KeyAction, -} - -const SHIFT: u8 = 1; -const ALT: u8 = 2; -const CTRL: u8 = 4; -const SUPER: u8 = 8; - -/// Le protocole kitty pilote-t-il l'encodage des touches ? -pub fn active(mode: TermMode) -> bool { - mode.intersects(TermMode::DISAMBIGUATE_ESC_CODES | TermMode::REPORT_ALL_KEYS_AS_ESC) -} - -/// Octets à envoyer au PTY quand [`active`] est vrai. Vide : rien à envoyer. -pub fn encode(input: &KeyInput, mode: TermMode) -> Vec { - let all = mode.contains(TermMode::REPORT_ALL_KEYS_AS_ESC); - let mods = modifier_bits(input); - let named = match input.modified_key { - Key::Named(named) => Some(*named), - _ => None, - }; - - if input.action == KeyAction::Release { - if !mode.contains(TermMode::REPORT_EVENT_TYPES) { - return Vec::new(); - } - // Pas de relâchement d'Entrée, Tab et Retour arrière hors « toutes les - // touches » : le shell qui reprend la main après un plantage les - // recevrait. - if !all && matches!(named, Some(Named::Enter | Named::Tab | Named::Backspace)) { - return Vec::new(); - } - return build_sequence(input, mode, mods).unwrap_or_default(); - } - - // Sans modificateur, Entrée, Tab et Retour arrière gardent leurs octets - // legacy (spécification : un `reset` doit rester tapable). L'Entrée du - // pavé numérique, elle, a son code dédié. - if !all && mods == 0 && input.location != Location::Numpad { - match named { - Some(Named::Enter) => return b"\r".to_vec(), - Some(Named::Tab) => return b"\t".to_vec(), - Some(Named::Backspace) => return b"\x7f".to_vec(), - _ => {} - } - } - - let text = printable_text(input); - let as_sequence = all - || text.is_none() - || named == Some(Named::Escape) - || (mods != 0 && mods != SHIFT) - || (mods == SHIFT && matches!(named, Some(Named::Enter | Named::Tab | Named::Backspace))); - - if as_sequence { - build_sequence(input, mode, mods).unwrap_or_default() - } else { - text.unwrap_or_default().as_bytes().to_vec() - } -} - -/// Texte imprimable produit par la touche, s'il y en a un. -fn printable_text<'a>(input: &KeyInput<'a>) -> Option<&'a str> { - input - .text - .filter(|text| !text.is_empty() && !text.chars().any(char::is_control)) -} - -fn modifier_bits(input: &KeyInput) -> u8 { - let mut bits = 0; - if input.modifiers.shift() { - bits |= SHIFT; - } - if input.modifiers.alt() { - bits |= ALT; - } - if input.modifiers.control() { - bits |= CTRL; - } - if input.modifiers.logo() { - bits |= SUPER; - } - // Pour une touche de modification, l'état rapporté est celui qui suit - // l'événement : le bit est posé à l'appui, retiré au relâchement. - let own = match input.modified_key { - Key::Named(Named::Shift) => SHIFT, - Key::Named(Named::Alt) => ALT, - Key::Named(Named::Control) => CTRL, - Key::Named(Named::Super) => SUPER, - _ => 0, - }; - if input.action == KeyAction::Release { - bits & !own - } else { - bits | own - } -} - -/// Terminateur d'une séquence : `u` pour les codes kitty, sinon le final -/// legacy (`A`, `~`…) que le protocole conserve pour les touches de fonction. -#[derive(Clone, Copy)] -enum Final { - Kitty, - Legacy(char), -} - -fn build_sequence(input: &KeyInput, mode: TermMode, mods: u8) -> Option> { - let event_type = mode.contains(TermMode::REPORT_EVENT_TYPES) - && matches!(input.action, KeyAction::Repeat | KeyAction::Release); - let associated_text = printable_text(input).filter(|_| { - mode.contains(TermMode::REPORT_ASSOCIATED_TEXT) && input.action != KeyAction::Release - }); - // Le paramètre par défaut vaut 1 : `CSI A` plutôt que `CSI 1 A`. - let explicit = mods != 0 || event_type || associated_text.is_some(); - - let (payload, terminator) = numpad(input) - .or_else(|| functional(input, explicit)) - .or_else(|| special(input, mode)) - .or_else(|| textual(input, mode, associated_text.is_some()))?; - - let mut sequence = format!("\x1b[{payload}"); - if explicit { - sequence.push_str(&format!(";{}", mods + 1)); - } - if event_type { - let kind = match input.action { - KeyAction::Press => '1', - KeyAction::Repeat => '2', - KeyAction::Release => '3', - }; - sequence.push(':'); - sequence.push(kind); - } - if let Some(text) = associated_text { - let codepoints: Vec = text.chars().map(|c| u32::from(c).to_string()).collect(); - sequence.push(';'); - sequence.push_str(&codepoints.join(":")); - } - sequence.push(match terminator { - Final::Kitty => 'u', - Final::Legacy(c) => c, - }); - Some(sequence.into_bytes()) -} - -/// Pavé numérique : codes kitty dédiés (57399 et suivants). -fn numpad(input: &KeyInput) -> Option<(String, Final)> { - if input.location != Location::Numpad { - return None; - } - let code = match input.modified_key { - Key::Character(c) => match c.as_str() { - "0" => 57399, - "1" => 57400, - "2" => 57401, - "3" => 57402, - "4" => 57403, - "5" => 57404, - "6" => 57405, - "7" => 57406, - "8" => 57407, - "9" => 57408, - "." | "," => 57409, - "/" => 57410, - "*" => 57411, - "-" => 57412, - "+" => 57413, - "=" => 57415, - _ => return None, - }, - Key::Named(named) => match named { - Named::Enter => 57414, - Named::ArrowLeft => 57417, - Named::ArrowRight => 57418, - Named::ArrowUp => 57419, - Named::ArrowDown => 57420, - Named::PageUp => 57421, - Named::PageDown => 57422, - Named::Home => 57423, - Named::End => 57424, - Named::Insert => 57425, - Named::Delete => 57426, - Named::Clear => 57427, - _ => return None, - }, - Key::Unidentified => return None, - }; - Some((code.to_string(), Final::Kitty)) -} - -/// Touches de fonction : finals legacy conservés par le protocole, sauf F3 -/// (`CSI R` serait pris pour un rapport de position du curseur) et F13+. -fn functional(input: &KeyInput, explicit: bool) -> Option<(String, Final)> { - let Key::Named(named) = input.modified_key else { - return None; - }; - let one = if explicit { "1" } else { "" }; - let (payload, terminator) = match named { - Named::ArrowUp => (one, Final::Legacy('A')), - Named::ArrowDown => (one, Final::Legacy('B')), - Named::ArrowRight => (one, Final::Legacy('C')), - Named::ArrowLeft => (one, Final::Legacy('D')), - Named::End => (one, Final::Legacy('F')), - Named::Home => (one, Final::Legacy('H')), - Named::F1 => (one, Final::Legacy('P')), - Named::F2 => (one, Final::Legacy('Q')), - Named::F3 => ("13", Final::Legacy('~')), - Named::F4 => (one, Final::Legacy('S')), - Named::Insert => ("2", Final::Legacy('~')), - Named::Delete => ("3", Final::Legacy('~')), - Named::PageUp => ("5", Final::Legacy('~')), - Named::PageDown => ("6", Final::Legacy('~')), - Named::F5 => ("15", Final::Legacy('~')), - Named::F6 => ("17", Final::Legacy('~')), - Named::F7 => ("18", Final::Legacy('~')), - Named::F8 => ("19", Final::Legacy('~')), - Named::F9 => ("20", Final::Legacy('~')), - Named::F10 => ("21", Final::Legacy('~')), - Named::F11 => ("23", Final::Legacy('~')), - Named::F12 => ("24", Final::Legacy('~')), - _ => { - let code = match named { - Named::F13 => 57376, - Named::F14 => 57377, - Named::F15 => 57378, - Named::F16 => 57379, - Named::F17 => 57380, - Named::F18 => 57381, - Named::F19 => 57382, - Named::F20 => 57383, - Named::F21 => 57384, - Named::F22 => 57385, - Named::F23 => 57386, - Named::F24 => 57387, - Named::CapsLock => 57358, - Named::ScrollLock => 57359, - Named::NumLock => 57360, - Named::PrintScreen => 57361, - Named::Pause => 57362, - Named::ContextMenu => 57363, - Named::MediaPlay => 57428, - Named::MediaPause => 57429, - Named::MediaPlayPause => 57430, - Named::MediaStop => 57432, - Named::MediaFastForward => 57433, - Named::MediaRewind => 57434, - Named::MediaTrackNext => 57435, - Named::MediaTrackPrevious => 57436, - Named::MediaRecord => 57437, - Named::AudioVolumeDown => 57438, - Named::AudioVolumeUp => 57439, - Named::AudioVolumeMute => 57440, - _ => return None, - }; - return Some((code.to_string(), Final::Kitty)); - } - }; - Some((payload.to_string(), terminator)) -} - -/// Touches de contrôle (Entrée, Tab, Échap, Retour arrière, Espace) et, avec -/// « toutes les touches », les touches de modification elles-mêmes. -fn special(input: &KeyInput, mode: TermMode) -> Option<(String, Final)> { - let code = match input.modified_key { - Key::Named(Named::Enter) => 13, - Key::Named(Named::Tab) => 9, - Key::Named(Named::Escape) => 27, - Key::Named(Named::Backspace) => 127, - Key::Character(c) if c == " " => 32, - Key::Named(modifier) if mode.contains(TermMode::REPORT_ALL_KEYS_AS_ESC) => { - let right = input.location == Location::Right; - match (modifier, right) { - (Named::Shift, false) => 57441, - (Named::Control, false) => 57442, - (Named::Alt, false) => 57443, - (Named::Super, false) => 57444, - (Named::Hyper, false) => 57445, - (Named::Meta, false) => 57446, - (Named::Shift, true) => 57447, - (Named::Control, true) => 57448, - (Named::Alt, true) => 57449, - (Named::Super, true) => 57450, - (Named::Hyper, true) => 57451, - (Named::Meta, true) => 57452, - (Named::AltGraph, _) => 57453, - _ => return None, - } - } - _ => return None, - }; - Some((code.to_string(), Final::Kitty)) -} - -/// Touches de caractère : code de la touche non décalée, suivi de la touche -/// décalée si le drapeau 4 le demande (`CSI 97:65;6u` pour Ctrl+Shift+A). -fn textual(input: &KeyInput, mode: TermMode, has_text: bool) -> Option<(String, Final)> { - let Key::Character(shifted) = input.modified_key else { - return None; - }; - let mut chars = shifted.chars(); - let (Some(shifted_char), None) = (chars.next(), chars.next()) else { - // Plusieurs caractères pour une touche : seul « toutes les touches » - // avec texte associé sait le dire, par le code 0. - return (mode.contains(TermMode::REPORT_ALL_KEYS_AS_ESC) && has_text) - .then(|| ("0".to_string(), Final::Kitty)); - }; - - let unshifted_char = if input.modifiers.shift() { - shifted_char.to_lowercase().next().unwrap_or(shifted_char) - } else { - shifted_char - }; - let mut code = u32::from(unshifted_char); - let alternate = u32::from(shifted_char); - // `!` n'a pas de minuscule : la touche de base est celle sans modificateur - // (`1` en QWERTY ; `&` pour le `1` de l'AZERTY). - if code == alternate - && let Key::Character(base) = input.key - && let Some(base_char) = base.chars().next() - { - code = u32::from(base_char); - } - - let payload = if mode.contains(TermMode::REPORT_ALTERNATE_KEYS) && alternate != code { - format!("{code}:{alternate}") - } else { - code.to_string() - }; - Some((payload, Final::Kitty)) -} - -#[cfg(test)] -mod tests { - use super::*; - - const DISAMBIGUATE: TermMode = TermMode::DISAMBIGUATE_ESC_CODES; - - fn ch(c: &str) -> Key { - Key::Character(c.into()) - } - - fn named(n: Named) -> Key { - Key::Named(n) - } - - fn press( - key: Key, - modified: Key, - modifiers: Modifiers, - text: Option<&str>, - mode: TermMode, - ) -> String { - event(key, modified, modifiers, text, KeyAction::Press, mode) - } - - fn event( - key: Key, - modified: Key, - modifiers: Modifiers, - text: Option<&str>, - action: KeyAction, - mode: TermMode, - ) -> String { - let input = KeyInput { - key: &key, - modified_key: &modified, - location: Location::Standard, - modifiers, - text, - action, - }; - String::from_utf8(encode(&input, mode)).unwrap() - } - - #[test] - fn shift_enter_for_claude_code() { - let enter = || named(Named::Enter); - assert_eq!( - press(enter(), enter(), Modifiers::SHIFT, Some("\r"), DISAMBIGUATE), - "\x1b[13;2u" - ); - assert_eq!( - press(enter(), enter(), Modifiers::CTRL, Some("\r"), DISAMBIGUATE), - "\x1b[13;5u" - ); - // Entrée seule reste `\r` - assert_eq!( - press(enter(), enter(), Modifiers::empty(), Some("\r"), DISAMBIGUATE), - "\r" - ); - } - - #[test] - fn escape_tab_backspace() { - let esc = || named(Named::Escape); - assert_eq!( - press(esc(), esc(), Modifiers::empty(), Some("\x1b"), DISAMBIGUATE), - "\x1b[27u" - ); - let tab = || named(Named::Tab); - assert_eq!( - press(tab(), tab(), Modifiers::empty(), Some("\t"), DISAMBIGUATE), - "\t" - ); - assert_eq!( - press(tab(), tab(), Modifiers::SHIFT, Some("\t"), DISAMBIGUATE), - "\x1b[9;2u" - ); - let bs = || named(Named::Backspace); - assert_eq!( - press(bs(), bs(), Modifiers::empty(), Some("\x08"), DISAMBIGUATE), - "\x7f" - ); - assert_eq!( - press(bs(), bs(), Modifiers::CTRL, Some("\x08"), DISAMBIGUATE), - "\x1b[127;5u" - ); - } - - #[test] - fn text_keys() { - // Texte simple ou décalé : envoyé tel quel - assert_eq!( - press(ch("a"), ch("a"), Modifiers::empty(), Some("a"), DISAMBIGUATE), - "a" - ); - assert_eq!( - press(ch("a"), ch("A"), Modifiers::SHIFT, Some("A"), DISAMBIGUATE), - "A" - ); - assert_eq!( - press(ch("é"), ch("é"), Modifiers::empty(), Some("é"), DISAMBIGUATE), - "é" - ); - // Ctrl et Alt : séquences - assert_eq!( - press(ch("c"), ch("c"), Modifiers::CTRL, Some("\x03"), DISAMBIGUATE), - "\x1b[99;5u" - ); - assert_eq!( - press(ch("a"), ch("a"), Modifiers::ALT, Some("a"), DISAMBIGUATE), - "\x1b[97;3u" - ); - assert_eq!( - press(ch(" "), ch(" "), Modifiers::CTRL, Some("\0"), DISAMBIGUATE), - "\x1b[32;5u" - ); - } - - #[test] - fn alternate_keys() { - let mode = DISAMBIGUATE | TermMode::REPORT_ALTERNATE_KEYS; - assert_eq!( - press( - ch("a"), - ch("A"), - Modifiers::CTRL | Modifiers::SHIFT, - Some("\x01"), - mode - ), - "\x1b[97:65;6u" - ); - // AZERTY : Ctrl+Shift+& donne « 1 » - assert_eq!( - press( - ch("&"), - ch("1"), - Modifiers::CTRL | Modifiers::SHIFT, - None, - mode - ), - "\x1b[38:49;6u" - ); - // Sans le drapeau 4, pas d'alternative - assert_eq!( - press( - ch("a"), - ch("A"), - Modifiers::CTRL | Modifiers::SHIFT, - Some("\x01"), - DISAMBIGUATE - ), - "\x1b[97;6u" - ); - } - - #[test] - fn functional_keys() { - let up = || named(Named::ArrowUp); - assert_eq!( - press(up(), up(), Modifiers::empty(), None, DISAMBIGUATE), - "\x1b[A" - ); - assert_eq!( - press(up(), up(), Modifiers::CTRL, None, DISAMBIGUATE), - "\x1b[1;5A" - ); - let f3 = || named(Named::F3); - assert_eq!( - press(f3(), f3(), Modifiers::empty(), None, DISAMBIGUATE), - "\x1b[13~" - ); - let del = || named(Named::Delete); - assert_eq!( - press(del(), del(), Modifiers::SHIFT, None, DISAMBIGUATE), - "\x1b[3;2~" - ); - } - - #[test] - fn event_types() { - let mode = DISAMBIGUATE | TermMode::REPORT_EVENT_TYPES; - assert_eq!( - event( - ch("a"), - ch("a"), - Modifiers::empty(), - None, - KeyAction::Release, - mode - ), - "\x1b[97;1:3u" - ); - assert_eq!( - event( - ch("a"), - ch("a"), - Modifiers::CTRL, - Some("\x01"), - KeyAction::Repeat, - mode - ), - "\x1b[97;5:2u" - ); - // Pas de relâchement d'Entrée hors « toutes les touches » - let enter = || named(Named::Enter); - assert_eq!( - event( - enter(), - enter(), - Modifiers::empty(), - None, - KeyAction::Release, - mode - ), - "" - ); - // Ni de relâchement du tout sans le drapeau 2 - assert_eq!( - event( - ch("a"), - ch("a"), - Modifiers::empty(), - None, - KeyAction::Release, - DISAMBIGUATE - ), - "" - ); - } - - #[test] - fn report_all_keys() { - let mode = TermMode::REPORT_ALL_KEYS_AS_ESC | TermMode::REPORT_ASSOCIATED_TEXT; - assert_eq!( - press(ch("a"), ch("a"), Modifiers::empty(), Some("a"), mode), - "\x1b[97;1;97u" - ); - let enter = || named(Named::Enter); - assert_eq!( - press(enter(), enter(), Modifiers::empty(), Some("\r"), mode), - "\x1b[13u" - ); - // Touche de modification : son propre bit est posé à l'appui - let shift = || named(Named::Shift); - assert_eq!( - press(shift(), shift(), Modifiers::empty(), None, mode), - "\x1b[57441;2u" - ); - } - - #[test] - fn numpad_keys() { - let input = |key: &Key, text| { - String::from_utf8(encode( - &KeyInput { - key, - modified_key: key, - location: Location::Numpad, - modifiers: Modifiers::empty(), - text, - action: KeyAction::Press, - }, - DISAMBIGUATE, - )) - .unwrap() - }; - // Un chiffre du pavé produit du texte : envoyé tel quel - assert_eq!(input(&ch("5"), Some("5")), "5"); - // Entrée du pavé n'en produit pas d'imprimable : code dédié - assert_eq!(input(&named(Named::Enter), Some("\r")), "\x1b[57414u"); - } - - #[test] - fn only_with_disambiguate_or_all() { - assert!(!active(TermMode::empty())); - assert!(!active(TermMode::REPORT_EVENT_TYPES)); - assert!(active(DISAMBIGUATE)); - assert!(active(TermMode::REPORT_ALL_KEYS_AS_ESC)); - } - - /// Le terminal répond à `CSI ? u` et applique `CSI > 5 u` dès que - /// `kitty_keyboard` est actif : c'est ce que Claude Code interroge. - #[test] - fn term_reports_and_applies_kitty_modes() { - use alacritty_terminal::{ - Term, - event::{Event, EventListener}, - term::{Config, test::TermSize}, - vte::ansi::Processor, - }; - use std::sync::{Arc, Mutex}; - - #[derive(Clone, Default)] - struct Replies(Arc>>); - impl EventListener for Replies { - fn send_event(&self, event: Event) { - if let Event::PtyWrite(text) = event { - self.0.lock().unwrap().push(text); - } - } - } - - let replies = Replies::default(); - let config = Config { - kitty_keyboard: true, - ..Config::default() - }; - let mut term = Term::new(config, &TermSize::new(80, 24), replies.clone()); - let mut parser: Processor = Processor::new(); - parser.advance(&mut term, b"\x1b[?u\x1b[>5u\x1b[?u"); - - assert_eq!(*replies.0.lock().unwrap(), ["\x1b[?0u", "\x1b[?5u"]); - let mode = *term.mode(); - assert!(mode.contains(TermMode::DISAMBIGUATE_ESC_CODES)); - assert!(mode.contains(TermMode::REPORT_ALTERNATE_KEYS)); - assert!(active(mode)); - - parser.advance(&mut term, b"\x1b[ widget::icon::Icon { /// Tab bar indicator for the monitor state of a terminal: /// an alert icon if one fired, an "armed" icon while monitoring, else none. -/// Un appel d'attention (cloche, notification) passe avant les moniteurs. fn monitor_icon_name(terminal: &Terminal) -> Option<&'static str> { - match terminal.attention { - Some(AttentionKind::Bell) => return Some("notification-alert-symbolic"), - Some(AttentionKind::Notification) => return Some("notification-new-symbolic"), - None => {} - } match terminal.monitor_alert { Some(MonitorKind::Activity) => Some("dialog-information-symbolic"), Some(MonitorKind::Silence) => Some("alarm-symbolic"), Some(MonitorKind::ProcessFinished) => Some("emblem-ok-symbolic"), - None if terminal.read_only => Some("changes-prevent-symbolic"), None if terminal.monitoring_enabled() => Some("view-reveal-symbolic"), None => None, } @@ -314,9 +297,6 @@ fn main() -> Result<(), Box> { // Terminal config setup let term_config = term::Config { scrolling_history: 100_000, - // [yoda] Protocole clavier kitty : alacritty_terminal tient la pile des - // modes et répond à `CSI ? u`, l'encodage est dans `kitty_keyboard`. - kitty_keyboard: true, ..term::Config::default() }; // Set up environmental variables for terminal @@ -391,7 +371,6 @@ pub enum Action { LayoutLoad, LayoutSave, Monitor(MonitorKind), - ToggleReadOnly, PaneFocusDown, PaneFocusLeft, PaneFocusRight, @@ -451,7 +430,6 @@ impl Action { Self::LayoutLoad => Message::LayoutLoad, Self::LayoutSave => Message::LayoutSave, Self::Monitor(monitor_kind) => Message::MonitorToggle(*monitor_kind, entity_opt), - Self::ToggleReadOnly => Message::ReadOnlyToggle(entity_opt), Self::PaneFocusDown => Message::PaneFocusAdjacent(pane_grid::Direction::Down), Self::PaneFocusLeft => Message::PaneFocusAdjacent(pane_grid::Direction::Left), Self::PaneFocusRight => Message::PaneFocusAdjacent(pane_grid::Direction::Right), @@ -559,7 +537,6 @@ pub enum Message { ShortcutSearch(String), MonitorTick, MonitorToggle(MonitorKind, Option), - ReadOnlyToggle(Option), MouseEnter(pane_grid::Pane), Opacity(u8), PaneClicked(pane_grid::Pane), @@ -589,19 +566,16 @@ pub enum Message { ReorderTab(Pane, ReorderEvent), SaveOutput(Option), SaveOutputResult(pane_grid::Pane, segmented_button::Entity, DialogResult), - Surface(surface::Action), + Surface(surface::Action), SelectAll(Option), ShowAdvancedFontSettings(bool), ShowHeaderBar(bool), SshConnect(usize), ShowPaneBorders(bool), - UnfocusedPaneDim(u8), SyntaxTheme(ColorSchemeKind, usize), SystemThemeChange, TabNewInheritWorkingDirectory(bool), - CopyOnSelectClipboard(bool), - SelectionDone(pane_grid::Pane, segmented_button::Entity), TabActivate(segmented_button::Entity), TabActivateJump(usize), TabClose(Option), @@ -618,9 +592,7 @@ pub enum Message { TabRenameCancel, TabRenameResetToDefault, TermEvent(pane_grid::Pane, segmented_button::Entity, TermEvent), - TermEventTx(mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, PtyEvent)>), - TermOsc(pane_grid::Pane, segmented_button::Entity, OscEvent), - DesktopNotify(desktop_notify::Event), + TermEventTx(mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, TermEvent)>), ToggleFullscreen, ToggleContextPage(ContextPage), UpdateDefaultProfile((bool, ProfileId)), @@ -632,6 +604,7 @@ pub enum Message { ZoomIn, ZoomOut, ZoomReset, + ContextMenuPopupClosed(window::Id), } #[derive(Clone, Copy, Debug, Eq, PartialEq)] @@ -686,9 +659,7 @@ pub struct App { find_search_id: widget::Id, find_search_value: String, term_event_tx_opt: - Option>, - notify_tx_opt: Option>, - window_focused: bool, + Option>, startup_options: Option, startup_profile_id: Option, term_config: term::Config, @@ -711,56 +682,19 @@ pub struct App { shortcut_search_regex: Option, shortcut_search_value: String, modifiers: Modifiers, + context_menu_popup: Option<( + window::Id, + pane_grid::Pane, + segmented_button::Entity, + Option, + widget::Id, + cosmic::iced::Point, + )>, #[cfg(feature = "password_manager")] password_mgr: password_manager::PasswordManager, } impl App { - /// L'onglet est-il sous les yeux de l'utilisateur : onglet actif du panneau - /// focalisé, dans une fenêtre qui a le focus. - fn tab_in_view(&self, pane: pane_grid::Pane, entity: segmented_button::Entity) -> bool { - self.window_focused - && self.pane_model.focused() == pane - && self - .pane_model - .panes - .get(pane) - .is_some_and(|tab_model| tab_model.active() == entity) - } - - /// Allume l'indicateur d'attention d'un onglet ; il s'éteint quand - /// l'onglet reprend le focus (voir `TerminalPaneGrid::update_terminal_focus`). - fn set_tab_attention( - &mut self, - pane: pane_grid::Pane, - entity: segmented_button::Entity, - kind: AttentionKind, - ) { - let Some(tab_model) = self.pane_model.panes.get_mut(pane) else { - return; - }; - let mut icon_update = None; - if let Some(terminal) = tab_model.data::>(entity) { - let mut terminal = terminal.lock().unwrap(); - // Une notification n'est pas rétrogradée en simple cloche - if terminal.attention != Some(AttentionKind::Notification) { - terminal.attention = Some(kind); - icon_update = Some(monitor_icon_name(&terminal)); - } - } - if let Some(icon_name) = icon_update { - monitor_update_tab_icon(tab_model, entity, icon_name); - } - } - - /// Recale le focus des terminaux après un changement d'onglet : l'onglet - /// quitté reçoit son focus-out (mode 1004), le nouvel onglet son focus-in. - fn sync_terminal_focus(&mut self) { - if self.window_focused && !self.core.window.show_context && self.rename_tab.is_none() { - self.pane_model.update_terminal_focus(); - } - } - fn theme_names(&self, color_scheme_kind: ColorSchemeKind) -> &Vec { match color_scheme_kind { ColorSchemeKind::Dark => &self.theme_names_dark, @@ -1736,15 +1670,6 @@ impl App { .add( widget::settings::item::builder(fl!("show-pane-borders")) .toggler(self.config.show_pane_borders, Message::ShowPaneBorders), - ) - .add( - widget::settings::item::builder(fl!("unfocused-pane-dim")) - .description(format!("{}%", self.config.unfocused_pane_dim)) - .control(widget::slider( - 0..=config::UNFOCUSED_PANE_DIM_MAX, - self.config.unfocused_pane_dim, - Message::UnfocusedPaneDim, - )), ); let advanced_section = widget::settings::section() @@ -1761,14 +1686,6 @@ impl App { self.config.tab_new_inherit_working_directory, Message::TabNewInheritWorkingDirectory, ), - ) - .add( - widget::settings::item::builder(fl!("copy-on-select-clipboard")) - .description(fl!("copy-on-select-clipboard-description")) - .toggler( - self.config.copy_on_select_clipboard, - Message::CopyOnSelectClipboard, - ), ); widget::settings::view_column(vec![ @@ -1823,22 +1740,6 @@ impl App { } } - fn terminal_read_only(&self, pane: pane_grid::Pane, entity: segmented_button::Entity) -> bool { - self.pane_model - .panes - .get(pane) - .and_then(|tab_model| tab_model.data::>(entity)) - .is_some_and(|terminal| terminal.lock().unwrap().read_only) - } - - fn active_terminal_read_only(&self) -> bool { - let pane = self.pane_model.focused(); - self.pane_model - .panes - .get(pane) - .is_some_and(|tab_model| self.terminal_read_only(pane, tab_model.active())) - } - fn active_terminal_monitors(&self) -> (bool, bool, bool) { let pane = self.pane_model.focused(); if let Some(tab_model) = self.pane_model.panes.get(pane) { @@ -2098,7 +1999,6 @@ impl App { log::warn!("tried to create new tab before having event channel"); } } - self.sync_terminal_focus(); self.update_title(Some(pane)) } } @@ -2294,8 +2194,6 @@ impl Application for App { startup_profile_id: flags.startup_profile_id, term_config: flags.term_config, term_event_tx_opt: None, - notify_tx_opt: None, - window_focused: true, color_scheme_errors: Vec::new(), color_scheme_expanded: None, color_scheme_renaming: None, @@ -2315,6 +2213,7 @@ impl Application for App { shortcut_search_regex: None, shortcut_search_value: String::new(), modifiers: Modifiers::empty(), + context_menu_popup: None, #[cfg(feature = "password_manager")] password_mgr: Default::default(), }; @@ -3064,20 +2963,6 @@ impl Application for App { } } } - Message::ReadOnlyToggle(entity_opt) => { - if let Some(tab_model) = self.pane_model.active_mut() { - let entity = entity_opt.unwrap_or_else(|| tab_model.active()); - let mut icon_update = None; - if let Some(terminal) = tab_model.data::>(entity) { - let mut terminal = terminal.lock().unwrap(); - terminal.read_only = !terminal.read_only; - icon_update = Some(monitor_icon_name(&terminal)); - } - if let Some(icon_name) = icon_update { - monitor_update_tab_icon(tab_model, entity, icon_name); - } - } - } Message::MonitorToggle(monitor_kind, entity_opt) => { if let Some(tab_model) = self.pane_model.active_mut() { let entity = entity_opt.unwrap_or_else(|| tab_model.active()); @@ -3414,24 +3299,6 @@ impl Application for App { return self.update_config(); } } - Message::CopyOnSelectClipboard(copy_on_select_clipboard) => { - if copy_on_select_clipboard != self.config.copy_on_select_clipboard { - config_set!(copy_on_select_clipboard, copy_on_select_clipboard); - } - } - Message::SelectionDone(pane, entity) => { - // [yoda] Copie à la sélection vers le presse-papiers ; la - // sélection primaire, elle, suit le relâchement du bouton. - if self.config.copy_on_select_clipboard - && let Some(tab_model) = self.pane_model.panes.get(pane) - && let Some(terminal) = tab_model.data::>(entity) - { - let text = terminal.lock().unwrap().term.lock().selection_to_string(); - if let Some(text) = text.filter(|text| !text.is_empty()) { - return clipboard::write(text); - } - } - } Message::TabNewInheritWorkingDirectory(tab_new_inherit_working_directory) => { config_set!( tab_new_inherit_working_directory, @@ -3443,12 +3310,6 @@ impl Application for App { config_set!(show_pane_borders, show_pane_borders); } } - Message::UnfocusedPaneDim(dim) => { - config_set!( - unfocused_pane_dim, - cmp::min(config::UNFOCUSED_PANE_DIM_MAX, dim) - ); - } Message::UseBrightBold(use_bright_bold) => { if use_bright_bold != self.config.use_bright_bold { config_set!(use_bright_bold, use_bright_bold); @@ -3516,7 +3377,6 @@ impl Application for App { monitor_update_tab_icon(tab_model, entity, icon_name); } } - self.sync_terminal_focus(); return self.update_title(None); } Message::TabActivateJump(pos) => { @@ -3570,11 +3430,19 @@ impl Application for App { } } - self.sync_terminal_focus(); return self.update_title(None); } Message::TabContextAction(entity, action) => { + // Close context menu popup let mut tasks = Vec::new(); + if let Some((_popup_id, _, _, _, _, _)) = self.context_menu_popup.take() { + #[cfg(feature = "wayland")] + if is_wayland() { + tasks.push(cosmic::task::message(Message::Surface( + cosmic::surface::action::destroy_popup(_popup_id), + ))); + } + } // Close terminal context menu state if let Some(tab_model) = self.pane_model.active() && let Some(terminal) = tab_model.data::>(entity) @@ -3583,8 +3451,11 @@ impl Application for App { //Some actions need the menu_state, //so only clear the position for them. match action { - // these read the link from the menu state and clear it themselves - Action::LaunchUrlByMenu | Action::CopyUrlByMenu => {} + Action::LaunchUrlByMenu | Action::CopyUrlByMenu => { + if let Some(context_menu) = terminal.context_menu.as_mut() { + context_menu.position = None; + } + } _ => { terminal.context_menu = None; } @@ -3594,29 +3465,94 @@ impl Application for App { return cosmic::Task::batch(tasks); } Message::TabContextMenu(pane, menu_state) => { + #[allow(unused_mut)] + let mut tasks = Vec::new(); + + // Close existing context menu popup if any + if let Some((_popup_id, _, _, _, _, _)) = self.context_menu_popup.take() { + #[cfg(feature = "wayland")] + if is_wayland() { + tasks.push(cosmic::task::message(Message::Surface( + cosmic::surface::action::destroy_popup(_popup_id), + ))); + } + } + // Clear all terminal context_menu state for (_, tab_model) in self.pane_model.panes.iter() { for entity in tab_model.iter() { if let Some(terminal) = tab_model.data::>(entity) { let mut terminal = terminal.lock().unwrap(); - if terminal.context_menu.take().is_some() { - terminal.active_regex_match = None; - terminal.needs_update = true; - } + terminal.context_menu = None; } } } - // A right press records what is under the cursor - if let Some(menu_state) = menu_state - && let Some(tab_model) = self.pane_model.panes.get(pane) - { - let entity = tab_model.active(); - if let Some(terminal) = tab_model.data::>(entity) { - terminal.lock().unwrap().context_menu = Some(menu_state); + if let Some(menu_state) = menu_state { + if let Some(_position) = menu_state.position { + let local_position = menu_state.local_position.unwrap_or(_position); + if let Some(tab_model) = self.pane_model.panes.get(pane) { + let entity = tab_model.active(); + let link = menu_state.link.clone(); + let popup_id = window::Id::unique(); + + if let Some(terminal) = tab_model.data::>(entity) { + let mut terminal = terminal.lock().unwrap(); + terminal.context_menu = Some(menu_state); + } + + self.context_menu_popup = Some(( + popup_id, + pane, + entity, + link, + widget::Id::unique(), + local_position, + )); + + #[cfg(feature = "wayland")] + if is_wayland() { + let main_window = self.core.main_window_id().unwrap(); + let pos_x = _position.x as i32; + let pos_y = _position.y as i32; + + tasks.push(cosmic::task::message(Message::Surface( + cosmic::surface::action::app_popup( + |_| Default::default(), + move |_app: &mut Self| { + use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity}; + use cosmic::iced::runtime::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}; + + SctkPopupSettings { + parent: main_window, + id: popup_id, + positioner: SctkPositioner { + size: None, + anchor_rect: cosmic::iced::Rectangle { + x: pos_x, + y: pos_y, + width: 1, + height: 1, + }, + anchor: Anchor::None, + gravity: Gravity::BottomRight, + reactive: true, + ..Default::default() + }, + parent_size: None, + grab: true, + close_with_children: false, + input_zone: None, + } + }, None), + ))); + } + } } self.pane_model.set_focus(pane); } + + return cosmic::Task::batch(tasks); } Message::TabNew => { // The profile from `--profile` only applies to the first tab @@ -3740,13 +3676,7 @@ impl Application for App { Message::TermEvent(pane, entity, event) => { match event { TermEvent::Bell => { - // Comme le défaut de Ghostty (`bell-features = attention,title`), - // sans la demande d'attention xdg-activation : cosmic-comp donne - // un jeton valide à toute application non sandboxée, la fenêtre - // volerait le focus. Il reste l'indicateur d'onglet. - if !self.tab_in_view(pane, entity) { - self.set_tab_attention(pane, entity, AttentionKind::Bell); - } + //TODO: audible or visible bell options? } TermEvent::ClipboardLoad(kind, callback) => { match kind { @@ -3780,7 +3710,7 @@ impl Application for App { let terminal = terminal.lock().unwrap(); let rgb = terminal.effective_color(index); let text = f(rgb); - terminal.respond(text.into_bytes()); + terminal.input_no_scroll(text.into_bytes()); } } TermEvent::CursorBlinkingChange => { @@ -3794,7 +3724,7 @@ impl Application for App { && let Some(terminal) = tab_model.data::>(entity) { let terminal = terminal.lock().unwrap(); - terminal.respond(text.into_bytes()); + terminal.input_no_scroll(text.into_bytes()); } } TermEvent::ResetTitle => { @@ -3819,7 +3749,7 @@ impl Application for App { { let terminal = terminal.lock().unwrap(); let text = f(terminal.size().into()); - terminal.respond(text.into_bytes()); + terminal.input_no_scroll(text.into_bytes()); } } TermEvent::Title(title) => { @@ -3906,76 +3836,6 @@ impl Application for App { // Spawn first tab return self.update(Message::TabNew); } - Message::TermOsc(pane, entity, event) => match event { - OscEvent::Notify { title, body } => { - // Rien à signaler pour l'onglet qu'on a sous les yeux - if self.tab_in_view(pane, entity) { - return Task::none(); - } - self.set_tab_attention(pane, entity, AttentionKind::Notification); - - let Some(tab_model) = self.pane_model.panes.get(pane) else { - return Task::none(); - }; - let allowed = tab_model - .data::>(entity) - .is_some_and(|terminal| { - terminal - .lock() - .unwrap() - .notify_allowed(title.as_deref(), &body) - }); - if !allowed { - return Task::none(); - } - - // Titre de la séquence, suivi de l'onglet d'où elle vient : - // plusieurs sessions Claude Code se distinguent ainsi. - let tab_title = tab_model.text(entity).unwrap_or_default().to_string(); - let summary = match title { - Some(title) if !tab_title.is_empty() && title != tab_title => { - format!("{title} · {tab_title}") - } - Some(title) => title, - None if !tab_title.is_empty() => tab_title, - None => fl!("cosmic-terminal"), - }; - if let Some(notify_tx) = &self.notify_tx_opt { - let _ = notify_tx.send(desktop_notify::Request::Show { - tab: (pane, entity), - summary, - body, - }); - } - } - }, - Message::DesktopNotify(event) => match event { - desktop_notify::Event::Ready(notify_tx) => { - self.notify_tx_opt = Some(notify_tx); - } - desktop_notify::Event::Activated { - tab: (pane, entity), - token, - } => { - // Clic sur la notification : retour à l'onglet d'origine, - // puis la fenêtre au premier plan avec le jeton - // xdg-activation fourni par le serveur de notifications. - let mut tasks = Vec::new(); - if let Some(tab_model) = self.pane_model.panes.get_mut(pane) - && tab_model.contains_item(entity) - { - tab_model.activate(entity); - self.pane_model.set_focus(pane); - tasks.push(self.update(Message::TabActivate(entity))); - } - if let Some(token) = token { - tasks.push(Task::done(cosmic::Action::Cosmic( - cosmic::app::Action::Activate(token), - ))); - } - return Task::batch(tasks); - } - }, Message::ToggleContextPage(context_page) => { if self.context_page == context_page { self.core.window.show_context = !self.core.window.show_context; @@ -4066,14 +3926,12 @@ impl Application for App { } }, Message::WindowFocused => { - self.window_focused = true; if !self.core.window.show_context { self.pane_model.update_terminal_focus(); } return self.update_focus(); } Message::WindowUnfocused => { - self.window_focused = false; self.pane_model.unfocus_all_terminals(); } Message::ZoomIn => { @@ -4086,8 +3944,26 @@ impl Application for App { self.reset_active_pane_zoom(); return self.update_config(); } + Message::ContextMenuPopupClosed(id) => { + if let Some((popup_id, pane, entity, _, _, _)) = &self.context_menu_popup + && id == *popup_id + { + // Clear link underline on the terminal + if let Some(tab_model) = self.pane_model.panes.get(*pane) + && let Some(terminal) = tab_model.data::>(*entity) + { + let mut terminal = terminal.lock().unwrap(); + terminal.context_menu = None; + terminal.active_regex_match = None; + terminal.needs_update = true; + } + self.context_menu_popup = None; + } + } Message::Surface(a) => { - return cosmic::task::message(cosmic::Action::Surface(a)); + return cosmic::task::message(cosmic::Action::Cosmic( + cosmic::app::Action::Surface(a), + )); } Message::ReorderTab( pane, @@ -4222,7 +4098,6 @@ impl Application for App { &self.config, &self.key_binds, self.active_terminal_monitors(), - self.active_terminal_read_only(), &self.ssh_hosts, )] } @@ -4237,7 +4112,32 @@ impl Application for App { ] } + fn on_close_requested(&self, id: window::Id) -> Option { + if let Some((popup_id, _, _, _, _, _)) = &self.context_menu_popup + && id == *popup_id + { + return Some(Message::ContextMenuPopupClosed(id)); + } + None + } + fn view_window(&self, window_id: window::Id) -> Element<'_, Message> { + if let Some((popup_id, pane, entity, ref link, ref autosize_id, _)) = + self.context_menu_popup + && window_id == popup_id + { + return widget::autosize::autosize( + menu::context_menu( + &self.config, + &self.key_binds, + entity, + link.clone(), + self.terminal_monitors(pane, entity), + ), + autosize_id.clone(), + ) + .into(); + } match &self.dialog_opt { Some(dialog) => dialog.view(window_id), None => widget::text("Unknown window ID").into(), @@ -4326,51 +4226,51 @@ impl Application for App { terminal_box = terminal_box.on_mouse_enter(move || Message::MouseEnter(pane)); } - if self.config.copy_on_select_clipboard { - terminal_box = - terminal_box.on_selection_done(move || Message::SelectionDone(pane, entity)); + // If a context menu popup is active for this pane, inform the + // terminal_box so it will emit on_context_menu(None) on click + // to dismiss the popup. + if self.context_menu_popup.is_some() { + terminal_box = terminal_box.context_menu(cosmic::iced::Point::ORIGIN); } - // [yoda] Voile sur les panneaux non focalisés (à la Ghostty), seulement - // quand il y en a plusieurs : on voit d'un coup d'œil où l'on tape. - if let Some(dim) = self.config.unfocused_pane_dim_ratio() - && self.pane_model.panes.panes.len() > 1 - && pane != self.pane_model.focused() - { - terminal_box = terminal_box.dim(dim); - } + let use_wayland_popup = { + #[cfg(feature = "wayland")] + { + is_wayland() + } + #[cfg(not(feature = "wayland"))] + { + false + } + }; - // The terminal records what was under the right press; the widget opens the - // menu on release, so build it from that state - let context_link = terminal - .lock() - .unwrap() - .context_menu - .as_ref() - .map(|menu_state| menu_state.link.clone()); - if context_link.is_some() { - terminal_box = terminal_box.context_menu_open(true); - } - let mut context_menu = widget::context_menu( - terminal_box, - context_link.map(|link| { - menu::context_menu( - &self.config, - &self.key_binds, - entity, - link, - self.terminal_monitors(pane, entity), - self.terminal_read_only(pane, entity), - ) - }), - ) - .item_width(widget::menu::ItemWidth::Uniform(360)) - .on_close(Message::TabContextMenu(pane, None)) - .on_surface_action(Message::Surface); - if let Some(window_id) = self.core.main_window_id() { - context_menu = context_menu.window_id(window_id); - } - tab_column = tab_column.push(context_menu); + let tab_element: Element<'_, Message> = if !use_wayland_popup { + // Fallback: render context menu as an inline popover + if let Some((_, popup_pane, popup_entity, ref link, _, point)) = + self.context_menu_popup + { + if pane == popup_pane { + let mut popover = widget::popover(terminal_box.context_menu(point)); + popover = popover + .popup(menu::context_menu( + &self.config, + &self.key_binds, + popup_entity, + link.clone(), + self.terminal_monitors(popup_pane, popup_entity), + )) + .position(widget::popover::Position::Point(point)); + popover.into() + } else { + terminal_box.into() + } + } else { + terminal_box.into() + } + } else { + terminal_box.into() + }; + tab_column = tab_column.push(tab_element); } //Only draw find in the currently focused pane @@ -4509,18 +4409,16 @@ impl Application for App { output.send(Message::TermEventTx(event_tx)).await.unwrap(); while let Some((pane, entity, event)) = event_rx.recv().await { - let message = match event { - PtyEvent::Term(event) => Message::TermEvent(pane, entity, event), - PtyEvent::Osc(event) => Message::TermOsc(pane, entity, event), - }; - output.send(message).await.unwrap(); + output + .send(Message::TermEvent(pane, entity, event)) + .await + .unwrap(); } panic!("terminal event channel closed"); }, ) }), - desktop_notify::subscription().map(Message::DesktopNotify), cosmic_config::config_subscription( TypeId::of::(), Self::APP_ID.into(), @@ -4553,6 +4451,14 @@ impl Application for App { } } +#[cfg(feature = "wayland")] +fn is_wayland() -> bool { + matches!( + cosmic::app::cosmic::windowing_system(), + Some(cosmic::app::cosmic::WindowingSystem::Wayland) + ) +} + /// Divider color painted behind the pane grid to form pane borders. /// /// When blur is active the transparent container must be used, otherwise the diff --git a/src/menu.rs b/src/menu.rs index 7fc4fed..e75046b 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -1,15 +1,17 @@ // SPDX-License-Identifier: GPL-3.0-only -use cosmic::widget::menu::action::MenuAction; +use cosmic::iced::Point; use cosmic::widget::menu::key_bind::KeyBind; use cosmic::widget::menu::{Item as MenuItem, menu_button}; +use cosmic::widget::space; use cosmic::{ Element, app::Core, iced::core::Border, - iced::{Background, Length}, + iced::{Background, Length, advanced::widget::text::Style as TextStyle}, + theme, widget::{ - self, + self, divider, menu::{ItemHeight, ItemWidth}, responsive_menu_bar, segmented_button, }, @@ -21,94 +23,147 @@ use crate::{Action, ColorSchemeId, ColorSchemeKind, Config, Message, fl, termina static MENU_ID: LazyLock = LazyLock::new(|| cosmic::widget::Id::new("responsive-menu")); -/// What the terminal found under the right-click #[derive(Debug, Clone)] pub struct MenuState { + pub position: Option, + pub local_position: Option, pub link: Option, } -/// A context menu action dispatched to the tab the menu was opened on. -#[derive(Clone, Copy, Debug, Eq, PartialEq)] -pub struct TabAction(pub segmented_button::Entity, pub Action); - -impl MenuAction for TabAction { - type Message = Message; - - fn message(&self) -> Message { - Message::TabContextAction(self.0, self.1) - } -} - -pub fn context_menu( +pub fn context_menu<'a>( config: &Config, key_binds: &HashMap, entity: segmented_button::Entity, link: Option, monitors: (bool, bool, bool), - read_only: bool, -) -> Vec> { - let item = - |label: String, action: Action| MenuItem::Button(label, None, TabAction(entity, action)); - let check = |label: String, value: bool, action: Action| { - MenuItem::CheckBox(label, None, value, TabAction(entity, action)) +) -> Element<'a, Message> { + let find_key = |action: &Action| -> String { + for (key_bind, key_action) in key_binds { + if action == key_action { + return key_bind.to_string(); + } + } + String::new() + }; + fn key_style(theme: &cosmic::Theme) -> TextStyle { + let mut color = theme.cosmic().background(theme.transparent).component.on; + color.alpha *= 0.75; + TextStyle { + color: Some(color.into()), + ..Default::default() + } + } + + let menu_item = |label, action| { + let key = find_key(&action); + menu_button(vec![ + widget::text(label).into(), + space::horizontal().into(), + widget::text(key) + .class(theme::Text::Custom(key_style)) + .into(), + ]) + .on_press(Message::TabContextAction(entity, action)) }; - let mut items = vec![ - item(fl!("new-tab"), Action::TabNew), - item(fl!("rename-tab"), Action::TabRename), - MenuItem::Divider, - item(fl!("copy"), Action::Copy), - item(fl!("paste"), Action::Paste), - item(fl!("select-all"), Action::SelectAll), - MenuItem::Divider, - item(fl!("clear-scrollback"), Action::ClearScrollback), - item(fl!("save-output"), Action::SaveOutput), - MenuItem::Divider, - check( + let menu_checkbox = |label, value, action| { + menu_button(vec![ + widget::text(label).into(), + widget::space::horizontal().into(), + widget::toggler(value) + .on_toggle(move |_| Message::TabContextAction(entity, action)) + .size(16.0) + .into(), + ]) + .on_press(Message::TabContextAction(entity, action)) + }; + + let mut rows = vec![ + Element::from(menu_item(fl!("copy"), Action::Copy)), + Element::from(menu_item(fl!("paste"), Action::Paste)), + Element::from(menu_item(fl!("select-all"), Action::SelectAll)), + Element::from(divider::horizontal::light()), + Element::from(menu_item(fl!("clear-scrollback"), Action::ClearScrollback)), + Element::from(menu_item(fl!("save-output"), Action::SaveOutput)), + Element::from(divider::horizontal::light()), + Element::from(menu_checkbox( fl!("monitor-activity"), monitors.0, Action::Monitor(MonitorKind::Activity), - ), - check( + )), + Element::from(menu_checkbox( fl!("monitor-silence"), monitors.1, Action::Monitor(MonitorKind::Silence), - ), - check( + )), + Element::from(menu_checkbox( fl!("monitor-process-finished"), monitors.2, Action::Monitor(MonitorKind::ProcessFinished), - ), - check(fl!("read-only"), read_only, Action::ToggleReadOnly), - MenuItem::Divider, - item(fl!("split-horizontal"), Action::PaneSplitHorizontal), - item(fl!("split-vertical"), Action::PaneSplitVertical), - item(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized), - MenuItem::Divider, - MenuItem::CheckBox( - fl!("window-header"), - None, - config.show_headerbar, - TabAction(entity, Action::ShowHeaderBar(!config.show_headerbar)), - ), - MenuItem::Divider, + )), + Element::from(divider::horizontal::light()), + Element::from(menu_item( + fl!("split-horizontal"), + Action::PaneSplitHorizontal, + )), + Element::from(menu_item(fl!("split-vertical"), Action::PaneSplitVertical)), + Element::from(menu_item( + fl!("pane-toggle-maximize"), + Action::PaneToggleMaximized, + )), + Element::from(divider::horizontal::light()), + Element::from(menu_item(fl!("new-tab"), Action::TabNew)), + Element::from(menu_item(fl!("rename-tab"), Action::TabRename)), + Element::from(menu_item(fl!("menu-settings"), Action::Settings)), + Element::from(menu_item(fl!("menu-about"), Action::About)), ]; #[cfg(feature = "password_manager")] - items.push(item(fl!("menu-password-manager"), Action::PasswordManager)); - items.push(item(fl!("menu-settings"), Action::Settings)); - items.push(item(fl!("menu-about"), Action::About)); - // If we have a link, prepend the link items - if link.is_some() { - items.insert(0, item(fl!("open-link"), Action::LaunchUrlByMenu)); - items.insert(1, item(fl!("copy-link"), Action::CopyUrlByMenu)); - items.insert(2, MenuItem::Divider); + { + rows.push(Element::from(menu_item( + fl!("menu-password-manager"), + Action::PasswordManager, + ))); } + rows.push(Element::from(menu_checkbox( + fl!("show-headerbar"), + config.show_headerbar, + Action::ShowHeaderBar(!config.show_headerbar), + ))); - let key_binds: HashMap = key_binds - .iter() - .map(|(key_bind, action)| (key_bind.clone(), TabAction(entity, *action))) - .collect(); - widget::menu::items(&key_binds, items) + //If we have a link + //prepend the Open Link item + if link.is_some() { + rows.insert( + 0, + Element::from(menu_item(fl!("open-link"), Action::LaunchUrlByMenu)), + ); + rows.insert( + 1, + Element::from(menu_item(fl!("copy-link"), Action::CopyUrlByMenu)), + ); + rows.insert(2, Element::from(divider::horizontal::light())); + } + let content = widget::menu::menu_column::MenuColumn::with_children(rows); + widget::container(content) + .padding(1) + //TODO: move style to libcosmic + .style(|theme| { + let cosmic = theme.cosmic(); + let component = &cosmic.background(theme.transparent).component; + widget::container::Style { + icon_color: Some(component.on.into()), + text_color: Some(component.on.into()), + background: Some(Background::Color(component.base.into())), + border: Border { + radius: cosmic.radius_s().map(|x| x + 1.0).into(), + width: 1.0, + color: component.divider.into(), + }, + ..Default::default() + } + }) + .width(Length::Fixed(360.0)) + .into() } pub fn color_scheme_menu<'a>( @@ -165,7 +220,6 @@ pub fn menu_bar<'a>( config: &Config, key_binds: &HashMap, monitors: (bool, bool, bool), - read_only: bool, ssh_hosts: &[String], ) -> Element<'a, Message> { let mut profile_items = Vec::with_capacity(config.profiles.len()); @@ -267,12 +321,6 @@ pub fn menu_bar<'a>( monitors.2, Action::Monitor(MonitorKind::ProcessFinished), ), - MenuItem::CheckBox( - fl!("read-only"), - None, - read_only, - Action::ToggleReadOnly, - ), MenuItem::Divider, MenuItem::Button( fl!("menu-color-schemes"), diff --git a/src/osc_tap.rs b/src/osc_tap.rs deleted file mode 100644 index 641fab1..0000000 --- a/src/osc_tap.rs +++ /dev/null @@ -1,407 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -//! Séquences OSC que vte ignore, interceptées à la sortie du PTY (yoda). -//! -//! alacritty_terminal 0.25 / vte 0.15 jettent les OSC 9 et 777 (« unhandled -//! osc_dispatch ») : l'application ne les voit jamais. On les repère donc dans -//! les octets lus sur le PTY, juste avant que vte ne les analyse, en -//! enveloppant le `Pty` : ni alacritty_terminal ni vte ne sont forkés. -//! -//! Formes reconnues, comme dans Ghostty : -//! - `OSC 777 ; notify ; titre ; corps` (forme rxvt, canal « ghostty » de -//! Claude Code) ; -//! - `OSC 9 ; texte` (forme iTerm2), sauf les commandes ConEmu -//! `OSC 9 ; N [; …]` (barre de progression `9;4` comprise), qui ne sont pas -//! des notifications. - -/// Taille maximale retenue pour le contenu d'une séquence OSC ; au-delà, la -/// séquence est ignorée jusqu'à son terminateur. -const OSC_MAX_LEN: usize = 4096; -/// Longueur maximale (en caractères) du titre et du corps d'une notification. -const TITLE_MAX_CHARS: usize = 200; -const BODY_MAX_CHARS: usize = 1000; - -/// Événement extrait d'une séquence OSC. -#[derive(Clone, Debug, PartialEq, Eq)] -pub enum OscEvent { - /// Notification de bureau demandée par le programme (OSC 9 ou 777). - Notify { title: Option, body: String }, -} - -#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] -enum State { - #[default] - Ground, - Escape, - Osc, -} - -/// Automate minimal qui suit le flux d'octets du PTY et ne retient que le -/// contenu des séquences OSC. Les séquences peuvent être coupées entre deux -/// lectures : l'état est conservé d'un appel à l'autre. -#[derive(Debug, Default)] -pub struct OscScanner { - state: State, - buf: Vec, - overflow: bool, -} - -impl OscScanner { - pub fn feed(&mut self, bytes: &[u8], emit: &mut dyn FnMut(OscEvent)) { - for &byte in bytes { - match self.state { - State::Ground => { - if byte == 0x1b { - self.state = State::Escape; - } - } - State::Escape => { - self.state = match byte { - b']' => { - self.buf.clear(); - self.overflow = false; - State::Osc - } - 0x1b => State::Escape, - _ => State::Ground, - }; - } - State::Osc => match byte { - // BEL termine la séquence. - 0x07 => { - self.dispatch(emit); - self.state = State::Ground; - } - // ESC termine aussi la séquence, comme dans vte : c'est le - // début de ST (`ESC \`) ou d'une nouvelle séquence. - 0x1b => { - self.dispatch(emit); - self.state = State::Escape; - } - // CAN et SUB annulent la séquence. - 0x18 | 0x1a => self.state = State::Ground, - _ => { - if self.buf.len() < OSC_MAX_LEN { - self.buf.push(byte); - } else { - self.overflow = true; - } - } - }, - } - } - } - - fn dispatch(&mut self, emit: &mut dyn FnMut(OscEvent)) { - if !self.overflow - && let Some(event) = parse_osc(&self.buf) - { - emit(event); - } - self.buf.clear(); - self.overflow = false; - } -} - -/// Interprète le contenu d'une séquence OSC (entre `ESC ]` et le terminateur). -pub fn parse_osc(payload: &[u8]) -> Option { - if let Some(rest) = payload.strip_prefix(b"777;notify;") { - match rest.iter().position(|&b| b == b';') { - Some(i) => notify(&rest[..i], &rest[i + 1..]), - None => notify(b"", rest), - } - } else if let Some(rest) = payload.strip_prefix(b"9;") { - if is_conemu_command(rest) { - None - } else { - notify(b"", rest) - } - } else { - None - } -} - -/// `OSC 9 ; N` ou `OSC 9 ; N ; …` avec N numérique : commande ConEmu -/// (progression, titre d'onglet, répertoire…), pas une notification. -fn is_conemu_command(rest: &[u8]) -> bool { - let digits = rest.iter().take_while(|b| b.is_ascii_digit()).count(); - digits > 0 && matches!(rest.get(digits), None | Some(b';')) -} - -fn notify(title: &[u8], body: &[u8]) -> Option { - let title = clean(title, TITLE_MAX_CHARS); - let body = clean(body, BODY_MAX_CHARS); - match (title.is_empty(), body.is_empty()) { - (true, true) => None, - // Un titre seul devient le corps. - (false, true) => Some(OscEvent::Notify { - title: None, - body: title, - }), - (true, false) => Some(OscEvent::Notify { title: None, body }), - (false, false) => Some(OscEvent::Notify { - title: Some(title), - body, - }), - } -} - -/// UTF-8 tolérant, caractères de contrôle remplacés par des espaces, longueur -/// bornée. -fn clean(bytes: &[u8], max_chars: usize) -> String { - String::from_utf8_lossy(bytes) - .chars() - .map(|c| if c.is_control() { ' ' } else { c }) - .take(max_chars) - .collect::() - .trim() - .to_string() -} - -#[cfg(unix)] -pub use self::unix::OscTapPty; - -#[cfg(unix)] -mod unix { - use super::{OscEvent, OscScanner}; - use alacritty_terminal::{ - event::{OnResize, WindowSize}, - tty::{ChildEvent, EventedPty, EventedReadWrite, Pty}, - }; - use polling::{Event, PollMode, Poller}; - use std::{ - fs::File, - io::{self, Read}, - sync::Arc, - }; - - /// Lecteur du PTY qui passe chaque lecture au [`OscScanner`] avant de la - /// rendre à la boucle d'alacritty_terminal. - pub struct TapReader { - file: File, - scanner: OscScanner, - sink: Box, - } - - impl Read for TapReader { - fn read(&mut self, buf: &mut [u8]) -> io::Result { - let len = self.file.read(buf)?; - self.scanner.feed(&buf[..len], &mut *self.sink); - Ok(len) - } - } - - /// `Pty` d'alacritty_terminal dont la lecture est observée par un - /// [`TapReader`]. Le lecteur lit un duplicata du descripteur maître (même - /// description de fichier, donc même mode non bloquant) ; l'enregistrement - /// auprès du `Poller`, l'écriture, le redimensionnement et la fin du - /// processus restent ceux du `Pty`. - pub struct OscTapPty { - // Déclaré avant `pty` : le duplicata est fermé avant le maître. - reader: TapReader, - pty: Pty, - } - - impl OscTapPty { - pub fn new(pty: Pty, sink: Box) -> io::Result { - let file = pty.file().try_clone()?; - Ok(Self { - reader: TapReader { - file, - scanner: OscScanner::default(), - sink, - }, - pty, - }) - } - } - - impl EventedReadWrite for OscTapPty { - type Reader = TapReader; - type Writer = File; - - unsafe fn register( - &mut self, - poll: &Arc, - interest: Event, - mode: PollMode, - ) -> io::Result<()> { - unsafe { self.pty.register(poll, interest, mode) } - } - - fn reregister( - &mut self, - poll: &Arc, - interest: Event, - mode: PollMode, - ) -> io::Result<()> { - self.pty.reregister(poll, interest, mode) - } - - fn deregister(&mut self, poll: &Arc) -> io::Result<()> { - self.pty.deregister(poll) - } - - fn reader(&mut self) -> &mut TapReader { - &mut self.reader - } - - fn writer(&mut self) -> &mut File { - self.pty.writer() - } - } - - impl EventedPty for OscTapPty { - fn next_child_event(&mut self) -> Option { - self.pty.next_child_event() - } - } - - impl OnResize for OscTapPty { - fn on_resize(&mut self, window_size: WindowSize) { - self.pty.on_resize(window_size); - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - - fn scan(chunks: &[&[u8]]) -> Vec { - let mut scanner = OscScanner::default(); - let mut events = Vec::new(); - for chunk in chunks { - scanner.feed(chunk, &mut |event| events.push(event)); - } - events - } - - fn notify(title: Option<&str>, body: &str) -> OscEvent { - OscEvent::Notify { - title: title.map(str::to_string), - body: body.to_string(), - } - } - - #[test] - fn osc_777_with_bel_and_st() { - assert_eq!( - scan(&[b"x\x1b]777;notify;Claude Code;En attente\x07y"]), - [notify(Some("Claude Code"), "En attente")] - ); - assert_eq!( - scan(&[b"\x1b]777;notify;T;corps; avec point-virgule\x1b\\"]), - [notify(Some("T"), "corps; avec point-virgule")] - ); - } - - #[test] - fn osc_9_text_but_not_conemu() { - assert_eq!( - scan(&[b"\x1b]9;Claude Code: termine\x07"]), - [notify(None, "Claude Code: termine")] - ); - // Commandes ConEmu : progression, avec ou sans argument. - assert!(scan(&[b"\x1b]9;4;1;50\x07\x1b]9;4;0;\x07\x1b]9;12\x07"]).is_empty()); - // Un chiffre suivi d'autre chose qu'un `;` reste du texte. - assert_eq!( - scan(&[b"\x1b]9;3 tests en echec\x07"]), - [notify(None, "3 tests en echec")] - ); - } - - #[test] - fn sequence_split_across_reads() { - assert_eq!( - scan(&[b"\x1b", b"]777;no", b"tify;Ti", b"tre;Co", b"rps\x1b", b"\\"]), - [notify(Some("Titre"), "Corps")] - ); - } - - #[test] - fn other_osc_and_noise_are_ignored() { - assert!(scan(&[b"\x1b]0;titre\x07\x1b]8;;https://x\x1b\\lien\x1b]8;;\x1b\\"]).is_empty()); - assert!(scan(&[b"\x1b]777;notify;;\x07\x1b]9;\x07"]).is_empty()); - // CAN annule la séquence en cours. - assert!(scan(&[b"\x1b]9;annulee\x18\x07"]).is_empty()); - } - - #[test] - fn control_chars_cleaned_and_title_alone_becomes_body() { - assert_eq!( - scan(&[b"\x1b]777;notify;Seul\x07"]), - [notify(None, "Seul")] - ); - assert_eq!( - scan(&[b"\x1b]9;a\tb\x01c\x07"]), - [notify(None, "a b c")] - ); - } - - /// De bout en bout : un vrai processus écrit dans un vrai PTY, lu par la - /// boucle d'alacritty_terminal à travers l'enveloppe. - #[cfg(unix)] - #[test] - fn tap_sees_osc_written_by_child() { - use alacritty_terminal::{ - Term, - event::{Event, EventListener, WindowSize}, - event_loop::EventLoop, - sync::FairMutex, - term::{Config, test::TermSize}, - tty::{self, Options, Shell}, - }; - use std::{sync::Arc, sync::mpsc, time::Duration}; - - #[derive(Clone)] - struct Listener; - impl EventListener for Listener { - fn send_event(&self, _event: Event) {} - } - - let options = Options { - shell: Some(Shell::new( - "printf".into(), - vec!["avant\x1b]777;notify;Titre;Corps\x07apres".into()], - )), - drain_on_exit: true, - ..Default::default() - }; - let window_size = WindowSize { - num_lines: 24, - num_cols: 80, - cell_width: 8, - cell_height: 16, - }; - let pty = tty::new(&options, window_size, 0).unwrap(); - let (tx, rx) = mpsc::channel(); - let pty = OscTapPty::new( - pty, - Box::new(move |event| { - let _ = tx.send(event); - }), - ) - .unwrap(); - let term = Arc::new(FairMutex::new(Term::new( - Config::default(), - &TermSize::new(80, 24), - Listener, - ))); - let event_loop = EventLoop::new(term, Listener, pty, true, false).unwrap(); - let _join = event_loop.spawn(); - - assert_eq!( - rx.recv_timeout(Duration::from_secs(5)).unwrap(), - notify(Some("Titre"), "Corps") - ); - } - - #[test] - fn oversized_sequence_is_dropped() { - let mut long = b"\x1b]9;".to_vec(); - long.extend(std::iter::repeat_n(b'a', OSC_MAX_LEN + 10)); - long.extend(b"\x07\x1b]9;ensuite\x07"); - assert_eq!(scan(&[&long]), [notify(None, "ensuite")]); - } -} diff --git a/src/shortcuts.rs b/src/shortcuts.rs index 768f15e..a04a103 100644 --- a/src/shortcuts.rs +++ b/src/shortcuts.rs @@ -90,7 +90,6 @@ pub enum KeyBindAction { TabPrev, TabRename, ToggleFullscreen, - ToggleReadOnly, WindowClose, WindowNew, ZoomIn, @@ -133,7 +132,6 @@ impl KeyBindAction { Self::TabPrev => Some(Action::TabPrev), Self::TabRename => Some(Action::TabRename), Self::ToggleFullscreen => Some(Action::ToggleFullscreen), - Self::ToggleReadOnly => Some(Action::ToggleReadOnly), Self::WindowClose => Some(Action::WindowClose), Self::WindowNew => Some(Action::WindowNew), Self::ZoomIn => Some(Action::ZoomIn), @@ -297,7 +295,6 @@ pub fn action_label(action: KeyBindAction) -> String { KeyBindAction::TabPrev => fl!("previous-tab"), KeyBindAction::TabRename => fl!("rename-tab"), KeyBindAction::ToggleFullscreen => fl!("toggle-fullscreen"), - KeyBindAction::ToggleReadOnly => fl!("read-only"), KeyBindAction::WindowClose => fl!("close-window"), KeyBindAction::WindowNew => fl!("new-window"), KeyBindAction::ZoomIn => fl!("zoom-in"), @@ -372,11 +369,7 @@ pub fn shortcut_groups() -> Vec { KeyBindAction::ZoomReset, ], }); - let mut other_actions = vec![ - KeyBindAction::ClearScrollback, - KeyBindAction::SaveOutput, - KeyBindAction::ToggleReadOnly, - ]; + let mut other_actions = vec![KeyBindAction::ClearScrollback, KeyBindAction::SaveOutput]; #[cfg(feature = "password_manager")] other_actions.push(KeyBindAction::PasswordManager); groups.push(ShortcutGroup { diff --git a/src/terminal.rs b/src/terminal.rs index 213e5fd..683ac9a 100644 --- a/src/terminal.rs +++ b/src/terminal.rs @@ -27,15 +27,13 @@ use indexmap::IndexSet; use std::{ borrow::Cow, collections::HashMap, - fs, - hash::{DefaultHasher, Hash, Hasher}, - io, mem, + fs, io, mem, path::PathBuf, sync::{ Arc, Mutex, Weak, atomic::{AtomicU32, Ordering}, }, - time::{Duration, Instant}, + time::Instant, }; use tokio::sync::mpsc; @@ -45,7 +43,6 @@ use crate::{ config::{ColorSchemeKind, Config as AppConfig, ProfileId}, menu::MenuState, mouse_reporter::MouseReporter, - osc_tap::OscEvent, }; /// Minimum contrast between a fixed cursor color and the cell's background. @@ -68,28 +65,6 @@ pub enum MonitorKind { /// Seconds without output before a silence alert fires (Konsole default). pub const MONITOR_SILENCE_SECONDS: u64 = 10; -/// Appel d'attention d'un onglet en arrière-plan (yoda). -#[derive(Clone, Copy, Debug, Eq, PartialEq)] -pub enum AttentionKind { - /// Cloche (BEL). - Bell, - /// Notification de bureau (OSC 9 / 777). - Notification, -} - -/// Anti-rafale des notifications d'un onglet, aux valeurs de Ghostty : au plus -/// une par seconde, et une notification identique au plus toutes les 5 s. -const NOTIFY_MIN_INTERVAL: Duration = Duration::from_secs(1); -const NOTIFY_SAME_INTERVAL: Duration = Duration::from_secs(5); - -/// Événement remonté d'un terminal : celui d'alacritty_terminal, ou une -/// séquence OSC interceptée à la sortie du PTY (voir [`crate::osc_tap`]). -#[derive(Debug)] -pub enum PtyEvent { - Term(Event), - Osc(OscEvent), -} - /// https://github.com/alacritty/alacritty/blob/4a7728bf7fac06a35f27f6c4f31e0d9214e5152b/alacritty/src/config/ui_config.rs#L36-L39 fn url_regex_search() -> RegexSearch { let url_regex = "(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file:|git://|ssh:|ftp://)\ @@ -134,13 +109,13 @@ impl From for WindowSize { pub struct EventProxy( pane_grid::Pane, segmented_button::Entity, - mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, PtyEvent)>, + mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, Event)>, ); impl EventListener for EventProxy { fn send_event(&self, event: Event) { //TODO: handle error - let _ = self.2.send((self.0, self.1, PtyEvent::Term(event))); + let _ = self.2.send((self.0, self.1, event)); } } @@ -221,47 +196,23 @@ impl TerminalPaneGrid { self.focus } - pub fn update_terminal_focus(&mut self) { - let focus = self.focus; - for (pane, tab_model) in self.panes.panes.iter_mut() { - let active = tab_model.active(); - let entities: Vec = tab_model.iter().collect(); - for entity in entities { - let mut icon_update = None; - if let Some(terminal) = tab_model.data::>(entity) { - let mut terminal = terminal.lock().unwrap(); - if entity == active { - let focused = focus == *pane; - terminal.set_focused(focused); - terminal.update(); - // Regarder l'onglet acquitte son appel d'attention - if focused && terminal.attention.take().is_some() { - icon_update = Some(crate::monitor_icon_name(&terminal)); - } - } else { - // Onglet en arrière-plan : il perd le focus (rapport - // 1004), sinon un agent qui s'y trouve croit encore - // qu'on le regarde. - terminal.set_focused(false); - } - } - if let Some(icon_name) = icon_update { - crate::monitor_update_tab_icon(tab_model, entity, icon_name); - } + pub fn update_terminal_focus(&self) { + for (pane, tab_model) in self.panes.panes.iter() { + let entity = tab_model.active(); + if let Some(terminal) = tab_model.data::>(entity) { + let mut terminal = terminal.lock().unwrap(); + terminal.set_focused(self.focus == *pane); + terminal.update(); } } } pub fn unfocus_all_terminals(&self) { for tab_model in self.panes.panes.values() { - let active = tab_model.active(); - for entity in tab_model.iter() { - if let Some(terminal) = tab_model.data::>(entity) { - let mut terminal = terminal.lock().unwrap(); - terminal.set_focused(false); - if entity == active { - terminal.update(); - } - } + let entity = tab_model.active(); + if let Some(terminal) = tab_model.data::>(entity) { + let mut terminal = terminal.lock().unwrap(); + terminal.set_focused(false); + terminal.update(); } } } @@ -380,11 +331,6 @@ pub struct Terminal { pub monitor_alert: Option, pub monitor_last_output: Instant, pub monitor_job_running: bool, - pub attention: Option, - notify_last: Option<(Instant, u64)>, - /// [yoda] Lecture seule : aucune saisie de l'utilisateur n'atteint le PTY - /// (touches, collage, souris) ; les réponses du terminal passent toujours. - pub read_only: bool, pub needs_update: bool, pub profile_id_opt: Option, pub tab_title_override: Option, @@ -415,7 +361,7 @@ impl Terminal { pub fn new( pane: pane_grid::Pane, entity: segmented_button::Entity, - event_tx: mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, PtyEvent)>, + event_tx: mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, Event)>, config: Config, options: Options, app_config: &AppConfig, @@ -467,8 +413,6 @@ impl Terminal { cell_width, cell_height, }; - #[cfg(unix)] - let osc_tx = event_tx.clone(); let event_proxy = EventProxy(pane, entity, event_tx); let term = Arc::new(FairMutex::new(Term::new( config, @@ -483,15 +427,6 @@ impl Terminal { #[cfg(windows)] let shell_pid = pty.child_watcher().pid().map(|pid| pid.get()); - // OSC 9 / 777 : interceptés avant vte, qui les ignore - #[cfg(unix)] - let pty = crate::osc_tap::OscTapPty::new( - pty, - Box::new(move |event| { - let _ = osc_tx.send((pane, entity, PtyEvent::Osc(event))); - }), - )?; - let pty_event_loop = EventLoop::new(term.clone(), event_proxy, pty, options.drain_on_exit, false)?; let notifier = Notifier(pty_event_loop.channel()); @@ -515,9 +450,6 @@ impl Terminal { monitor_alert: None, monitor_last_output: Instant::now(), monitor_job_running: false, - attention: None, - notify_last: None, - read_only: false, mouse_reporter: Default::default(), needs_update: true, notifier, @@ -581,25 +513,6 @@ impl Terminal { self.zoom_adj = value; } - /// Anti-rafale des notifications de bureau de cet onglet ; `true` si - /// celle-ci peut partir. - pub fn notify_allowed(&mut self, title: Option<&str>, body: &str) -> bool { - let mut hasher = DefaultHasher::new(); - (title, body).hash(&mut hasher); - let hash = hasher.finish(); - let now = Instant::now(); - if let Some((last, last_hash)) = self.notify_last { - let elapsed = now.duration_since(last); - if elapsed < NOTIFY_MIN_INTERVAL - || (hash == last_hash && elapsed < NOTIFY_SAME_INTERVAL) - { - return false; - } - } - self.notify_last = Some((now, hash)); - true - } - fn set_focused(&mut self, is_focused: bool) { let focus_changed = self.is_focused != is_focused; self.is_focused = is_focused; @@ -611,7 +524,7 @@ impl Terminal { const FOCUS_OUT: &[u8] = b"\x1b[O"; let input = if is_focused { FOCUS_IN } else { FOCUS_OUT }; - self.respond(input); + self.input_no_scroll(input); } } } @@ -624,18 +537,7 @@ impl Terminal { self.with_buffer_mut(|buffer| buffer.set_redraw(redraw)); } - /// Saisie de l'utilisateur vers le PTY ; ignorée en lecture seule. pub fn input_no_scroll>>(&self, input: I) { - if self.read_only { - return; - } - self.notifier.notify(input); - } - - /// [yoda] Réponse du terminal lui-même (rapports demandés par - /// l'application, focus) : jamais bloquée par la lecture seule, sinon - /// l'application attendrait une réponse qui ne vient pas. - pub fn respond>>(&self, input: I) { self.notifier.notify(input); } @@ -653,10 +555,6 @@ impl Terminal { } pub fn input_scroll>>(&self, input: I) { - // En lecture seule, une frappe ne ramène pas non plus la vue en bas - if self.read_only { - return; - } self.input_no_scroll(input); self.scroll(TerminalScroll::Bottom); } @@ -1318,11 +1216,8 @@ impl Terminal { y, ); - // Saisie de l'utilisateur : rien en lecture seule - if !self.read_only { - for code in codes { - self.notifier.notify(code); - } + for code in codes { + self.notifier.notify(code); } } else { self.scroll_as_arrows(delta); @@ -1535,61 +1430,6 @@ impl Drop for Terminal { mod tests { use super::*; - /// Lecture seule, de bout en bout : un vrai `cat` dans un vrai PTY. La - /// saisie bloquée n'arrive pas ; une réponse du terminal, si ; la saisie - /// repasse quand le verrou est levé. - #[cfg(unix)] - #[test] - fn read_only_blocks_input_but_not_replies() { - use std::time::Duration; - - let (_panes, pane) = pane_grid::State::new(()); - let mut model = segmented_button::Model::::default(); - let entity = model.insert().id(); - let (event_tx, _event_rx) = mpsc::unbounded_channel(); - let options = Options { - shell: Some(tty::Shell::new("cat".into(), Vec::new())), - ..Options::default() - }; - let mut terminal = Terminal::new( - pane, - entity, - event_tx, - Config::default(), - options, - &AppConfig::default(), - crate::terminal_theme::cosmic_dark(), - None, - None, - ) - .unwrap(); - - let wait_for = |terminal: &Terminal, needle: &str| { - let deadline = Instant::now() + Duration::from_secs(5); - while Instant::now() < deadline { - if terminal.scrollback_text().contains(needle) { - return true; - } - std::thread::sleep(Duration::from_millis(20)); - } - false - }; - - terminal.read_only = true; - terminal.input_scroll(&b"bloque\n"[..]); - terminal.paste("colle\n".to_string()); - terminal.respond(&b"repond\n"[..]); - assert!(wait_for(&terminal, "repond")); - // Écrites avant la réponse, la saisie et le collage seraient déjà là - let text = terminal.scrollback_text(); - assert!(!text.contains("bloque"), "{text}"); - assert!(!text.contains("colle"), "{text}"); - - terminal.read_only = false; - terminal.input_scroll(&b"libre\n"[..]); - assert!(wait_for(&terminal, "libre")); - } - #[test] fn block_fill_couvre_toute_la_plage_unicode() { // U+2580–U+259F : chaque élément de bloc a sa géométrie native. diff --git a/src/terminal_box.rs b/src/terminal_box.rs index c43d440..6f7f2d3 100644 --- a/src/terminal_box.rs +++ b/src/terminal_box.rs @@ -47,7 +47,7 @@ use std::{ }; use crate::{ - Action, Terminal, TerminalScroll, kitty_keyboard, + Action, Terminal, TerminalScroll, menu::MenuState, terminal::{BlockFill, Metadata}, }; @@ -116,14 +116,12 @@ pub struct TerminalBox<'a, Message> { show_headerbar: bool, pane_border_radius: Option, click_timing: Duration, - context_menu_open: bool, + context_menu: Option, on_context_menu: Option) -> Message + 'a>>, on_mouse_enter: Option Message + 'a>>, opacity: Option, - dim: Option, mouse_inside_boundary: Option, on_middle_click: Option Message + 'a>>, - on_selection_done: Option Message + 'a>>, on_open_hyperlink: Option Message + 'a>>, on_window_focused: Option Message + 'a>>, on_window_unfocused: Option Message + 'a>>, @@ -145,14 +143,12 @@ where show_headerbar: true, pane_border_radius: None, click_timing: Duration::from_millis(500), - context_menu_open: false, + context_menu: None, on_context_menu: None, on_mouse_enter: None, opacity: None, - dim: None, mouse_inside_boundary: None, on_middle_click: None, - on_selection_done: None, key_binds, on_open_hyperlink: None, on_window_focused: None, @@ -192,8 +188,8 @@ where self } - pub fn context_menu_open(mut self, open: bool) -> Self { - self.context_menu_open = open; + pub fn context_menu(mut self, position: Point) -> Self { + self.context_menu = Some(position); self } @@ -210,14 +206,6 @@ where self } - /// [yoda] Fin d'un geste de sélection fait dans ce panneau (glisser, double - /// ou triple clic, Shift+clic) : le moment de copier la sélection. Un - /// simple clic ailleurs dans la fenêtre ne le déclenche pas. - pub fn on_selection_done(mut self, on_selection_done: impl Fn() -> Message + 'a) -> Self { - self.on_selection_done = Some(Box::new(on_selection_done)); - self - } - pub fn on_middle_click(mut self, on_middle_click: impl Fn() -> Message + 'a) -> Self { self.on_middle_click = Some(Box::new(on_middle_click)); self @@ -228,13 +216,6 @@ where self } - /// [yoda] Voile de la couleur du fond posé sur tout le panneau (texte - /// compris), d'opacité `amount` : panneau non focalisé. - pub fn dim(mut self, amount: f32) -> Self { - self.dim = Some(amount); - self - } - pub fn sharp_corners(mut self, sharp_corners: bool) -> Self { self.sharp_corners = sharp_corners; self @@ -272,7 +253,7 @@ where if !state.is_focused { return InputMethod::Disabled; } - if self.context_menu_open { + if self.context_menu.is_some() { return InputMethod::Disabled; } @@ -934,32 +915,6 @@ where } } - // [yoda] Panneau non focalisé : voile de la couleur du fond, comme - // `unfocused-split-opacity` de Ghostty. Calque à part, sinon le texte - // (primitive du même calque) serait tracé par-dessus. - if let Some(dim) = self.dim { - let bg = terminal.metadata_set[terminal.default_attrs().metadata].bg; - renderer.with_layer(layout.bounds(), |renderer| { - renderer.fill_quad( - Quad { - bounds: layout.bounds(), - border: Border { - radius: border_radius, - ..Default::default() - }, - snap: true, - ..Default::default() - }, - Color::from_rgba( - f32::from(bg.r()) / 255.0, - f32::from(bg.g()) / 255.0, - f32::from(bg.b()) / 255.0, - dim, - ), - ); - }); - } - let duration = instant.elapsed(); log::trace!("redraw {}, {}: {:?}", view_w, view_h, duration); } @@ -984,11 +939,7 @@ where let buffer_size = terminal.with_buffer(|buffer| buffer.size()); let is_app_cursor = terminal.term.lock().mode().contains(TermMode::APP_CURSOR); - // [yoda] En lecture seule, la souris revient au terminal : sélection et - // défilement locaux, même dans une application qui la capture. - let is_mouse_mode = terminal.term.lock().mode().intersects(TermMode::MOUSE_MODE) - && !terminal.read_only; - let term_mode = *terminal.term.lock().mode(); + let is_mouse_mode = terminal.term.lock().mode().intersects(TermMode::MOUSE_MODE); match event { Event::Window(event) => match event { cosmic::iced::window::Event::Focused => { @@ -1028,101 +979,6 @@ where } _ => {} }, - // [yoda] Protocole clavier kitty, quand l'application au premier plan - // l'a demandé (voir `kitty_keyboard`) ; sinon encodage legacy plus bas. - Event::Keyboard(KeyEvent::KeyPressed { - key, - modified_key, - physical_key, - location, - modifiers, - text, - repeat, - }) if state.is_focused && kitty_keyboard::active(term_mode) => { - for key_bind in self.key_binds.keys() { - if key_bind.matches(*modifiers, key, Some(physical_key)) { - shell.capture_event(); - return; - } - } - - // Comportements locaux conservés, comme en legacy : Shift+PageUp… - // fait défiler l'historique, Échap annule une sélection. - let local_scroll = match modified_key { - Key::Named(Named::PageUp) if modifiers.shift() => Some(TerminalScroll::PageUp), - Key::Named(Named::PageDown) if modifiers.shift() => { - Some(TerminalScroll::PageDown) - } - Key::Named(Named::Home) if modifiers.shift() => Some(TerminalScroll::Top), - Key::Named(Named::End) if modifiers.shift() => Some(TerminalScroll::Bottom), - _ => None, - }; - if let Some(scroll) = local_scroll { - terminal.scroll(scroll); - shell.capture_event(); - return; - } - if *modified_key == Key::Named(Named::Escape) { - let had_selection = terminal.term.lock().selection.take().is_some(); - if had_selection { - terminal.update(); - shell.capture_event(); - return; - } - } - - let input = kitty_keyboard::KeyInput { - key, - modified_key, - location: *location, - modifiers: *modifiers, - text: text.as_deref(), - action: if *repeat { - kitty_keyboard::KeyAction::Repeat - } else { - kitty_keyboard::KeyAction::Press - }, - }; - let bytes = kitty_keyboard::encode(&input, term_mode); - if !bytes.is_empty() { - // Une touche de modification seule (« toutes les touches ») - // ne ramène pas la vue en bas. - let modifier_only = matches!( - modified_key, - Key::Named(Named::Shift | Named::Control | Named::Alt | Named::Super) - ); - if modifier_only { - terminal.input_no_scroll(bytes); - } else { - terminal.input_scroll(bytes); - } - shell.capture_event(); - } - } - Event::Keyboard(KeyEvent::KeyReleased { - key, - modified_key, - location, - modifiers, - .. - }) if state.is_focused - && kitty_keyboard::active(term_mode) - && term_mode.contains(TermMode::REPORT_EVENT_TYPES) => - { - let input = kitty_keyboard::KeyInput { - key, - modified_key, - location: *location, - modifiers: *modifiers, - text: None, - action: kitty_keyboard::KeyAction::Release, - }; - let bytes = kitty_keyboard::encode(&input, term_mode); - if !bytes.is_empty() { - terminal.input_no_scroll(bytes); - shell.capture_event(); - } - } Event::Keyboard(KeyEvent::KeyPressed { key: Key::Named(named), physical_key, @@ -1238,15 +1094,7 @@ where shell.capture_event(); } Named::Enter => { - // [yoda] Shift+Entrée envoie LF (`\n`, comme Ctrl+J) : saut de - // ligne dans les éditeurs qui ne parlent pas le protocole kitty - // (rustyline de Modjo/Goose) ; pour un shell, c'est Entrée. - let code = if modifiers.shift() && !modifiers.control() { - "\x0A" - } else { - "\x0D" - }; - terminal.input_scroll(format!("{alt_prefix}{code}").into_bytes()); + terminal.input_scroll(format!("{}{}", alt_prefix, "\x0D").into_bytes()); shell.capture_event(); } Named::Escape => { @@ -1544,11 +1392,11 @@ where } // Update context menu state if let Some(on_context_menu) = &self.on_context_menu { - match self.context_menu_open { - true => { + match self.context_menu { + Some(_) => { shell.publish(on_context_menu(None)); } - false => { + None => { if *button == Button::Right { let x = p.x - self.padding.left; let y = p.y - self.padding.top; @@ -1566,7 +1414,15 @@ where None, ); let link = get_hyperlink(&terminal, location); - shell.publish(on_context_menu(Some(MenuState { link }))); + let abs = cosmic::iced::Point::new( + layout.bounds().x + p.x, + layout.bounds().y + p.y, + ); + shell.publish(on_context_menu(Some(MenuState { + position: Some(abs), + local_position: Some(p), + link, + }))); } } } @@ -1591,9 +1447,6 @@ where } } terminal.needs_update = true; - if let Some(on_selection_done) = &self.on_selection_done { - shell.publish(on_selection_done()); - } } if let Some(p) = cursor_position.position_in(layout.bounds()) { let x = p.x - self.padding.left;