From 44b1533dc08db5e877817f1d53ee7bd1bd8655ca Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 17 Jan 2024 13:39:44 -0700 Subject: [PATCH 1/4] Update cosmic-text --- Cargo.lock | 194 ++++++++++++++++++++++----------------------- Cargo.toml | 1 - src/line_number.rs | 1 + 3 files changed, 98 insertions(+), 98 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f58cf5a..5728a45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -365,9 +365,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" dependencies = [ "async-lock 3.3.0", "cfg-if 1.0.0", @@ -375,8 +375,8 @@ dependencies = [ "futures-io", "futures-lite 2.2.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.3.2", + "rustix 0.38.30", "slab", "tracing", "windows-sys 0.52.0", @@ -415,7 +415,7 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.48.0", ] @@ -436,13 +436,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io 2.3.0", "async-lock 2.8.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.30", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -488,7 +488,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.28", + "rustix 0.38.30", "tempfile", "windows-sys 0.48.0", ] @@ -585,9 +585,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] @@ -998,7 +998,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "quote", "syn 1.0.109", @@ -1059,9 +1059,9 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.10.0" -source = "git+https://github.com/pop-os/cosmic-text?branch=refactor#dd4c4cbbe2d5ed5046054b5361a6eeead50e0bb0" +source = "git+https://github.com/pop-os/cosmic-text#8457e68d984c465f7c5306424a73aa162aff32f2" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cosmic_undo_2", "fontdb", "libm", @@ -1074,6 +1074,7 @@ dependencies = [ "swash", "syntect", "sys-locale", + "ttf-parser 0.20.0", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1083,7 +1084,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "almost", "cosmic-config", @@ -1233,7 +1234,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libloading 0.8.1", "winapi", ] @@ -1494,7 +1495,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytemuck", "drm-ffi", "drm-fourcc", @@ -1703,9 +1704,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -2221,9 +2222,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -2242,8 +2243,8 @@ dependencies = [ [[package]] name = "glyphon" -version = "0.3.0" -source = "git+https://github.com/jackpot51/glyphon.git?branch=refactor#c28dc99c86b6b598633e6623096b21632f266976" +version = "0.4.1" +source = "git+https://github.com/jackpot51/glyphon.git#abb70c0fda8cf1a5dfc314c1c778103d7ba951e6" dependencies = [ "cosmic-text", "etagere", @@ -2268,7 +2269,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "gpu-alloc-types", ] @@ -2278,7 +2279,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", ] [[package]] @@ -2301,7 +2302,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "gpu-descriptor-types", "hashbrown 0.14.3", ] @@ -2312,7 +2313,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", ] [[package]] @@ -2494,9 +2495,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -2612,7 +2613,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "iced_accessibility", "iced_core", @@ -2620,14 +2621,14 @@ dependencies = [ "iced_renderer", "iced_widget", "iced_winit", - "image 0.24.7", + "image 0.24.8", "thiserror", ] [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "accesskit", "accesskit_winit", @@ -2636,7 +2637,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "bitflags 1.3.2", "instant", @@ -2652,7 +2653,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "futures", "iced_core", @@ -2665,7 +2666,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2673,7 +2674,7 @@ dependencies = [ "glam", "half", "iced_core", - "image 0.24.7", + "image 0.24.8", "kamadak-exif", "log", "lyon_path", @@ -2688,7 +2689,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2701,7 +2702,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "iced_core", "iced_futures", @@ -2711,7 +2712,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "iced_core", "once_cell", @@ -2721,7 +2722,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "bytemuck", "cosmic-text", @@ -2739,7 +2740,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2759,7 +2760,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "iced_renderer", "iced_runtime", @@ -2773,7 +2774,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "iced_graphics", "iced_runtime", @@ -2840,21 +2841,20 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif 0.12.0", - "jpeg-decoder 0.3.0", - "num-rational 0.4.1", + "jpeg-decoder 0.3.1", "num-traits", - "png 0.17.10", + "png 0.17.11", "qoi", - "tiff 0.9.0", + "tiff 0.9.1", ] [[package]] @@ -2942,7 +2942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.52.0", ] @@ -2978,9 +2978,9 @@ dependencies = [ [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ "rayon", ] @@ -3092,7 +3092,7 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94a1bbdaa5315aa42cf9d5a48be1410968a6e326" +source = "git+https://github.com/pop-os/libcosmic#4e18199444aecbc60f25a12e8adb91926aa5e653" dependencies = [ "apply", "ashpd", @@ -3166,7 +3166,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] @@ -3177,7 +3177,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] @@ -3205,9 +3205,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "locale_config" @@ -3240,9 +3240,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ "hashbrown 0.14.3", ] @@ -3374,7 +3374,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3492,7 +3492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" dependencies = [ "bit-set", - "bitflags 2.4.1", + "bitflags 2.4.2", "codespan-reporting", "hexf-parse", "indexmap", @@ -3668,7 +3668,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if 1.0.0", "libc", ] @@ -3711,7 +3711,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -4303,9 +4303,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "plist" @@ -4335,9 +4335,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.10" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4364,14 +4364,14 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.30", "tracing", "windows-sys 0.52.0", ] @@ -4557,9 +4557,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -4567,9 +4567,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4667,10 +4667,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" dependencies = [ "gif 0.12.0", - "jpeg-decoder 0.3.0", + "jpeg-decoder 0.3.1", "log", "pico-args", - "png 0.17.10", + "png 0.17.11", "rgb", "svgtypes", "tiny-skia 0.11.3", @@ -4716,7 +4716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.4.1", + "bitflags 2.4.2", "serde", "serde_derive", ] @@ -4817,14 +4817,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -4844,7 +4844,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytemuck", "libm", "smallvec", @@ -5059,9 +5059,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" [[package]] name = "smithay-client-toolkit" @@ -5149,7 +5149,7 @@ dependencies = [ "objc", "raw-window-handle 0.5.2", "redox_syscall 0.4.1", - "rustix 0.38.28", + "rustix 0.38.30", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5344,7 +5344,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.52.0", ] @@ -5390,12 +5390,12 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", - "jpeg-decoder 0.3.0", + "jpeg-decoder 0.3.1", "weezl", ] @@ -5438,7 +5438,7 @@ dependencies = [ "arrayvec 0.7.4", "bytemuck", "cfg-if 1.0.0", - "png 0.17.10", + "png 0.17.11", "tiny-skia-path 0.8.4", ] @@ -5453,7 +5453,7 @@ dependencies = [ "bytemuck", "cfg-if 1.0.0", "log", - "png 0.17.10", + "png 0.17.11", "tiny-skia-path 0.11.3", ] @@ -5703,9 +5703,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" @@ -6022,7 +6022,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "nix 0.26.4", "wayland-backend", "wayland-scanner 0.31.0", @@ -6214,7 +6214,7 @@ checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" dependencies = [ "arrayvec 0.7.4", "bit-vec", - "bitflags 2.4.1", + "bitflags 2.4.2", "codespan-reporting", "log", "naga", @@ -6239,7 +6239,7 @@ dependencies = [ "arrayvec 0.7.4", "ash", "bit-set", - "bitflags 2.4.1", + "bitflags 2.4.2", "block", "core-graphics-types", "d3d12", @@ -6278,7 +6278,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "js-sys", "web-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 19926ec..a7c72f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,6 @@ git = "https://github.com/pop-os/cosmic-syntax-theme" [dependencies.cosmic-text] git = "https://github.com/pop-os/cosmic-text" -branch = "refactor" features = ["syntect", "vi"] #path = "../cosmic-text" diff --git a/src/line_number.rs b/src/line_number.rs index 872f227..5041f0b 100644 --- a/src/line_number.rs +++ b/src/line_number.rs @@ -41,6 +41,7 @@ impl LineNumberCache { 1.0, /* font size adjusted later */ 1000.0, /* dummy width */ Wrap::None, + None, ) .to_vec() }) From d7e9e3085f8d88faa02065b9a5f2ed438a70ebde Mon Sep 17 00:00:00 2001 From: Mark Tomlin Date: Wed, 17 Jan 2024 23:32:51 -0500 Subject: [PATCH 2/4] Removed needless refrence. --- src/tab.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tab.rs b/src/tab.rs index d8f0604..62f77f4 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -191,7 +191,7 @@ impl EditorTab { match path.file_name() { Some(file_name_os) => match file_name_os.to_str() { Some(file_name) => match file_name { - "mod.rs" => title_with_parent(&path, file_name), + "mod.rs" => title_with_parent(path, file_name), _ => file_name.to_string(), }, None => format!("{}", path.display()), From b97eb0603bf6c7e168fc6e17aa779af1f105b9ee Mon Sep 17 00:00:00 2001 From: Mark Tomlin Date: Thu, 18 Jan 2024 00:25:22 -0500 Subject: [PATCH 3/4] Remove lazy_static dep. --- Cargo.lock | 1 - Cargo.toml | 1 - src/localize.rs | 41 +++++++++++++++++++++----------------- src/main.rs | 52 +++++++++++++++++++++++++++--------------------- src/mime_icon.rs | 10 +++++----- src/tab.rs | 16 +++++++++------ src/text_box.rs | 13 ++++++------ 7 files changed, 74 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5728a45..fbfce7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1031,7 +1031,6 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "ignore", - "lazy_static", "lexical-sort", "libcosmic", "log", diff --git a/Cargo.toml b/Cargo.toml index a7c72f7..ddf703b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,6 @@ license = "GPL-3.0-only" env_logger = "0.10.0" grep = "0.3.1" ignore = "0.4.21" -lazy_static = "1.4.0" lexical-sort = "0.3.1" log = "0.4.20" patch = "0.7.0" diff --git a/src/localize.rs b/src/localize.rs index f5c6fb9..1aab45a 100644 --- a/src/localize.rs +++ b/src/localize.rs @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only +use std::sync::OnceLock; + use i18n_embed::{ fluent::{fluent_language_loader, FluentLanguageLoader}, DefaultLocalizer, LanguageLoader, Localizer, @@ -10,8 +12,22 @@ use rust_embed::RustEmbed; #[folder = "i18n/"] struct Localizations; -lazy_static::lazy_static! { - pub static ref LANGUAGE_LOADER: FluentLanguageLoader = { +pub static LANGUAGE_LOADER: OnceLock = OnceLock::new(); + +#[macro_export] +macro_rules! fl { + ($message_id:literal) => {{ + i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER.get().unwrap(), $message_id) + }}; + + ($message_id:literal, $($args:expr),*) => {{ + i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER.get().unwrap(), $message_id, $($args), *) + }}; +} + +// Get the `Localizer` to be used for localizing this library. +pub fn localizer() -> Box { + LANGUAGE_LOADER.get_or_init(|| { let loader: FluentLanguageLoader = fluent_language_loader!(); loader @@ -19,23 +35,12 @@ lazy_static::lazy_static! { .expect("Error while loading fallback language"); loader - }; -} + }); -#[macro_export] -macro_rules! fl { - ($message_id:literal) => {{ - i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id) - }}; - - ($message_id:literal, $($args:expr),*) => {{ - i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id, $($args), *) - }}; -} - -// Get the `Localizer` to be used for localizing this library. -pub fn localizer() -> Box { - Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER, &Localizations)) + Box::from(DefaultLocalizer::new( + LANGUAGE_LOADER.get().unwrap(), + &Localizations, + )) } pub fn localize() { diff --git a/src/main.rs b/src/main.rs index ad928d3..1cb1680 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,7 +23,7 @@ use std::{ env, fs, io, path::{Path, PathBuf}, process, - sync::Mutex, + sync::{Mutex, OnceLock}, }; use tokio::time; @@ -60,17 +60,28 @@ use self::text_box::text_box; mod text_box; //TODO: re-use iced FONT_SYSTEM -lazy_static::lazy_static! { - static ref FONT_SYSTEM: Mutex = Mutex::new(FontSystem::new()); - static ref ICON_CACHE: Mutex = Mutex::new(IconCache::new()); - static ref LINE_NUMBER_CACHE: Mutex = Mutex::new(LineNumberCache::new()); - static ref SWASH_CACHE: Mutex = Mutex::new(SwashCache::new()); - static ref SYNTAX_SYSTEM: SyntaxSystem = { +static FONT_SYSTEM: OnceLock> = OnceLock::new(); +static ICON_CACHE: OnceLock> = OnceLock::new(); +static LINE_NUMBER_CACHE: OnceLock> = OnceLock::new(); +static SWASH_CACHE: OnceLock> = OnceLock::new(); +static SYNTAX_SYSTEM: OnceLock = OnceLock::new(); + +pub fn icon_cache_get(name: &'static str, size: u16) -> icon::Icon { + let mut icon_cache = ICON_CACHE.get().unwrap().lock().unwrap(); + icon_cache.get(name, size) +} + +fn main() -> Result<(), Box> { + FONT_SYSTEM.get_or_init(|| Mutex::new(FontSystem::new())); + ICON_CACHE.get_or_init(|| Mutex::new(IconCache::new())); + LINE_NUMBER_CACHE.get_or_init(|| Mutex::new(LineNumberCache::new())); + SWASH_CACHE.get_or_init(|| Mutex::new(SwashCache::new())); + SYNTAX_SYSTEM.get_or_init(|| { let lazy_theme_set = two_face::theme::LazyThemeSet::from(two_face::theme::extra()); let mut theme_set = syntect::highlighting::ThemeSet::from(&lazy_theme_set); for (theme_name, theme_data) in &[ ("COSMIC Dark", cosmic_syntax_theme::COSMIC_DARK_TM_THEME), - ("COSMIC Light", cosmic_syntax_theme::COSMIC_LIGHT_TM_THEME) + ("COSMIC Light", cosmic_syntax_theme::COSMIC_LIGHT_TM_THEME), ] { let mut cursor = io::Cursor::new(theme_data); match syntect::highlighting::ThemeSet::load_from_reader(&mut cursor) { @@ -87,15 +98,8 @@ lazy_static::lazy_static! { syntax_set: two_face::syntax::extra_no_newlines(), theme_set, } - }; -} + }); -pub fn icon_cache_get(name: &'static str, size: u16) -> icon::Icon { - let mut icon_cache = ICON_CACHE.lock().unwrap(); - icon_cache.get(name, size) -} - -fn main() -> Result<(), Box> { #[cfg(all(unix, not(target_os = "redox")))] match fork::daemon(true, true) { Ok(fork::Fork::Child) => (), @@ -829,7 +833,7 @@ impl App { .iter() .position(|theme_name| theme_name == &self.config.syntax_theme_light); let font_selected = { - let font_system = FONT_SYSTEM.lock().unwrap(); + let font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); let current_font_name = font_system.db().family_name(&Family::Monospace); self.font_names .iter() @@ -920,7 +924,7 @@ impl Application for App { fn init(core: Core, flags: Self::Flags) -> (Self, Command) { // Update font name from config { - let mut font_system = FONT_SYSTEM.lock().unwrap(); + let mut font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); font_system .db_mut() .set_monospace_family(&flags.config.font_name); @@ -930,7 +934,7 @@ impl Application for App { let font_names = { let mut font_names = Vec::new(); - let font_system = FONT_SYSTEM.lock().unwrap(); + let font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); //TODO: do not repeat, used in Tab::new let attrs = cosmic_text::Attrs::new().family(Family::Monospace); for face in font_system.db().faces() { @@ -954,8 +958,9 @@ impl Application for App { font_sizes.push(font_size); } - let mut theme_names = Vec::with_capacity(SYNTAX_SYSTEM.theme_set.themes.len()); - for (theme_name, _theme) in SYNTAX_SYSTEM.theme_set.themes.iter() { + let mut theme_names = + Vec::with_capacity(SYNTAX_SYSTEM.get().unwrap().theme_set.themes.len()); + for (theme_name, _theme) in SYNTAX_SYSTEM.get().unwrap().theme_set.themes.iter() { theme_names.push(theme_name.to_string()); } @@ -1172,13 +1177,14 @@ impl Application for App { if font_name != &self.config.font_name { // Update font name from config { - let mut font_system = FONT_SYSTEM.lock().unwrap(); + let mut font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); font_system.db_mut().set_monospace_family(font_name); } // Reset line number cache { - let mut line_number_cache = LINE_NUMBER_CACHE.lock().unwrap(); + let mut line_number_cache = + LINE_NUMBER_CACHE.get().unwrap().lock().unwrap(); line_number_cache.clear(); } diff --git a/src/mime_icon.rs b/src/mime_icon.rs index 40fca06..9317624 100644 --- a/src/mime_icon.rs +++ b/src/mime_icon.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only use cosmic::widget::icon; -use std::{collections::HashMap, path::Path, sync::Mutex}; +use std::{collections::HashMap, path::Path, sync::Mutex, sync::OnceLock}; pub const FALLBACK_MIME_ICON: &str = "text-x-generic"; @@ -39,18 +39,18 @@ impl MimeIconCache { } } -lazy_static::lazy_static! { - static ref MIME_ICON_CACHE: Mutex = Mutex::new(MimeIconCache::new()); -} +static MIME_ICON_CACHE: OnceLock> = OnceLock::new(); pub fn mime_icon>(path: P, size: u16) -> icon::Icon { + MIME_ICON_CACHE.get_or_init(|| Mutex::new(MimeIconCache::new())); + //TODO: smarter path handling let path = path .as_ref() .to_str() .expect("failed to convert path to UTF-8") .to_owned(); - let mut mime_icon_cache = MIME_ICON_CACHE.lock().unwrap(); + let mut mime_icon_cache = MIME_ICON_CACHE.get().unwrap().lock().unwrap(); match mime_icon_cache.get(MimeIconKey { path, size }) { Some(handle) => icon::icon(handle).size(size), None => icon::from_name(FALLBACK_MIME_ICON).size(size).icon(), diff --git a/src/tab.rs b/src/tab.rs index 62f77f4..41e49cd 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -47,14 +47,18 @@ impl EditorTab { let mut buffer = Buffer::new_empty(config.metrics()); buffer.set_text( - &mut FONT_SYSTEM.lock().unwrap(), + &mut FONT_SYSTEM.get().unwrap().lock().unwrap(), "", attrs, Shaping::Advanced, ); - let editor = - SyntaxEditor::new(Arc::new(buffer), &SYNTAX_SYSTEM, config.syntax_theme()).unwrap(); + let editor = SyntaxEditor::new( + Arc::new(buffer), + SYNTAX_SYSTEM.get().unwrap(), + config.syntax_theme(), + ) + .unwrap(); let mut tab = Self { path_opt: None, @@ -71,7 +75,7 @@ impl EditorTab { pub fn set_config(&mut self, config: &Config) { let mut editor = self.editor.lock().unwrap(); - let mut font_system = FONT_SYSTEM.lock().unwrap(); + let mut font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); let mut editor = editor.borrow_with(&mut font_system); editor.set_auto_indent(config.auto_indent); editor.set_passthrough(!config.vim_bindings); @@ -89,7 +93,7 @@ impl EditorTab { pub fn open(&mut self, path: PathBuf) { let mut editor = self.editor.lock().unwrap(); - let mut font_system = FONT_SYSTEM.lock().unwrap(); + let mut font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); let mut editor = editor.borrow_with(&mut font_system); match editor.load_text(&path, self.attrs) { Ok(()) => { @@ -111,7 +115,7 @@ impl EditorTab { pub fn reload(&mut self) { let mut editor = self.editor.lock().unwrap(); - let mut font_system = FONT_SYSTEM.lock().unwrap(); + let mut font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); let mut editor = editor.borrow_with(&mut font_system); if let Some(path) = &self.path_opt { // Save scroll diff --git a/src/text_box.rs b/src/text_box.rs index a7fa577..6affe9e 100644 --- a/src/text_box.rs +++ b/src/text_box.rs @@ -246,7 +246,7 @@ where let mut editor = self.editor.lock().unwrap(); //TODO: set size? editor - .borrow_with(&mut FONT_SYSTEM.lock().unwrap()) + .borrow_with(&mut FONT_SYSTEM.get().unwrap().lock().unwrap()) .shape_as_needed(true); editor.with_buffer(|buffer| { @@ -348,7 +348,7 @@ where let image_w = image_w - scrollbar_w; // Lock font system (used throughout) - let mut font_system = FONT_SYSTEM.lock().unwrap(); + let mut font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); // Calculate line number information let (line_number_chars, editor_offset_x) = if self.line_numbers { @@ -363,7 +363,7 @@ where // Calculate line number width let mut line_number_width = 0.0; { - let mut line_number_cache = LINE_NUMBER_CACHE.lock().unwrap(); + let mut line_number_cache = LINE_NUMBER_CACHE.get().unwrap().lock().unwrap(); if let Some(layout_line) = line_number_cache .get( &mut font_system, @@ -410,7 +410,7 @@ where // Draw to pixel buffer let mut pixels_u8 = vec![0; image_w as usize * image_h as usize * 4]; { - let mut swash_cache = SWASH_CACHE.lock().unwrap(); + let mut swash_cache = SWASH_CACHE.get().unwrap().lock().unwrap(); let pixels = unsafe { std::slice::from_raw_parts_mut( @@ -454,7 +454,8 @@ where // Draw line numbers //TODO: move to cosmic-text? editor.with_buffer(|buffer| { - let mut line_number_cache = LINE_NUMBER_CACHE.lock().unwrap(); + let mut line_number_cache = + LINE_NUMBER_CACHE.get().unwrap().lock().unwrap(); let mut last_line_number = 0; for run in buffer.layout_runs() { let line_number = run.line_i.saturating_add(1); @@ -695,7 +696,7 @@ where let mut editor = self.editor.lock().unwrap(); let buffer_size = editor.with_buffer(|buffer| buffer.size()); let last_changed = editor.changed(); - let mut font_system = FONT_SYSTEM.lock().unwrap(); + let mut font_system = FONT_SYSTEM.get().unwrap().lock().unwrap(); let mut editor = editor.borrow_with(&mut font_system); let mut status = Status::Ignored; From 48258645bb0c095b36921bd9d1a07ac01dbec739 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 19 Jan 2024 11:25:50 -0700 Subject: [PATCH 4/4] Move default keybinds out of config --- src/config.rs | 129 ------------------------------------------------ src/key_bind.rs | 77 +++++++++++++++++++++++++++++ src/main.rs | 66 +++++++++++++++++++++++-- src/menu.rs | 14 ++++-- 4 files changed, 148 insertions(+), 138 deletions(-) create mode 100644 src/key_bind.rs diff --git a/src/config.rs b/src/config.rs index 422b72d..cbb124e 100644 --- a/src/config.rs +++ b/src/config.rs @@ -2,68 +2,13 @@ use cosmic::{ cosmic_config::{self, cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry}, - iced::keyboard::{KeyCode, Modifiers}, theme, }; use cosmic_text::Metrics; use serde::{Deserialize, Serialize}; -use std::{collections::HashMap, fmt}; - -use crate::{ContextPage, Message}; pub const CONFIG_VERSION: u64 = 1; -#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] -pub enum Action { - CloseFile, - CloseProject, - Copy, - Cut, - Find, - FindAndReplace, - NewFile, - NewWindow, - OpenFileDialog, - OpenProjectDialog, - Paste, - Quit, - Redo, - Save, - SelectAll, - ToggleGitManagement, - ToggleProjectSearch, - ToggleSettingsPage, - ToggleWordWrap, - Undo, -} - -impl Action { - pub fn message(&self) -> Message { - match self { - Self::CloseFile => Message::CloseFile, - Self::CloseProject => Message::CloseProject, - Self::Copy => Message::Copy, - Self::Cut => Message::Cut, - Self::Find => Message::Find(Some(false)), - Self::FindAndReplace => Message::Find(Some(true)), - Self::NewFile => Message::NewFile, - Self::NewWindow => Message::NewWindow, - Self::OpenFileDialog => Message::OpenFileDialog, - Self::OpenProjectDialog => Message::OpenProjectDialog, - Self::Paste => Message::Paste, - Self::Quit => Message::Quit, - Self::Redo => Message::Redo, - Self::Save => Message::Save, - Self::SelectAll => Message::SelectAll, - Self::ToggleGitManagement => Message::ToggleContextPage(ContextPage::GitManagement), - Self::ToggleProjectSearch => Message::ToggleContextPage(ContextPage::ProjectSearch), - Self::ToggleSettingsPage => Message::ToggleContextPage(ContextPage::Settings), - Self::ToggleWordWrap => Message::ToggleWordWrap, - Self::Undo => Message::Undo, - } - } -} - #[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] pub enum AppTheme { Dark, @@ -81,78 +26,6 @@ impl AppTheme { } } -#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] -pub enum Modifier { - Super, - Ctrl, - Alt, - Shift, -} - -#[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] -pub struct KeyBind { - pub modifiers: Vec, - pub key_code: KeyCode, -} - -impl KeyBind { - //TODO: load from config - pub fn load() -> HashMap { - let mut keybinds = HashMap::new(); - - macro_rules! bind { - ([$($modifier:ident),+ $(,)?], $key_code:ident, $action:ident) => {{ - keybinds.insert( - KeyBind { - modifiers: vec![$(Modifier::$modifier),+], - key_code: KeyCode::$key_code, - }, - Action::$action, - ); - }}; - } - - bind!([Ctrl], W, CloseFile); - bind!([Ctrl], X, Cut); - bind!([Ctrl], C, Copy); - bind!([Ctrl], F, Find); - bind!([Ctrl], H, FindAndReplace); - bind!([Ctrl], V, Paste); - bind!([Ctrl], T, NewFile); - bind!([Ctrl], N, NewWindow); - bind!([Ctrl], O, OpenFileDialog); - bind!([Ctrl, Shift], O, OpenProjectDialog); - bind!([Ctrl], Q, Quit); - bind!([Ctrl, Shift], Z, Redo); - bind!([Ctrl], S, Save); - bind!([Ctrl], A, SelectAll); - bind!([Ctrl, Shift], G, ToggleGitManagement); - bind!([Ctrl, Shift], F, ToggleProjectSearch); - bind!([Ctrl], Comma, ToggleSettingsPage); - bind!([Alt], Z, ToggleWordWrap); - bind!([Ctrl], Z, Undo); - - keybinds - } - - pub fn matches(&self, modifiers: Modifiers, key_code: KeyCode) -> bool { - self.key_code == key_code - && modifiers.logo() == self.modifiers.contains(&Modifier::Super) - && modifiers.control() == self.modifiers.contains(&Modifier::Ctrl) - && modifiers.alt() == self.modifiers.contains(&Modifier::Alt) - && modifiers.shift() == self.modifiers.contains(&Modifier::Shift) - } -} - -impl fmt::Display for KeyBind { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - for modifier in self.modifiers.iter() { - write!(f, "{:?} + ", modifier)?; - } - write!(f, "{:?}", self.key_code) - } -} - #[derive(Clone, CosmicConfigEntry, Debug, Deserialize, Eq, PartialEq, Serialize)] pub struct Config { pub app_theme: AppTheme, @@ -165,7 +38,6 @@ pub struct Config { pub tab_width: u16, pub vim_bindings: bool, pub word_wrap: bool, - pub keybinds: HashMap, } impl Default for Config { @@ -181,7 +53,6 @@ impl Default for Config { tab_width: 4, vim_bindings: false, word_wrap: false, - keybinds: KeyBind::load(), } } } diff --git a/src/key_bind.rs b/src/key_bind.rs new file mode 100644 index 0000000..a36f2e4 --- /dev/null +++ b/src/key_bind.rs @@ -0,0 +1,77 @@ +use cosmic::iced::keyboard::{KeyCode, Modifiers}; +use serde::{Deserialize, Serialize}; +use std::{collections::HashMap, fmt}; + +use crate::Action; + +#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] +pub enum Modifier { + Super, + Ctrl, + Alt, + Shift, +} + +#[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] +pub struct KeyBind { + pub modifiers: Vec, + pub key_code: KeyCode, +} + +impl KeyBind { + pub fn matches(&self, modifiers: Modifiers, key_code: KeyCode) -> bool { + self.key_code == key_code + && modifiers.logo() == self.modifiers.contains(&Modifier::Super) + && modifiers.control() == self.modifiers.contains(&Modifier::Ctrl) + && modifiers.alt() == self.modifiers.contains(&Modifier::Alt) + && modifiers.shift() == self.modifiers.contains(&Modifier::Shift) + } +} + +impl fmt::Display for KeyBind { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + for modifier in self.modifiers.iter() { + write!(f, "{:?} + ", modifier)?; + } + write!(f, "{:?}", self.key_code) + } +} + +//TODO: load from config +pub fn key_binds() -> HashMap { + let mut key_binds = HashMap::new(); + + macro_rules! bind { + ([$($modifier:ident),+ $(,)?], $key_code:ident, $action:ident) => {{ + key_binds.insert( + KeyBind { + modifiers: vec![$(Modifier::$modifier),+], + key_code: KeyCode::$key_code, + }, + Action::$action, + ); + }}; + } + + bind!([Ctrl], W, CloseFile); + bind!([Ctrl], X, Cut); + bind!([Ctrl], C, Copy); + bind!([Ctrl], F, Find); + bind!([Ctrl], H, FindAndReplace); + bind!([Ctrl], V, Paste); + bind!([Ctrl], T, NewFile); + bind!([Ctrl], N, NewWindow); + bind!([Ctrl], O, OpenFileDialog); + bind!([Ctrl, Shift], O, OpenProjectDialog); + bind!([Ctrl], Q, Quit); + bind!([Ctrl, Shift], Z, Redo); + bind!([Ctrl], S, Save); + bind!([Ctrl], A, SelectAll); + bind!([Ctrl, Shift], G, ToggleGitManagement); + bind!([Ctrl, Shift], F, ToggleProjectSearch); + bind!([Ctrl], Comma, ToggleSettingsPage); + bind!([Alt], Z, ToggleWordWrap); + bind!([Ctrl], Z, Undo); + + key_binds +} diff --git a/src/main.rs b/src/main.rs index 1cb1680..4960a97 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,8 +18,10 @@ use cosmic::{ Application, ApplicationExt, Apply, Element, }; use cosmic_text::{Cursor, Edit, Family, FontSystem, Selection, SwashCache, SyntaxSystem, ViMode}; +use serde::{Deserialize, Serialize}; use std::{ any::TypeId, + collections::HashMap, env, fs, io, path::{Path, PathBuf}, process, @@ -27,7 +29,7 @@ use std::{ }; use tokio::time; -use config::{Action, AppTheme, Config, CONFIG_VERSION}; +use config::{AppTheme, Config, CONFIG_VERSION}; mod config; use git::{GitDiff, GitDiffLine, GitRepository, GitStatus, GitStatusKind}; @@ -36,6 +38,9 @@ mod git; use icon_cache::IconCache; mod icon_cache; +use key_bind::{key_binds, KeyBind}; +mod key_bind; + use line_number::LineNumberCache; mod line_number; @@ -149,6 +154,57 @@ fn main() -> Result<(), Box> { Ok(()) } +#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] +pub enum Action { + CloseFile, + CloseProject, + Copy, + Cut, + Find, + FindAndReplace, + NewFile, + NewWindow, + OpenFileDialog, + OpenProjectDialog, + Paste, + Quit, + Redo, + Save, + SelectAll, + ToggleGitManagement, + ToggleProjectSearch, + ToggleSettingsPage, + ToggleWordWrap, + Undo, +} + +impl Action { + pub fn message(&self) -> Message { + match self { + Self::CloseFile => Message::CloseFile, + Self::CloseProject => Message::CloseProject, + Self::Copy => Message::Copy, + Self::Cut => Message::Cut, + Self::Find => Message::Find(Some(false)), + Self::FindAndReplace => Message::Find(Some(true)), + Self::NewFile => Message::NewFile, + Self::NewWindow => Message::NewWindow, + Self::OpenFileDialog => Message::OpenFileDialog, + Self::OpenProjectDialog => Message::OpenProjectDialog, + Self::Paste => Message::Paste, + Self::Quit => Message::Quit, + Self::Redo => Message::Redo, + Self::Save => Message::Save, + Self::SelectAll => Message::SelectAll, + Self::ToggleGitManagement => Message::ToggleContextPage(ContextPage::GitManagement), + Self::ToggleProjectSearch => Message::ToggleContextPage(ContextPage::ProjectSearch), + Self::ToggleSettingsPage => Message::ToggleContextPage(ContextPage::Settings), + Self::ToggleWordWrap => Message::ToggleWordWrap, + Self::Undo => Message::Undo, + } + } +} + #[derive(Clone, Debug)] pub struct Flags { config_handler: Option, @@ -264,6 +320,7 @@ pub struct App { tab_model: segmented_button::SingleSelectModel, config_handler: Option, config: Config, + key_binds: HashMap, app_themes: Vec, font_names: Vec, font_size_names: Vec, @@ -970,6 +1027,7 @@ impl Application for App { tab_model: segmented_button::Model::builder().build(), config_handler: flags.config_handler, config: flags.config, + key_binds: key_binds(), app_themes, font_names, font_size_names, @@ -1281,7 +1339,7 @@ impl Application for App { self.git_project_status = Some(project_status); } Message::Key(modifiers, key_code) => { - for (key_bind, action) in self.config.keybinds.iter() { + for (key_bind, action) in self.key_binds.iter() { if key_bind.matches(modifiers, key_code) { return self.update(action.message()); } @@ -1765,7 +1823,7 @@ impl Application for App { } fn header_start(&self) -> Vec> { - vec![menu_bar(&self.config)] + vec![menu_bar(&self.config, &self.key_binds)] } fn view(&self) -> Element { @@ -1838,7 +1896,7 @@ impl Application for App { text_box = text_box.line_numbers(); } let mut popover = - widget::popover(text_box, menu::context_menu(&self.config, tab_id)); + widget::popover(text_box, menu::context_menu(&self.key_binds, tab_id)); popover = match tab.context_menu { Some(position) => popover.position(position), None => popover.show_popup(false), diff --git a/src/menu.rs b/src/menu.rs index 54fea29..9855529 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -14,8 +14,9 @@ use cosmic::{ }, Element, }; +use std::collections::HashMap; -use crate::{fl, icon_cache_get, Action, Config, ContextPage, Message}; +use crate::{fl, icon_cache_get, Action, Config, ContextPage, KeyBind, Message}; macro_rules! menu_button { ($($x:expr),+ $(,)?) => ( @@ -32,10 +33,13 @@ macro_rules! menu_button { ); } -pub fn context_menu<'a>(config: &Config, entity: segmented_button::Entity) -> Element<'a, Message> { +pub fn context_menu<'a>( + key_binds: &HashMap, + entity: segmented_button::Entity, +) -> Element<'a, Message> { let menu_item = |menu_label, menu_action| { let mut key = String::new(); - for (key_bind, key_action) in config.keybinds.iter() { + for (key_bind, key_action) in key_binds.iter() { if key_action == &menu_action { key = key_bind.to_string(); break; @@ -76,7 +80,7 @@ pub fn context_menu<'a>(config: &Config, entity: segmented_button::Entity) -> El .into() } -pub fn menu_bar<'a>(config: &Config) -> Element<'a, Message> { +pub fn menu_bar<'a>(config: &Config, key_binds: &HashMap) -> Element<'a, Message> { //TODO: port to libcosmic let menu_root = |label| { widget::button(widget::text(label)) @@ -89,7 +93,7 @@ pub fn menu_bar<'a>(config: &Config) -> Element<'a, Message> { let find_key = |message: &Message| -> String { let mut key = String::new(); - for (key_bind, action) in config.keybinds.iter() { + for (key_bind, action) in key_binds.iter() { if &action.message() == message { key = key_bind.to_string(); break;